Skip to content

Commit 2afc5ec

Browse files
committed
minor edits
1 parent 9327d1b commit 2afc5ec

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

docs/source/control_hard_compon/rc_components/uvc/uvc.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the REV Control Hub or to the Robot Control system via a USB hub.
2323
:align: center
2424
:width: 50 %
2525
:class: no-scaled-link
26-
:alt: Example UVC webcam
26+
:alt: Example budget UVC webcam
2727

2828
+++
2929

@@ -41,7 +41,7 @@ the REV Control Hub or to the Robot Control system via a USB hub.
4141
:align: center
4242
:width: 50 %
4343
:class: no-scaled-link
44-
:alt: Example UVC webcam
44+
:alt: Example mid-range UVC webcam
4545

4646
+++
4747

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ pressed to continue running the Op Mode.
122122
.. image:: images/DS-webcam-preview-CH-3.jpg
123123
:alt: Driver Station screen shot showing the menu with the Camera Stream option circled in yellow.
124124

125-
**Important Note:** Because the Camera Stream feature is only available
126-
during the INIT phase of an Op Mode, you must ensure that the VisionPortal
127-
is activated in your Op Mode **before** the waitForStart command:
125+
.. note:: Because the Camera Stream feature is only available
126+
during the INIT phase of an Op Mode, you must ensure that the VisionPortal
127+
is activated in your Op Mode **before** the waitForStart command:
128128

129129
.. image:: images/activateBeforeWaitForStart.png
130130
:alt: Blocks code showing the INIT code for the webcam is called before wait for start.
@@ -150,10 +150,10 @@ to install and run scrcpy on your computer.
150150
.. image:: images/webcamWithScrcpy.jpg
151151
:alt: Screen shot showing the camera output viewed with scrcpy.
152152

153-
**Important Note:** While scrcpy is a great way to view the camera output
154-
outside of competitions, the Competition Manual does not allow teams to
155-
have any devices other than the DRIVER STATION connected to your Control
156-
Hub during a match.
153+
.. warning:: While scrcpy is a great way to view the camera output,
154+
the Competition Manual does not allow teams to
155+
have any devices other than the DRIVER STATION connected to your Control
156+
Hub during a match.
157157

158158
External HDMI Monitor
159159
---------------------
@@ -164,10 +164,10 @@ device plugged into the HDMI port on the REV Control Hub.
164164
.. image:: images/HDMIMonitor.jpg
165165
:alt: Photo showing an external HDMI monitor displaying the camera output from a connected control hub.
166166

167-
**Important Note:** While a portable display monitor can be used to view
168-
or troubleshoot the camera stream on your Control Hub, teams are not
169-
allowed to have a portable display monitor connected to their Control
170-
Hub during a match.
167+
.. warning:: While a portable display monitor can be used to view
168+
or troubleshoot the camera stream on your Control Hub, teams are not
169+
allowed to have a portable display monitor connected to their Control
170+
Hub during a match.
171171

172172
Advanced Users
173173
--------------
@@ -191,6 +191,9 @@ This avoid the ESD issue with devices on the USB 2.0 port.
191191

192192
.. note:: If you're using two standard UVC webcams you are not required to use a powered USB hub.
193193

194+
However, some webcams like the Logitech C920 draw more power than others and there are reports of them drawing too much power from the USB port when used at the same time.
195+
Therefore, you should probably use a powered USB hub for the C920.
196+
194197
Another use case for a USB hub is if you have a `Limelight 3A <https://limelightvision.io/products/limelight-3a>`_ camera.
195198
This device has its own processor on board and one drawback of this is that the camera always draws power, even when an opMode is not running.
196199
By adding a powered USB hub the Limelight will not drain your robot's battery.
@@ -212,7 +215,7 @@ It has a USB C port that can supply power to all connected devices.
212215

213216
The USB Hub is connected to the USB 3.0 port of the Control Hub.
214217
A powerbank is connected to the USB C port on the USB hub to supply power to the connected devices.
215-
Two Logitech 920 webcams are connected to the USB hub.
218+
Two Logitech C920 webcams are connected to the USB hub.
216219

217220
See the `AprilTag Switchable Cameras <https://github.com/FIRST-Tech-Challenge/FtcRobotController/blob/master/FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagSwitchableCameras.java>`_ sample program that demonstrates swapping between the two cameras to detect AprilTags.
218221

@@ -226,7 +229,7 @@ This example shows both a Limelight and a webcam.
226229

227230
The USB Hub is connected to the USB 3.0 port of the Control Hub.
228231
A powerbank is connected to the USB C port on the USB hub to supply power to the connected devices.
229-
A Logitech 270 webcam and a Limelight 3A are connected to the USB hub.
232+
A Logitech C270 webcam and a Limelight 3A are connected to the USB hub.
230233

231234
The Limelight 3A is not a compatible VisionPortal device. So you can't use the AprilTag switchable camera sample code.
232235
But you can still get results from either the Limelight and/or the VisionPortal webcam and use them as required.

0 commit comments

Comments
 (0)