Skip to content

Commit

Permalink
Merge pull request #48 from StuyPulse/revert-47-chezy-hotel
Browse files Browse the repository at this point in the history
Revert "skeebeedee"
  • Loading branch information
jopy-wng authored Oct 11, 2024
2 parents d58f9e7 + ced245c commit 8410c76
Show file tree
Hide file tree
Showing 59 changed files with 357 additions and 797 deletions.
Binary file removed logs/FRC_20241010_221524.wpilog
Binary file not shown.
8 changes: 7 additions & 1 deletion src/main/deploy/pathplanner/autos/ADEF BLUE.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3901542060896621,
"y": 6.569495408336055
},
"rotation": -0.16089256168708133
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -49,7 +56,6 @@
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"choreoAuto": false
}
1 change: 0 additions & 1 deletion src/main/deploy/pathplanner/autos/ADEF RED.auto
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Red Autons",
"choreoAuto": false
}
8 changes: 7 additions & 1 deletion src/main/deploy/pathplanner/autos/BCA BLUE.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.5588456716347956,
"y": 5.5301848373414
},
"rotation": 0.7711444982014979
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"choreoAuto": false
}
8 changes: 7 additions & 1 deletion src/main/deploy/pathplanner/autos/BCA RED.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.5588456716347956,
"y": 5.5301848373414
},
"rotation": 0.7711444982014979
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Red Autons",
"choreoAuto": false
}
8 changes: 7 additions & 1 deletion src/main/deploy/pathplanner/autos/HGF BLUE.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7437038962619593,
"y": 4.320740582515391
},
"rotation": -61.150838114458885
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"choreoAuto": false
}
8 changes: 7 additions & 1 deletion src/main/deploy/pathplanner/autos/HGF Red.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7905759905641836,
"y": 4.310885424226206
},
"rotation": -60.092064589198905
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Red Autons",
"choreoAuto": false
}
11 changes: 4 additions & 7 deletions src/main/deploy/pathplanner/paths/Blue A to Center.path
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -40,13 +39,11 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 28.70481879170682
"rotation": 28.70481879170682,
"rotateFast": false
},
"reversed": false,
"folder": "Blue To Shoot",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"folder": "Blue To Subwoofers",
"previewStartingState": null,
"useDefaultConstraints": false
}
18 changes: 9 additions & 9 deletions src/main/deploy/pathplanner/paths/Blue A to D.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"prevControl": null,
"nextControl": {
"x": 8.722728490843886,
"x": 8.722728490843888,
"y": 7.477996780770348
},
"isLocked": false,
Expand All @@ -20,8 +20,8 @@
"y": 7.530253156674468
},
"prevControl": {
"x": 3.4714674888799175,
"y": 7.078310019715278
"x": 3.4714674888799184,
"y": 7.0783100197152775
},
"nextControl": null,
"isLocked": false,
Expand All @@ -30,7 +30,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -40,13 +39,14 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
"rotation": 0,
"rotateFast": false
},
"reversed": false,
"folder": "Blue To Note",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
"folder": "Blue To Notes",
"previewStartingState": {
"rotation": 34.908040095775505,
"velocity": 0
},
"useDefaultConstraints": false
}
44 changes: 20 additions & 24 deletions src/main/deploy/pathplanner/paths/Blue ABC Waypoints.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"prevControl": null,
"nextControl": {
"x": 2.775532808819606,
"y": 7.110065798882234
"x": 2.9075282655371586,
"y": 7.045342819474668
},
"isLocked": false,
"linkedName": "Blue BCA A"
Expand All @@ -20,7 +20,6 @@
"y": 5.75
},
"prevControl": {

"x": 3.3415525097874537,
"y": 5.754086506726766
},
Expand Down Expand Up @@ -53,12 +52,12 @@
"y": 6.298406444469139
},
"prevControl": {
"x": 1.8960030914004606,
"y": 6.396341519083642
"x": 2.117196006835459,
"y": 6.302164304992502
},
"nextControl": {
"x": 2.356041007925834,
"y": 6.200471369854635
"x": 2.1348480924908353,
"y": 6.294648583945776
},
"isLocked": false,
"linkedName": "Blue BCA A Shoot Pose"
Expand All @@ -69,12 +68,12 @@
"y": 5.55
},
"prevControl": {
"x": 1.7107599127148272,
"y": 5.622554673424824
"x": 1.9402510098439658,
"y": 5.552956589779829
},
"nextControl": {
"x": 2.1892400872851727,
"y": 5.477445326575175
"x": 1.959748990156034,
"y": 5.54704341022017
},
"isLocked": false,
"linkedName": "Blue BCA B Shoot Pose"
Expand All @@ -85,12 +84,12 @@
"y": 5.5301848373414
},
"prevControl": {
"x": 1.308964948763653,
"y": 5.53790651704178
"x": 1.5461432500280547,
"y": 5.530577360741923
},
"nextControl": {
"x": 1.8087263945059382,
"y": 5.52246315764102
"x": 1.5715480932415364,
"y": 5.529792313940877
},
"isLocked": false,
"linkedName": "Blue BCA Starting Pose"
Expand All @@ -101,8 +100,8 @@
"y": 6.43
},
"prevControl": {
"x": 2.1642311849658524,
"y": 6.346855151347819
"x": 2.377846597750998,
"y": 6.4221875109867375
},
"nextControl": null,
"isLocked": false,
Expand All @@ -111,7 +110,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -121,13 +119,11 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
"rotation": 0,
"rotateFast": false
},
"reversed": false,
"folder": "Blue Util",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"folder": "Utils",
"previewStartingState": null,
"useDefaultConstraints": false
}
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/paths/Blue Amp to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"y": 7.029418819812343
},
"prevControl": {
"x": 1.6866262117940902,
"x": 1.6866262117940904,
"y": 6.629683984814398
},
"nextControl": null,
Expand All @@ -30,7 +30,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -40,13 +39,14 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 10.233677721117825
"rotation": 10.233677721117825,
"rotateFast": false
},
"reversed": false,
"folder": "Blue To Note",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
"folder": "Blue To Notes",
"previewStartingState": {
"rotation": 0.2809818448982869,
"velocity": 0
},
"useDefaultConstraints": false
}
11 changes: 4 additions & 7 deletions src/main/deploy/pathplanner/paths/Blue B to C.path
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -40,13 +39,11 @@
},
"goalEndState": {
"velocity": 0,
"rotation": -52.152217001769735
"rotation": -52.15221700176973,
"rotateFast": false
},
"reversed": false,
"folder": "Blue To Note",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"folder": "Blue To Notes",
"previewStartingState": null,
"useDefaultConstraints": false
}
11 changes: 4 additions & 7 deletions src/main/deploy/pathplanner/paths/Blue B to Center.path
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
Expand All @@ -40,13 +39,11 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 1.0588668160039703
"rotation": 1.0588668160039703,
"rotateFast": false
},
"reversed": false,
"folder": "Blue To Shoot",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"folder": "Blue To Subwoofers",
"previewStartingState": null,
"useDefaultConstraints": false
}
Loading

0 comments on commit 8410c76

Please sign in to comment.