Merge branch 'main' into android

FIRST-Tech-Challenge · Oct 22, 2024 · c81cc39 · c81cc39
2 parents d1b28c0 + a34f1c1
commit c81cc39
Show file tree

Hide file tree

Showing 17 changed files with 420 additions and 1 deletion.
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/apriltag-localization.rst b/docs/source/apriltag/vision_portal/apriltag_localization/apriltag-localization.rst
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/05-ITD-tags.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/05-ITD-tags.png
diff --git a/...rce/apriltag/vision_portal/apriltag_localization/images/06-Res-Q-field-axes.png b/...rce/apriltag/vision_portal/apriltag_localization/images/06-Res-Q-field-axes.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/07-full-tag-11.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/07-full-tag-11.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/08-tag-11.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/08-tag-11.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/10-DS-screen.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/10-DS-screen.png
diff --git a/.../source/apriltag/vision_portal/apriltag_localization/images/20-CameraStream.png b/.../source/apriltag/vision_portal/apriltag_localization/images/20-CameraStream.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/30-LiveView.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/30-LiveView.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/40-telemetry.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/40-telemetry.png
diff --git a/...urce/apriltag/vision_portal/apriltag_localization/images/45-ITD-tag-numbers.png b/...urce/apriltag/vision_portal/apriltag_localization/images/45-ITD-tag-numbers.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/50-field-axes.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/50-field-axes.png
diff --git a/docs/source/apriltag/vision_portal/apriltag_localization/images/60-camera-pose.png b/docs/source/apriltag/vision_portal/apriltag_localization/images/60-camera-pose.png
diff --git a/...ource/apriltag/vision_portal/apriltag_localization/images/70-robot-position.png b/...ource/apriltag/vision_portal/apriltag_localization/images/70-robot-position.png
diff --git a/...ce/apriltag/vision_portal/apriltag_localization/images/75-robot-orientation.png b/...ce/apriltag/vision_portal/apriltag_localization/images/75-robot-orientation.png
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -323,9 +323,10 @@ def setup(app):
 # Set Cookie Banner to disabled by default
 cookiebanner_enabled = False
 
+html_context = dict()
+
 # Configure for local official-esque builds
 if(os.environ.get("LOCAL_DOCS_BUILD") == "true"):
-    html_context = dict()
     html_context['display_lower_left'] = True
 
     html_context['current_version'] = version
@@ -346,6 +347,11 @@ def setup(app):
     cookiebanner_enabled = True
     extensions.append('sphinx_sitemap')
     html_baseurl = os.environ.get("FTCDOCS_URL", default="")
+    html_context['display_github'] = True
+    html_context['github_user'] = 'FIRST-Tech-Challenge'
+    html_context['github_repo'] = 'ftcdocs'
+    html_context['github_version'] = 'main/docs/source/'
+
 
 # Configure RTD Theme
 html_theme_options = {

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -84,6 +84,7 @@ to see why.
    VisionPortal Overview </apriltag/vision_portal/visionportal_overview/visionportal-overview>
    Webcams for VisionPortal </apriltag/vision_portal/visionportal_webcams/visionportal-webcams>
    Understanding AprilTag Values </apriltag/understanding_apriltag_detection_values/understanding-apriltag-detection-values>
+   AprilTag Localization </apriltag/vision_portal/apriltag_localization/apriltag-localization>
    AprilTag Test Images </apriltag/opmode_test_images/opmode-test-images>
 
 .. toctree::

diff --git a/docs/source/programming_resources/index.rst b/docs/source/programming_resources/index.rst
@@ -79,6 +79,7 @@ Topics for programming with AprilTags
    VisionPortal Overview <../apriltag/vision_portal/visionportal_overview/visionportal-overview>
    Webcams for VisionPortal </apriltag/vision_portal/visionportal_webcams/visionportal-webcams>
    Understanding AprilTag Values <../apriltag/understanding_apriltag_detection_values/understanding-apriltag-detection-values>
+   AprilTag Localization <../apriltag/vision_portal/apriltag_localization/apriltag-localization>
    AprilTag Test Images <../apriltag/opmode_test_images/opmode-test-images>
 
 TensorFlow Programming