Skip to content

Commit

Permalink
Merge branch 'develop' into feature/elevator-sim
Browse files Browse the repository at this point in the history
  • Loading branch information
vichik123 committed Jan 24, 2024
2 parents aff8ea8 + b9f6d37 commit f261626
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 5 deletions.
13 changes: 13 additions & 0 deletions important-files/advantage-scope/cad/Robot_UNKNOWN/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Robot Parts
- model.glb is the chassis + gearboxes
![](pictures/chassis.png)
- model0.glb is the intake
![](pictures/intake.png)
- model1.glb is the first stage of the elevator
![](pictures/elevator1.png)
- model2.glb is the second stage of the elevator
![](pictures/elevator2.png)
- model3.glb is the wrist + gripper
![](pictures/gripper.png)
- model4.glb is the shooter
![](pictures/shooter.png)
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions vendordeps/PhotonLib-json-1.0.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "photonlib.json",
"name": "photonlib",
"version": "v2024.2.0",
"version": "v2024.2.1",
"uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -14,7 +14,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-cpp",
"version": "v2024.2.0",
"version": "v2024.2.1",
"libName": "photonlib",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -29,7 +29,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-cpp",
"version": "v2024.2.0",
"version": "v2024.2.1",
"libName": "photontargeting",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -46,12 +46,12 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-java",
"version": "v2024.2.0"
"version": "v2024.2.1"
},
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-java",
"version": "v2024.2.0"
"version": "v2024.2.1"
}
]
}

0 comments on commit f261626

Please sign in to comment.