Skip to content

Commit 016a1c9

Browse files
authored
Merge branch 'PhotonVision:main' into jetson-orin
2 parents 2566c02 + 8ec2da9 commit 016a1c9

File tree

42 files changed

+113
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+113
-77
lines changed

docs/.styleguide

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ modifiableFileExclude {
1212
\.ico$
1313
\.rknn$
1414
\.svg$
15+
\.woff2$
1516
gradlew
1617
}

docs/source/_static/css/pv-icons.css

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
/*!
2-
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
3-
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
4-
*/
5-
6-
@font-face {
7-
font-family: FontAwesome;
8-
src: url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713);
9-
src: url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix&v=4.7.0) format("embedded-opentype"), url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"), url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"), url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"), url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#fontawesomeregular) format("svg");
10-
font-weight: 400;
11-
font-style:normal
12-
}
13-
141
.code-block-caption>.headerlink, dl dt>.headerlink, h1>.headerlink, h2>.headerlink, h3>.headerlink, h4>.headerlink, h5>.headerlink, h6>.headerlink, p.caption>.headerlink, table>caption>.headerlink {
152
font-family: FontAwesome;
163
font-size: 0.75em;

docs/source/_static/css/v4-font-face.min.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979

8080

8181
def setup(app):
82+
app.add_css_file("css/v4-font-face.min.css")
8283
app.add_css_file("css/pv-icons.css")
8384

8485

docs/source/docs/advanced-installation/sw_install/romi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SSH into the Raspberry Pi (using Windows command line, or a tool like [Putty](ht
1515
:::{attention}
1616
The version of WPILibPi for the Romi is 2023.2.1, which is not compatible with the current version of PhotonVision. **If you are using WPILibPi 2023.2.1 on your Romi, you must install PhotonVision v2023.4.2 or earlier!**
1717

18-
To install a compatible version of PhotonVision, enter these commands in the SSH terminal connected to the Raspberry Pi. This will download and run the install script, which will intall PhotonVision on your Raspberry Pi and configure it to run at startup.
18+
To install a compatible version of PhotonVision, enter these commands in the SSH terminal connected to the Raspberry Pi. This will download and run the install script, which will install PhotonVision on your Raspberry Pi and configure it to run at startup.
1919

2020
```bash
2121
$ wget https://git.io/JJrEP -O install.sh

docs/source/docs/contributing/design-descriptions/camera-matching.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ When a new camera (ie, one we can't match by-path to a deserialized CameraConfig
5050

5151
## Startup:
5252

53-
- GIVEN An emtpy set of deserialized Camera Configurations
53+
- GIVEN An empty set of deserialized Camera Configurations
5454
<br>WHEN PhotonVision starts
5555
<br>THEN no VisionModules will be started
5656

@@ -72,12 +72,12 @@ When a new camera (ie, one we can't match by-path to a deserialized CameraConfig
7272

7373
## Camera (re)enumeration:
7474

75-
- GIVEN a NEW USB CAMERA is avaliable for enumeration
75+
- GIVEN a NEW USB CAMERA is available for enumeration
7676
<br>WHEN a USB camera is discovered by VisionSourceManager
7777
<br>AND the USB camera's VIDEO DEVICE PATH is not in the set of DESERIALIZED CAMERA CONFIGURATIONS
7878
<br>THEN a UNIQUE NAME will be assigned to the camera info
7979

80-
- GIVEN a NEW USB CAMERA is avaliable for enumeration
80+
- GIVEN a NEW USB CAMERA is available for enumeration
8181
<br>WHEN a USB camera is discovered by VisionSourceManager
8282
<br>AND the USB camera's VIDEO DEVICE PATH is in the set of DESERIALIZED CAMERA CONFIGURATIONS
8383
<br>THEN a UNIQUE NAME equal to the matching DESERIALIZED CAMERA CONFIGURATION will be assigned to the camera info
@@ -86,13 +86,13 @@ When a new camera (ie, one we can't match by-path to a deserialized CameraConfig
8686
## Creating from a new camera
8787

8888
- Given: A UNIQUE NAME from a NEW USB CAMERA
89-
<br>WHEN I request a new VisionModule is created for this NEW USB CAMREA
89+
<br>WHEN I request a new VisionModule is created for this NEW USB CAMERA
9090
<br>AND the camera has a VALID USB PATH
9191
<br>AND the camera's VALID USB PATH is not in use by any CURRENTLY ACTIVE CAMERAS
9292
<br>THEN a NEW VisionModule will be started for the NEW USB CAMERA using the VALID USB PATH
9393

9494
- Given: A UNIQUE NAME from a NEW USB CAMERA
95-
<br>WHEN I request a new VisionModule is created for this NEW USB CAMREA
95+
<br>WHEN I request a new VisionModule is created for this NEW USB CAMERA
9696
<br>AND the camera does not have a VALID USB PATH
9797
<br>AND the camera's VIDEO DEVICE PATH is not in use by any CURRENTLY ACTIVE CAMERAS
9898
<br>THEN a NEW VisionModule will be started for the NEW USB CAMERA using the VIDEO DEVICE PATH

0 commit comments

Comments
 (0)