Skip to content

Commit

Permalink
Final changes before HVR (#19)
Browse files Browse the repository at this point in the history
* autons

* Drive slower when climbing, fix issue where climb shimmy wouldnt work after clicking the climb button

* Fix Led disable/enable, but dont use them to automatically disable leds on brownout anymore

---------

Co-authored-by: jopy-man <jophyw2008@gmail.com>
Co-authored-by: SP-COMPuter <se@stuypulse.com>
  • Loading branch information
3 people authored Mar 5, 2025
1 parent 6aed38e commit 17dcf3f
Show file tree
Hide file tree
Showing 31 changed files with 223 additions and 154 deletions.
6 changes: 3 additions & 3 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
0.0,
0.8500000238418579
],
"height": 246,
"height": 9,
"series": [
{
"color": [
Expand Down Expand Up @@ -171,7 +171,7 @@
0.0,
0.8500000238418579
],
"height": 252,
"height": 4,
"series": [
{
"color": [
Expand Down Expand Up @@ -216,7 +216,7 @@
0.0,
0.8500000238418579
],
"height": 255,
"height": 338,
"series": [
{
"color": [
Expand Down
54 changes: 54 additions & 0 deletions src/main/deploy/pathplanner/paths/Blue BackOut.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"version": "2025.0",
"waypoints": [
{
"anchor": {
"x": 3.130766078404018,
"y": 3.987458147321428
},
"prevControl": null,
"nextControl": {
"x": 2.4307846866812923,
"y": 3.9855380966188827
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 2.008438110351562,
"y": 3.987458147321428
},
"prevControl": {
"x": 2.3820491423180936,
"y": 3.9898671591817343
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.5,
"maxAcceleration": 6.5,
"maxAngularVelocity": 400.0,
"maxAngularAcceleration": 900.0,
"nominalVoltage": 12.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
},
"reversed": false,
"folder": "Blue To Reef",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": true
}
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue C to HP.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.6985252823155137,
"y": 0.8971043034675463
"x": 1.677412418798617,
"y": 0.8471545847260358
},
"isLocked": false,
"linkedName": "Blue C"
},
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": {
"x": 3.737200992380205,
"y": 2.8530360697815818
"x": 3.788332020846281,
"y": 2.889014908288104
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue D to HP.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.8605444364226367,
"y": 0.9854132797650605
"x": 1.8225941623865167,
"y": 0.9652696810756025
},
"isLocked": false,
"linkedName": "Blue D"
},
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": {
"x": 3.954160171217385,
"y": 2.626486428499679
"x": 4.002363647577118,
"y": 2.672353652686721
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue F to HP.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 3.2620367554761347,
"y": 1.5942877571591252
"x": 3.0690825922922467,
"y": 1.4826731027701139
},
"isLocked": false,
"linkedName": "Blue F"
},
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": {
"x": 4.325671129429348,
"y": 2.5087394659652102
"x": 4.392638728135962,
"y": 2.5643336949054336
},
"nextControl": null,
"isLocked": false,
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/paths/Blue HP to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 1.354610655737705,
"y": 6.88406762295082
"x": 1.342622950819672,
"y": 6.872079918032787
},
"prevControl": null,
"nextControl": {
"x": 3.0185543074558416,
"y": 4.130926506333982
"x": 3.217626268326285,
"y": 3.961511494358123
},
"isLocked": false,
"linkedName": "Blue Top Mid HP"
"linkedName": "aaa"
},
{
"anchor": {
"x": 3.153311593191964,
"y": 4.056981985909598
},
"prevControl": {
"x": 1.6399464096727052,
"y": 6.456166923141883
"x": 1.7005246407637633,
"y": 6.462451079704511
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue HP to B.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": null,
"nextControl": {
"x": 3.278014707094127,
"y": 3.9313783796874358
"x": 3.3143676959420842,
"y": 4.054023214796178
},
"isLocked": false,
"linkedName": "Blue Bottom HP"
Expand All @@ -20,8 +20,8 @@
"y": 3.745935494559151
},
"prevControl": {
"x": 1.9655352353411903,
"y": 1.1714619875691703
"x": 1.9196513965557038,
"y": 1.1263126583417824
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue HP to C.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": null,
"nextControl": {
"x": 3.8519385139756572,
"y": 2.923855006007301
"x": 3.887690042299406,
"y": 2.981845960209278
},
"isLocked": false,
"linkedName": "Blue Bottom HP"
Expand All @@ -20,8 +20,8 @@
"y": 2.8778821672712045
},
"prevControl": {
"x": 1.6621511721526612,
"y": 0.8142201061463772
"x": 1.7844347968057808,
"y": 0.9498302079691132
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue HP to D.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.7121498842592582,
"y": 0.8800611255787032
"x": 1.7913482666015625,
"y": 0.9482513427734375
},
"prevControl": null,
"nextControl": {
"x": 3.9866169573934513,
"y": 2.6405271372011967
"x": 4.1241515435850244,
"y": 2.749499850204644
},
"isLocked": false,
"linkedName": "Blue Bottom HP"
Expand All @@ -20,8 +20,8 @@
"y": 2.720726667131696
},
"prevControl": {
"x": 1.7195736475073975,
"y": 0.8937831054457632
"x": 1.7412309402681876,
"y": 0.9094087279150944
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue HP to K.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.7741803278688524,
"y": 7.183760245901639
"x": 1.6063524590163931,
"y": 7.09984631147541
},
"prevControl": null,
"nextControl": {
"x": 3.757305409574343,
"y": 5.254943261589902
"x": 3.638808428972556,
"y": 5.351750663763782
},
"isLocked": false,
"linkedName": "Blue Top HP"
Expand All @@ -20,8 +20,8 @@
"y": 5.176861572265625
},
"prevControl": {
"x": 2.224887634231969,
"y": 6.748836069969589
"x": 2.0005647699539297,
"y": 6.755161955192514
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue HP to L.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.7741803278688524,
"y": 7.183760245901639
"x": 1.6063524590163931,
"y": 7.09984631147541
},
"prevControl": null,
"nextControl": {
"x": 3.7029177565272953,
"y": 4.9216803048390085
"x": 3.6368903377343007,
"y": 4.967128012813742
},
"isLocked": false,
"linkedName": "Blue Top HP"
Expand All @@ -20,8 +20,8 @@
"y": 5.040517316545759
},
"prevControl": {
"x": 1.7576918884396222,
"y": 7.243278319391836
"x": 1.5817667818224175,
"y": 7.11403249469179
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue I to HP.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.5846640709918303,
"y": 7.274646284814007
"x": 1.5408853727842464,
"y": 7.148472680180902
},
"isLocked": false,
"linkedName": "Blue I"
},
{
"anchor": {
"x": 1.7741803278688524,
"y": 7.183760245901639
"x": 1.6063524590163931,
"y": 7.09984631147541
},
"prevControl": {
"x": 4.460646288383377,
"y": 5.560880858658683
"x": 4.331554380404954,
"y": 5.570135413249622
},
"nextControl": null,
"isLocked": false,
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue K to HP.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.8000527892191318,
"y": 7.14089215726772
"x": 1.6718812290053702,
"y": 7.025013453945311
},
"isLocked": false,
"linkedName": "Blue K"
},
{
"anchor": {
"x": 1.7741803278688524,
"y": 7.183760245901639
"x": 1.6063524590163931,
"y": 7.09984631147541
},
"prevControl": {
"x": 3.749281554037403,
"y": 5.240180917200231
"x": 3.7617441426829132,
"y": 5.2331725795843145
},
"nextControl": null,
"isLocked": false,
Expand Down
Loading

0 comments on commit 17dcf3f

Please sign in to comment.