Skip to content

Commit fa96499

Browse files
authored
Merge branch 'main' into android
2 parents bfc405c + ea971ce commit fa96499

File tree

5 files changed

+51
-13
lines changed

5 files changed

+51
-13
lines changed

.github/workflows/link-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Arhive Log
2828
if: ${{ failure() }}
29-
uses: actions/upload-artifact@v2
29+
uses: actions/upload-artifact@v4
3030
with:
3131
name: LINKCHECK--1
3232
path: docs/build/linkcheck/output.txt

.github/workflows/pull-request.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
env:
3535
PR_NUMBER: ${{ github.event.number }}
3636
ID: ${{ github.run_attempt }}
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: FTCDOCS-PDF
4040
path: |
@@ -66,7 +66,7 @@ jobs:
6666
run: make -C docs/ html
6767

6868
- name: Archive Site
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
with:
7171
name: FTCDOCS-HTML
7272
path: 'docs/build/html'
@@ -169,7 +169,7 @@ jobs:
169169
170170
- name: Archive Log
171171
if: always()
172-
uses: actions/upload-artifact@v2
172+
uses: actions/upload-artifact@v4
173173
with:
174174
name: LINKCHECK-PR-${{ github.event.number }}-${{ github.run_attempt }}
175175
path: docs/build/linkcheck/output.txt

docs/source/programming_resources/shared/configuring_android/Configuring-Your-Android-Devices.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ smartphone for use as an DRIVER STATION. The process is as follows,
5555
Renaming Your Smartphones
5656
~~~~~~~~~~~~~~~~~~~~~~~~~
5757

58-
The official rules of the FIRST Tech Challenge (see <RS01>) require that
58+
The official rules of the *FIRST* Tech Challenge (see <RS01>) require that
5959
you change the Wi-Fi name of your smartphones to include your team
6060
number and "-RC" if the phone is a Robot Controller or "-DS" if it is a DRIVER STATION. A team can insert an additional dash and a letter ("A",
6161
"B", "C", etc.) if the team has more than one set of Android phones.
@@ -120,7 +120,7 @@ level, as described below.
120120
* - 7. Select **Configure Device** from the pop-up menu.
121121
- |rename7|
122122

123-
* - 8. Use touch pad to enter new name of device. If the device will be a Robot Controller, specify your team number and -RC. If the device will be a DRIVER STATION, specify your team number and -DS. You can also set the Wi-Fi Direct inactivity timeout to *Never disconnect* and then hit the\ **SAVE** button to save your changes. Note that in the screenshot shown to the right, the team number is 9999. The "-C" indicates that this is from the third pair of smartphones for this team. The -RC indicates that this phone will be a Robot Controller.
123+
* - 8. Use touch pad to enter new name of device. If the device will be a Robot Controller, specify your team number and -RC. If the device will be a DRIVER STATION, specify your team number and -DS. You can also set the Wi-Fi Direct inactivity timeout to *Never disconnect* and then hit the\ **SAVE** button to save your changes. Note that in the screenshot shown to the right, the team number is 9999. The "-C" indicates that this is from the third pair of smartphones for this team. The -RC indicates that this phone will be a Robot Controller.
124124
- |rename8|
125125

126126
* - 9. After renaming phone, power cycle thedevice.
@@ -194,7 +194,7 @@ follows:
194194
* - Step
195195
- Image
196196

197-
* - 1. Go to "Settings", then tap "About device"or "About phone".
197+
* - 1. Go to "Settings", then tap "About device" or "About phone".
198198
- |devop1|
199199

200200
* - 2. Scroll down, then tap Build number seven times. Depending on your device and operating system, you may need to tap Software information, then tap Build number seven times.
@@ -213,7 +213,7 @@ follows:
213213
Placing Phones into Airplane Mode with Wi-Fi On
214214
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
215215

216-
For the FIRST Tech Challenge competitions, it is important that you
216+
For the *FIRST* Tech Challenge competitions, it is important that you
217217
place your Robot Controller and DRIVER STATION devices into Airplane mode
218218
but keep their Wi-Fi radios turned on. This is important because you do
219219
not want any of the cellular telephone functions to be enabled during a
@@ -415,4 +415,4 @@ Note that it will take an estimated 10 minutes to complete this task.
415415
- |pairingns11|
416416

417417
* - 12. Verify that the Robot Controller screen has changed and that it now indicates that it is connected to the DRIVER STATION.The Network status should read active, connected on the Robot Controller's main screen.
418-
- |pairingns12|
418+
- |pairingns12|

docs/source/programming_resources/shared/control_system_intro/The-FTC-Control-System.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ During a competition, each team has two Android devices.
4242
One Android device is mounted onto the robot and is called the *Robot
4343
Controller*. The Robot Controller acts as the “brains” of the robot. It
4444
does all of the thinking for the robot and tells the robot what to do.
45-
It consists of an Android device running an Robot Controller app.
45+
It consists of an Android device running a Robot Controller app.
4646
There are two hardware options currently being used: REV Robotics
4747
Expansion Hub or the REV Robotics Control Hub.
4848

@@ -102,7 +102,7 @@ Controller and the I/O module.
102102
What’s an Op Mode?
103103
~~~~~~~~~~~~~~~~~~
104104

105-
During a typical FIRST Tech Challenge match, a team’s robot has to
105+
During a typical *FIRST* Tech Challenge match, a team’s robot has to
106106
perform a variety of tasks in an effort to score points. For example, a
107107
team might want their robot to follow a white line on the competition
108108
floor and then score a game element (such as a ball) into a goal

docs/source/tech_tips/tech-tips.rst

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,47 @@ on this page chronologically, with the newest content at the top of the page.
1111

1212
Just click to expand the Tech Tip you'd like to read.
1313

14-
.. dropdown:: Week of 08/19/2024 "REV Driver Hub Batteries"
14+
.. dropdown:: Week of 09/09/2024 "AI Innovation Corner - Google AI Studio"
1515
:open:
1616

17+
.. _googleAIstudio:
18+
19+
**AI Innovation Corner - Google AI Studio**
20+
21+
This week’s Tech Tip of the Week launches a new initiative in *FIRST* Tech
22+
Challenge, an AI Innovation Corner. Generative AI has taken the world by
23+
storm, becoming commonplace now in everything from personal assistants,
24+
search engines, recipe curation, music innovation, and vehicle maintenance!
25+
Machine Learning AI has been a part of *FIRST* Tech Challenge in some way for
26+
the past six years, and we’re now transitioning to help teams learn how to
27+
use and incorporate Generative AI in their *FIRST* Tech Challenge experience
28+
(while we’re learning ourselves!).
29+
30+
The first step (or *FIRST* step?) to getting the most out of AI is choosing a
31+
model. What do I mean by model? Every AI is a neural network that has been
32+
trained with specific knowledge with the ability to do specific things based
33+
on that knowledge. Each version of this neural network is stored in a “model”.
34+
Each different company has different models available for different purposes,
35+
though most models are variations on their flagship model (Gemini from Google,
36+
ChatGPT 4-o from OpenAI, Claude from Anthropic, and so on). Each company has
37+
different web-based and API interfaces for interacting with their models, and
38+
everyone has their favorite. In *FIRST* Tech Challenge, the standard tool we use
39+
is `Google AI Studio <https://ai.google.dev/aistudio>`__ to interact with Gemini.
40+
41+
Google AI Studio is free to use, but requires a Google account to access -
42+
virtually all models require a login or API token of some kind to use. Google
43+
AI Studio is our favorite for its list of examples (Prompt Gallery) and its
44+
easy to use interface to save prompt sessions and resume them later. With
45+
Google AI Studio, you also can select the specific model you want to use, and
46+
when available you can choose to use preview versions of up and coming models.
47+
48+
Future AI articles will be released not under the “Tech Tip of the Week” headline
49+
but under the “AI Innovation Corner” headline. Keep an eye out for future AI tips
50+
via the Team Blast and `ftc-docs <https://ftc-docs.firstinspires.org/en/latest/>`__
51+
website!
52+
53+
.. dropdown:: Week of 08/19/2024 "REV Driver Hub Batteries"
54+
1755
.. _driverhubbatteries:
1856

1957
**REV Driver Hub Batteries**
@@ -550,7 +588,7 @@ Just click to expand the Tech Tip you'd like to read.
550588
* - `Studica Multi-Mode Smart Servo <https://www.studica.com/studica-robotics-brand/multi-mode-smart-servo>`__
551589
- 62 RPM
552590
- 20 kg-cm
553-
- ??
591+
- 1.8 A
554592
- 3.18 W
555593
- $23.99
556594
* - `AndyMark am-4955 High Speed Servos <https://www.andymark.com/products/programmable-servos>`__

0 commit comments

Comments
 (0)