Skip to content

Commit 77108f0

Browse files
authored
Merge branch 'main' into choosing-program-lang
2 parents 1b3a7f9 + a69e9f6 commit 77108f0

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

docs/source/apriltag/vision_portal/visionportal_webcams/visionportal-webcams.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,8 @@ calibration values** for the FTC VisionPortal default resolution of
148148
Other Webcams
149149
-------------
150150

151-
Many other webcams are available online, with and without published `UVC
152-
compatibility <https://en.wikipedia.org/wiki/List_of_USB_video_class_devices>`__.
153-
The FTC SDK supports **only** UVC compatible webcams. Many modern
151+
Many other webcams are available online, with and without published UVC
152+
compatibility. The FTC SDK supports **only** UVC compatible webcams. Many modern
154153
webcams are UVC compatible without specifically advertising it; often
155154
indicated by “no drivers needed”.
156155

docs/source/booklets/advanced.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
:orphan:
22

3+
.. meta::
4+
:robots: noindex, nofollow
5+
36
.. only:: latex
47

58
Advanced Topics, Progrmming Resources
@@ -27,4 +30,4 @@
2730
/programming_resources/shared/myblocks/index
2831
/programming_resources/shared/external_libraries_blocks/external-libraries-blocks.rst
2932
/programming_resources/imu/imu.rst
30-
/programming_resources/shared/installing_kotlin/Installing-Kotlin
33+
/programming_resources/shared/installing_kotlin/Installing-Kotlin

docs/source/booklets/apriltags.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
:orphan:
22

3+
.. meta::
4+
:robots: noindex, nofollow
5+
36
.. only:: latex
47

58
April Tags in *FIRST* Tech Challenge

docs/source/booklets/control_system.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
:orphan:
22

3+
.. meta::
4+
:robots: noindex, nofollow
5+
36
.. only:: latex
47

58
*FIRST* Tech Challenge Control System

docs/source/booklets/sdk.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
:orphan:
22

3+
.. meta::
4+
:robots: noindex, nofollow
5+
36
.. only:: latex
47

58
*FIRST* Tech Challenge SDK

docs/source/programming_resources/shared/installing_kotlin/Installing-Kotlin.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ done by adding the following lines to the root ``build.gradle`` file in the ``bu
6161
6262
buildscript {
6363
64-
ext.kotlin_version = '1.8.20' <----- ADD THIS LINE, UPDATE VERSION TO LATEST IF NEEDED
64+
ext.kotlin_version = '1.9.22' <----- ADD THIS LINE, UPDATE VERSION TO LATEST IF NEEDED
6565
6666
repositories {
6767
mavenCentral()
6868
google()
6969
}
7070
7171
dependencies {
72-
classpath 'com.android.tools.build:gradle:7.2.0'
72+
classpath 'com.android.tools.build:gradle:8.7.0'
7373
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" <----- ADD THIS LINE
7474
}
7575
}

docs/source/programming_resources/shared/managing_control_hub/Managing-a-Control-Hub.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ computer includes the path to the adb.exe executable file. The
515515
`Android Developer website <https://developer.android.com/tools/adb>`__
516516
tells you where in your Android SDK installation you can find the
517517
adb.exe file. This
518-
`post <https://helpdeskgeek.com/windows-10/add-windows-path-environment-variable/>`__
518+
`post <https://helpdeskgeek.com/add-windows-path-environment-variable/>`__
519519
from
520-
`HelpDeskGeek.com <https://helpdeskgeek.com/windows-10/add-windows-path-environment-variable/>`__
520+
`HelpDeskGeek.com <https://helpdeskgeek.com/add-windows-path-environment-variable/>`__
521521
shows how to add a directory to your Windows PATH environment
522522
variable.
523523

0 commit comments

Comments
 (0)