Skip to content

Commit 10d319d

Browse files
authored
Merge branch 'main' into fix-index
2 parents e87bdbb + a3d1600 commit 10d319d

File tree

8 files changed

+57
-29
lines changed

8 files changed

+57
-29
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
Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,51 @@
11
Choosing a Programming Tool
22
============================
3-
You will need to select a programming tool to be able to write op modes
4-
for your competition robot. FIRST strongly recommends that *all users*
3+
4+
You need to select a programming tool to be able to create op modes
5+
for your competition robot.
6+
An Op Mode or Operational Mode is program that tells the robot what to do.
7+
There are three programming tools that are available for you to use.
8+
9+
*FIRST* strongly recommends that **all users**
510
begin by learning how to use the :ref:`Blocks programming
611
tool <programming_resources/blocks/blocks-tutorial:blocks programming tutorial>`.
712

8-
There are currently three programming tools that are available for the
9-
teams to use:
13+
The Blocks Programming Tool
14+
---------------------------
1015

11-
1. **The Blocks Programming Tool** - A visual, programming tool that
12-
lets programmers use a web browser to create, edit and save their op
13-
modes. This tool is recommended for novice programmers and for users
14-
who prefer to design their op modes visually, using a drag-and-drop
15-
interface.
16+
A visual programming tool that
17+
lets programmers use a web browser to create, edit and save their op
18+
modes. This tool is recommended for novice programmers and for users
19+
who prefer to design their op modes visually, using a drag-and-drop
20+
interface.
1621

1722
.. image:: images/BlocksPicture1.jpg
23+
:alt: Blocks Programming Tool showing a graphical Blocks program.
1824

19-
2. **The OnBot Java Programming Tool** - A text-based programming
20-
tool that lets programmers use a web browser to create, edit and save
21-
their Java op modes. This tool is recommended for programmers who
22-
have basic to advanced Java skills and who would like to write
23-
text-based op modes.
25+
The OnBot Java Programming Tool
26+
-------------------------------
27+
A text-based programming
28+
tool that lets programmers use a web browser to create, edit and save
29+
their Java op modes. This tool is recommended for programmers who
30+
have basic to advanced Java skills and who would like to write
31+
text-based op modes.
2432

2533
.. image:: images/onBotJavaScreen.jpg
34+
:alt: OnBot Java Programming Tool showing Java source code.
2635

27-
3. **Android Studio** - An advanced integrated development environment
28-
for creating Android apps. This tool is the same tool that
29-
professional Android app developers use. Android Studio is only
30-
recommended for advanced users who have extensive Java programming
31-
experience.
36+
Android Studio
37+
--------------
38+
An advanced integrated development environment
39+
for creating Android apps. This tool is the same tool that
40+
professional Android app developers use. Android Studio is only
41+
recommended for advanced users who have extensive Java programming
42+
experience.
3243

3344
.. image:: images/androidStudioScreen.jpg
45+
:alt: Android Studio showing Java source code.
46+
47+
Recommendations
48+
---------------
3449

3550
Each tool has its own merits and weaknesses. For many users (especially
3651
rookies and novice programmers), **the Blocks Programming Tool is
@@ -43,6 +58,7 @@ Tool. However, OnBot Java is a text-based tool and it requires that the
4358
user have a sound understanding of the Java programming language.
4459

4560
.. image:: images/ipadPhoneChromebook.jpg
61+
:alt: A tablet, a phone, and a laptop each showing the programming tools in use.
4662

4763
It is important to note that with the Blocks Programming Tool and the
4864
OnBot Java Programming Tool, a user only needs a web browser to create,
@@ -53,6 +69,7 @@ Android Studio is a powerful development tool. However, it requires
5369
extensive Java programming knowledge. It also needs a dedicated laptop
5470
to run the Android Studio software. Android Studio offers enhanced
5571
editing and debugging features that are not available on the OnBot Java
56-
Programming Tool. However, it is a more complicated tool and is only
57-
recommended for advanced users.
72+
Programming Tool. However, it is a more complicated tool and you must
73+
spend time learning how to use it.
74+
It is only recommended for advanced users.
5875

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)