Skip to content

Commit c91c1fa

Browse files
authored
Merge pull request #286 from miriamsr/nomenclature
Programming Guide Nomenclature Updates
2 parents 7643c54 + e44a653 commit c91c1fa

File tree

14 files changed

+135
-139
lines changed

14 files changed

+135
-139
lines changed

docs/source/hardware_and_software_configuration/configuring/configuring_dual_hubs/configuring-dual-hubs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ports.
1212

1313
This document describes how to connect and configure two Expansion Hubs
1414
for use in the FIRST Tech Challenge. Note that the FIRST Tech Challenge
15-
Game Manual Part 1 (rule <RE07>, part f) limits the maximum number of
15+
Competition Manual limits the maximum number of
1616
Expansion Hubs on a single robot to two.
1717

1818
**Important Note:** This document describes the process for setting up a
@@ -82,7 +82,7 @@ first Expansion Hub before connecting the second Expansion Hub.
8282

8383
With your first Expansion Hub connected to the 12V battery and to the Robot
8484
Controller, launch the Settings menu from the Robot Controller app (note you
85-
can also do this from the Driver Station app, if the Driver Station is
85+
can also do this from the Driver Station app, if the DRIVER STATION is
8686
paired to the Robot Controller).
8787

8888
1. Select the Advanced Settings item to display the Advanced Settings menu.

docs/source/hardware_and_software_configuration/configuring/configuring_external_webcam/configuring-external-webcam.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Camera Configuration
5050
Before using the external camera, it must be added to the active
5151
configuration file as a USB-connected device.
5252

53-
Use the Configure Robot menu item on the paired Driver Station phone to
53+
Use the Configure Robot menu item on the paired DRIVER STATION device to
5454
add the webcam as a USB-connected device to an existing or newly created
5555
configuration file. Note that the Scan operation for the Configure Robot
5656
activity should detect the webcam and give it a default name of “Webcam
@@ -85,7 +85,7 @@ Image Preview
8585
The *FIRST* Tech Challenge apps provide camera preview for ‘stream-enabled’ Op
8686
Modes using Vuforia or TensorFlow Object Detection (TFOD).
8787

88-
On a paired Driver Station phone, with the camera connected and
88+
On a paired DRIVER STATION device, with the camera connected and
8989
configured, select a stream-enabled Op Mode. Press the INIT button, and
9090
wait briefly for streaming software to initialize; do not press the
9191
START button. Instead open the main menu (the 3 dots in upper right hand
@@ -95,7 +95,7 @@ for safety.
9595

9696
.. image:: images/DS-webcam-preview-CH-1.jpg
9797

98-
The camera image will appear on the Driver Station screen. Manually
98+
The camera image will appear on the DRIVER STATION screen. Manually
9999
touch the image to refresh it. To preserve bandwidth, only one frame is
100100
sent at a time.
101101

@@ -117,7 +117,7 @@ command:
117117
.. image:: images/activateBeforeWaitForStart.jpg
118118

119119
If you do not see the Camera Stream option in your main menu on your
120-
Driver Station, then verify that the Vuforia function is activated
120+
DRIVER STATION, then verify that the Vuforia function is activated
121121
before the waitForStart command in your Op Mode. Also make sure you’ve
122122
given the system enough time to initialize the Vuforia software before
123123
you check to see if Camera Stream is available.

docs/source/hardware_and_software_configuration/configuring/getting_started/getting-started.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Connecting an Android Smartphone to an Expansion Hub
1717
If you are using an Android smartphone as a Robot Controller, you must
1818
physically connect the Robot Controller smartphone to the Expansion Hub
1919
using a USB cable and an On-The-Go (OTG) adapter. Also, you should
20-
verify that the Driver Station is currently paired to the Robot
20+
verify that the DRIVER STATION is currently paired to the Robot
2121
Controller.
2222

2323
Connecting an Android Smartphone to an Expansion Hub Instructions
@@ -80,19 +80,19 @@ Getting the Control Hub Ready
8080

8181
If you are using a Control Hub, you do not need to make any additional
8282
connections. You simply need to make sure that the Control Hub is
83-
powered on and paired to the Driver Station.
83+
powered on and paired to the DRIVER STATION.
8484

85-
Creating a Configuration File Using the Driver Station
85+
Creating a Configuration File Using the DRIVER STATION
8686
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8787

8888
Although the configuration file needs to reside on the Robot Controller,
89-
for this tutorial we will use the Driver Station app to create the
90-
configuration file remotely. The Driver Station can be used to create a
89+
for this tutorial we will use the DRIVER STATION app to create the
90+
configuration file remotely. The DRIVER STATION can be used to create a
9191
configuration file for a Control Hub or for an Android smartphone Robot
9292
Controller.
9393

9494

95-
Creating a Configuration File on the Robot Controller using the Driver Station Instructions
95+
Creating a Configuration File on the Robot Controller using the DRIVER STATION Instructions
9696
-------------------------------------------------------------------------------------------
9797

9898
1. Touch the three vertical dots in the upper right hand corner of

docs/source/hardware_and_software_configuration/configuring/saving_config/saving-config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ back-arrow button to return to the main screen of the app.
5656
|
5757
5858
7. Verify that the configuration file is the active configuration
59-
file on the main Driver Station screen.
59+
file on the main DRIVER STATION screen.
6060

6161
.. image:: images/SavingConfigurationInformationNewStep7.jpg
6262
:align: center

0 commit comments

Comments
 (0)