Merge branch 'main' into fix_more_links

Author: acharraggi

docs/requirements.txt

@@ -11,4 +11,5 @@ python-git-info==0.8.3
 sphinxcontrib-mermaid==0.9.2
 sphinx-hoverxref==1.3.0
 sphinxext-rediraffe==0.2.7
-git+https://github.com/FIRST-Tech-Challenge/ftcdocs-helper@main#subdirectory=linkcheckdiff
+sphinx-notfound-page==1.1.0
+git+https://github.com/FIRST-Tech-Challenge/ftcdocs-helper@main#subdirectory=linkcheckdiff

docs/source/404.rst

@@ -0,0 +1,13 @@
+.. meta::
+   :title: Page not found
+   :description: The official home of FIRST Tech Challenge Documentation.
+   :orphan:
+
+Page not found
+==============
+
+Unfortunately we couldn't find the content you were looking for. Try using the sidebar menu links or search box.
+
+TensorFlow and the *FIRST* Machine Learning Toolchain content has been moved to the `FTC Docs Archive <https://ftc-docs.firstinspires.org/projects/ftcdocs-archive/en/latest/index.html>`__.
+
+

docs/source/apriltag/vision_portal/apriltag_intro/apriltag-intro.rst

@@ -25,16 +25,16 @@ several resources:
    image processing library 
 -  myBlocks: custom Blocks created in OnBot Java (OBJ)
 
-Now these three areas are provided, or bundled, in the new *FIRST* **Tech Challenge
-Software Development Kit (SDK), version 8.2**.
+Now these three areas are provided, or bundled, in the *FIRST* **Tech Challenge
+Software Development Kit (SDK), starting with version 8.2**.
 
 Namely, key capabilities of **AprilTag** and **EasyOpenCV** are
 available to the Robot Controller (RC) and Driver Station (DS) apps,
 without special downloads. And AprilTag features are included in **FTC
 Blocks**, without needing custom myBlocks.
 
-The AprilTag features work on Android RC phone cameras, and on webcams.
-A single OpMode can use AprilTag and TensorFlow Object Detection (TFOD).
+The AprilTag features work on webcams and on Android RC phone cameras.
+A single OpMode can use AprilTag and Color Processing.
 
 In *FIRST* Tech Challenge, AprilTag is ready for the spotlight!
 
@@ -66,7 +66,7 @@ containing information and designed for easy recognition.
 The above samples represent different formats, or **families**. A
 project typically uses a single AprilTag family.
 
-This year, *FIRST* Tech Challenge uses a common family called **36h11**. A PDF
+*FIRST* Tech Challenge uses a common family called **36h11**. A PDF
 showing the numbers 0 through 20 from the 36h11 family can be downloaded here:
 
 - :download:`AprilTag PDF 0-20 <files/AprilTag_0-20_family36h11.pdf>`
@@ -175,17 +175,17 @@ remains within the camera’s field of view. Namely, an OpMode “**while() loop
 should regularly read the updated pose data, to guide the robot’s driving
 actions.
 
-The new SDK supports **multiple cameras**, switchable or simultaneous.  This
+The SDK supports **multiple cameras**, switchable or simultaneous.  This
 can help if the robot changes direction, or you wish to navigate using another
-AprilTag (or TensorFlow object).
+AprilTag (or Color Processing).
 
 Other sensors can also be used for navigation, such as drive motor encoders,
 REV Hub IMU, deadwheel encoders, color/distance sensors, ultrasonic sensors,
 and more.
 
 It’s also possible to evaluate **non-AprilTag images** from the same camera
 and/or a second camera. For example, the SDK can estimate the horizontal angle
-(or Bearing) of an object detected with **TensorFlow**, another vision
+(or Bearing) of an object detected with **Color Processing**, another vision
 technology employed in *FIRST* Tech Challenge. Advanced teams might consider
 active camera pointing control, to keep an AprilTag or other object in view.
 
@@ -215,7 +215,7 @@ tags are **not** annotated by default with a colored border.
 
 Note: **Camera Stream** displays a snapshot of the camera’s view, on the Driver
 Station device. It’s available only during the INIT phase of an OpMode, and
-also shows any AprilTag (or TFOD) annotations. Instructions are posted here:
+also shows any AprilTag (or Color Processing) annotations. Instructions are posted here:
 
 - :ref:`Camera Stream Image Preview Documentation <hardware_and_software_configuration/configuring/configuring_external_webcam/configuring-external-webcam:image preview>`
 
@@ -301,12 +301,12 @@ pose data in real-time to navigate to the desired location on the field.
 Vision processing can consume significant **CPU resources** and USB
 communications **bandwidth**. *FIRST* Tech Challenge teams may balance the
 benefits of higher resolution and speed (frames-per-second) against the risk of
-overloading CPU and bandwidth resources. The 8.2 SDK provides numerous tools to
+overloading CPU and bandwidth resources. The SDK 8.2 or later provides numerous tools to
 manage this balance: 
 
 - select the camera resolution 
 - disable and enable the RC preview (called LiveView) 
-- disable and enable the AprilTag (or TFOD) processor 
+- disable and enable the AprilTag (or Color Processing) processor 
 - close the camera stream 
 - select a compressed video streaming format 
 - measure frames-per-second 
@@ -315,18 +315,18 @@ manage this balance:
 
 **Option 3**
 
-Clearer camera images can improve AprilTag (and TFOD) vision processing.
+Clearer camera images can improve AprilTag (and Color Processing) vision processing.
 The SDK offers powerful **webcam controls** (Exposure, Gain, Focus,
-and more), now available in FTC Blocks! These controls can be applied
+and more), also available in FTC Blocks! These controls can be applied
 under various lighting conditions.
 
-Exposure and Gain are adjusted together. The new SDK offers Java Sample
+Exposure and Gain are adjusted together. The SDK offers Java Sample
 OpMode ``ConceptAprilTagOptimizeExposure.java``.
 
 **Option 4**
 
 The frame of reference described above in **AprilTag Axes** is
-calculated and provided by default in the new 8.2 SDK. Advanced teams
+calculated and provided by default in the 8.2 SDK or later. Advanced teams
 may prefer to perform their own pose calculations, based on **raw
 values** from the AprilTag/EasyOpenCV pipeline.
 
@@ -381,7 +381,7 @@ Summary
 AprilTag is a popular camera-based technology, using a scanned image
 similar to a QR Code.
 
-The new SDK version 8.2 now includes key capabilities of AprilTag and
+The SDK version 8.2 or later includes key capabilities of AprilTag and
 EasyOpenCV, a *FIRST* Tech Challenge-optimized interface with OpenCV for image
 processing. These methods are packaged for convenient use by **Java and Blocks
 programmers**.
@@ -399,8 +399,8 @@ Each camera requires **calibration data**, for a specific resolution, to
 provide good pose estimates.
 
 Multiple cameras are supported, and a single OpMode can use AprilTag and
-TensorFlow Object Detection (TFOD). AprilTag detection is improved with
-webcam Camera Controls, now available also in FTC Blocks.
+Color Processing. AprilTag detection is improved with
+webcam Camera Controls, available also in FTC Blocks.
 
 **In** *FIRST* **Tech Challenge, AprilTag is ready to take CENTERSTAGE!**
 

docs/source/booklets/advanced.rst

@@ -13,10 +13,6 @@
         :titlesonly:
 
         /programming_resources/vision/vision_overview/vision-overview
-        /programming_resources/vision/tensorflow_pp_2022/tensorflow_pp_2022
-        /programming_resources/vision/blocks_tfod_opmode/blocks-tfod-opmode
-        /programming_resources/vision/java_tfod_opmode/java-tfod-opmode
-        /programming_resources/vision/tensorflow_ff_2021/tensorflow-ff-2021
         /programming_resources/vision/webcam_controls/index
         Camera Calibration </programming_resources/vision/camera_calibration/camera-calibration>
 

docs/source/conf.py

@@ -31,6 +31,7 @@
     'sphinxcontrib.mermaid',
     'hoverxref.extension',
     "sphinxext.rediraffe",
+    'notfound.extension',
     "ftcdocs_linkcheckdiff",
 ]
 

docs/source/index.rst

@@ -112,6 +112,7 @@ and :doc:`gracious_professionalism/gp` to see why.
    faq/faqs
    Team Complimentary Software<sponsors/software/software>
    Team Discounts<sponsors/discounts/discounts>
+   team_resources/team_resources
 
 .. toctree::
    :caption: FTC Docs

docs/source/programming_resources/index.rst

@@ -1,7 +1,7 @@
 .. meta::
    :title: Programming Resources, FTC Docs
    :description: Official Programming Resources for FIRST Tech Challenge
-   :keywords: Blocks, FTC, FIRST Tech Challenge, On Bot Java, Android Studios, Control Hub, Robot Controller, Driver Station, FTC Control System, Programming Resources
+   :keywords: Blocks, FTC, FIRST Tech Challenge, On Bot Java, Android Studio, Control Hub, Robot Controller, Driver Station, FTC Control System, Programming Resources
 
 Programming Resources
 =====================
@@ -83,23 +83,6 @@ Topics for programming with AprilTags
    AprilTag Test Images <../apriltag/opmode_test_images/opmode-test-images>
    ../apriltag/apriltag_tips/decode_apriltag/decode-apriltag 
 
-TensorFlow Programming
-~~~~~~~~~~~~~~~~~~~~~~
-
-Topics for programming with TensorFlow Object Detection (TFOD)
-
-.. toctree::
-   :maxdepth: 1
-   :titlesonly:
-
-   vision/tensorflow_cs_2023/tensorflow-cs-2023
-   vision/tensorflow_pp_2022/tensorflow_pp_2022
-   vision/tensorflow_ff_2021/tensorflow-ff-2021
-   vision/blocks_tfod_opmode/blocks-tfod-opmode
-   vision/blocks_tfod_opmode_custom/blocks-tfod-opmode-custom
-   vision/java_tfod_opmode/java-tfod-opmode
-   vision/java_tfod_opmode_custom/java-tfod-opmode-custom
-
 Vision Programming
 ~~~~~~~~~~~~~~~~~~~
 
@@ -152,5 +135,5 @@ Advanced Topics for Programmers
 Additional *FIRST* Website Resources
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  `FIRST Website Programming Resources Link <https://www.firstinspires.org/resource-library/ftc/technology-information-and-resources>`__
+-  `FIRST Website Programming Resources Link <https://www.firstinspires.org/resources/library/ffc/programming-resources>`__
 

docs/source/programming_resources/shared/auto_load_opmode/auto-load-opmode.rst

@@ -20,10 +20,15 @@ translucent and have no text adjacent to it, indicating the feature is
 inactive.
 
 
+.. figure:: images/translucentPreselectLandscape.png   
+   :align: center
+
+   The preselect button will appear once an autonomous OpMode has been selected in landscape mode.
+
 .. figure:: images/translucentPreselect.png   
    :align: center
 
-   The preselect button will appear once an autonomous op mode has been selected.
+   The preselect button will appear once an autonomous OpMode has been selected in portrait mode.
 
 
 Note that in order for the preselect button to be visible, the selected
@@ -43,10 +48,15 @@ mode. The button will then become fully opaque and the name of the
 preselected op mode will appear adjacent to the button. This indicates
 the feature is active.
 
+.. figure:: images/selectTeleOpLandscape.png
+   :align: center
+
+   The driver controlled OpMode to be auto-loaded in landscape mode.
+
 .. figure:: images/selectTeleOp.png   
    :align: center
 
-   The driver controlled op mode to be auto-loaded.
+   The driver controlled OpMode to be auto-loaded in portrait mode.
 
 Should you then wish to disable it, simply long press the preselect
 button. It will become translucent again and the text adjacent to it
@@ -90,11 +100,17 @@ automatically load the preselected teleop op mode. If the “Op Mode Auto
 Queue” option is disabled, a team can still select a teleop op mode by
 using the preselect button on the main Driver Station activity.
 
+.. figure:: images/AutoQueueEnabledLandscape.png   
+   :align: center
+
+   If the OpMode Auto Queue option is enabled, the Driver Station will
+   automatically load the preselectTeleOp op mode in landscape mode.
+
 .. figure:: images/AutoQueueEnabled.png   
    :align: center
 
    If the OpMode Auto Queue option is enabled, the Driver Station will
-   automatically load the preselectTeleOp op mode.
+   automatically load the preselectTeleOp op mode in portrait mode.
 
 .. raw:: html