Skip to content

Commit

Permalink
Merge pull request #286 from miriamsr/nomenclature
Browse files Browse the repository at this point in the history
Programming Guide Nomenclature Updates
  • Loading branch information
emcclurg authored Jul 30, 2024
2 parents 7643c54 + e44a653 commit c91c1fa
Show file tree
Hide file tree
Showing 14 changed files with 135 additions and 139 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ports.

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

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

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

1. Select the Advanced Settings item to display the Advanced Settings menu.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Camera Configuration
Before using the external camera, it must be added to the active
configuration file as a USB-connected device.

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

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

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

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

Expand All @@ -117,7 +117,7 @@ command:
.. image:: images/activateBeforeWaitForStart.jpg

If you do not see the Camera Stream option in your main menu on your
Driver Station, then verify that the Vuforia function is activated
DRIVER STATION, then verify that the Vuforia function is activated
before the waitForStart command in your Op Mode. Also make sure you’ve
given the system enough time to initialize the Vuforia software before
you check to see if Camera Stream is available.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Connecting an Android Smartphone to an Expansion Hub
If you are using an Android smartphone as a Robot Controller, you must
physically connect the Robot Controller smartphone to the Expansion Hub
using a USB cable and an On-The-Go (OTG) adapter. Also, you should
verify that the Driver Station is currently paired to the Robot
verify that the DRIVER STATION is currently paired to the Robot
Controller.

Connecting an Android Smartphone to an Expansion Hub Instructions
Expand Down Expand Up @@ -80,19 +80,19 @@ Getting the Control Hub Ready

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

Creating a Configuration File Using the Driver Station
Creating a Configuration File Using the DRIVER STATION
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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


Creating a Configuration File on the Robot Controller using the Driver Station Instructions
Creating a Configuration File on the Robot Controller using the DRIVER STATION Instructions
-------------------------------------------------------------------------------------------

1. Touch the three vertical dots in the upper right hand corner of
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ back-arrow button to return to the main screen of the app.
|
7. Verify that the configuration file is the active configuration
file on the main Driver Station screen.
file on the main DRIVER STATION screen.

.. image:: images/SavingConfigurationInformationNewStep7.jpg
:align: center
Expand Down
Loading

0 comments on commit c91c1fa

Please sign in to comment.