Skip to content

Commit cc8f482

Browse files
committed
restore grid on UVC page, but link to visionportal-webcams page instead. Remove TFOD ref and links from webcam images.
1 parent 458c2cc commit cc8f482

File tree

3 files changed

+59
-12
lines changed

3 files changed

+59
-12
lines changed

docs/source/apriltag/vision_portal/visionportal_webcams/visionportal-webcams.rst

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,32 @@ This is a short list of common webcams that are known to work with the
66
and the
77
:ref:`FTC Camera Controls <apriltag/vision_portal/visionportal_camera_controls/visionportal-camera-controls:visionportal camera controls>`.
88

9-
VisionPortal is a comprehensive new interface for FTC vision processing,
10-
including AprilTag and TensorFlow Object Detection (TFOD).
9+
VisionPortal is a comprehensive interface for FTC vision processing.
10+
Example use cases for a webcam are:
11+
12+
- :doc:`detecting <../../../apriltag/understanding_apriltag_detection_values/understanding-apriltag-detection-values>` an AprilTag,
13+
- determining where the robot is :doc:`located <../../../apriltag/vision_portal/apriltag_localization/apriltag-localization>` on the field,
14+
- using OpenCV to :doc:`detect colors or shapes <../../../color_processing/index>` of game elements.
1115

1216
Many more webcams can work with the FTC VisionPortal; this is a short
1317
list of models with built-in calibrations suitable for AprilTag
1418
:ref:`pose estimation <apriltag/vision_portal/apriltag_pose/apriltag-pose:aprilTag pose>`.
1519

20+
.. _logitech_c270_label:
21+
1622
Logitech C270
1723
-------------
1824

1925
.. figure:: images/010-C270.png
2026
:align: center
2127
:width: 55%
28+
:class: no-scaled-link
2229
:alt: C270 Camera
2330

2431
Logitech C270 Camera
2532

2633
The `Logitech C270 <https://www.logitech.com/en-us/products/webcams/c270-hd-webcam.960-000694.html>`__
27-
is available at the FIRST Storefront for new FTC teams, and at many
34+
is available at the *FIRST* Storefront for new FTC teams, and at many
2835
online retailers.
2936

3037
**FTC Hot Take:**
@@ -51,6 +58,7 @@ Logitech C310
5158
.. figure:: images/030-C310.png
5259
:align: center
5360
:width: 55%
61+
:class: no-scaled-link
5462
:alt: C310 Camera
5563

5664
Logitech C310 Camera
@@ -77,12 +85,15 @@ The FTC SDK provides **built-in calibration values** for the FTC
7785
VisionPortal default resolution of 640x480, and for 640x360. Learn more at
7886
:ref:`AprilTag Camera Calibration <apriltag/vision_portal/apriltag_camera_calibration/apriltag-camera-calibration:apriltag camera calibration>`.
7987

88+
.. _logitech_c920_label:
89+
8090
Logitech C920
8191
-------------
8292

8393
.. figure:: images/020-C920.png
8494
:align: center
8595
:width: 55%
96+
:class: no-scaled-link
8697
:alt: C920 Camera
8798

8899
Logitech C920 Camera
@@ -119,6 +130,7 @@ Microsoft LifeCam HD-3000 v1/v2
119130
.. figure:: images/040-LifeCam-3000.png
120131
:align: center
121132
:width: 55%
133+
:class: no-scaled-link
122134
:alt: LifeCam-3000 Camera
123135

124136
Microsoft LifeCam HD-3000 v1/v2
@@ -184,6 +196,7 @@ Arducam Global Shutter 120 FPS
184196
.. figure:: images/050-Arducam.png
185197
:align: center
186198
:width: 55%
199+
:class: no-scaled-link
187200
:alt: Arducam GS 120 Camera
188201

189202
Arducam GS 120 Camera

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

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
11
UVC Webcam
22
===========
33

4-
A webcam is a device that provides visual images of the surrounding
5-
environment. For use as part of *FIRST* Tech Challenge teams must use a commercially available off-the-shelf (COTS)
4+
A webcam is a device that provides visual images of the surrounding environment.
5+
UVC, or USB Video Class, is a standard that allows USB devices, like webcams and digital cameras, to stream video to computers without needing special drivers.
6+
For use as part of *FIRST* Tech Challenge teams must use a commercially available off-the-shelf (COTS)
67
USB Video Class `(UVC) <https://www.usb.org/document-library/video-class-v15-document-set>`_
78
compatible camera. This device can be connected directly to
89
the REV Control Hub or to the Robot Control system via a USB hub.
910

10-
.. figure:: images/C270.jpg
11-
:width: 33%
12-
:align: center
13-
:class: no-scaled-link
14-
:alt: Example UVC camera
15-
16-
Logitech C270 Webcam
11+
.. grid:: 1 2 2 2
12+
:gutter: 2
13+
14+
.. grid-item-card::
15+
:class-header: sd-bg-dark font-weight-bold sd-text-white
16+
:class-body: sd-text-left body
17+
18+
Budget Webcam
19+
20+
^^^
21+
22+
.. figure:: images/C270.jpg
23+
:align: center
24+
:width: 50 %
25+
:class: no-scaled-link
26+
:alt: Example UVC webcam
27+
28+
+++
29+
30+
:ref:`logitech_c270_label`
31+
32+
.. grid-item-card::
33+
:class-header: sd-bg-dark font-weight-bold sd-text-white
34+
:class-body: sd-text-left body
35+
36+
Mid-range Webcam
37+
38+
^^^
39+
40+
.. figure:: images/C920.jpg
41+
:align: center
42+
:width: 50 %
43+
:class: no-scaled-link
44+
:alt: Example UVC webcam
45+
46+
+++
47+
48+
:ref:`logitech_c920_label`
1749

1850
Webcams are intended to be used in computer vision related tasks.
1951
Example use cases for a webcam are:

docs/source/hardware_and_software_configuration/configuring/managing_esd/managing-esd.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ electrostatic charge on the robots as the move across the tile floor.
113113
.. image:: images/heavydutystaticide.jpg
114114
:alt: A gallon jug and a quart spray bottle of ACL Heavy Duty Staticide.
115115
:align: center
116+
117+
|
116118
117119
*FIRST* recommends the use of `ACL Heavy Duty
118120
Staticide <https://www.aclstaticide.com/products/heavy-duty-staticide>`__

0 commit comments

Comments
 (0)