Skip to content

Commit 17dcf3f

Browse files
IanShiiijopy-wngSP-COMPuter
authored
Final changes before HVR (#19)
* 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>
1 parent 6aed38e commit 17dcf3f

31 files changed

+223
-154
lines changed

simgui.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
0.0,
127127
0.8500000238418579
128128
],
129-
"height": 246,
129+
"height": 9,
130130
"series": [
131131
{
132132
"color": [
@@ -171,7 +171,7 @@
171171
0.0,
172172
0.8500000238418579
173173
],
174-
"height": 252,
174+
"height": 4,
175175
"series": [
176176
{
177177
"color": [
@@ -216,7 +216,7 @@
216216
0.0,
217217
0.8500000238418579
218218
],
219-
"height": 255,
219+
"height": 338,
220220
"series": [
221221
{
222222
"color": [
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2025.0",
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 3.130766078404018,
7+
"y": 3.987458147321428
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 2.4307846866812923,
12+
"y": 3.9855380966188827
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 2.008438110351562,
20+
"y": 3.987458147321428
21+
},
22+
"prevControl": {
23+
"x": 2.3820491423180936,
24+
"y": 3.9898671591817343
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"pointTowardsZones": [],
34+
"eventMarkers": [],
35+
"globalConstraints": {
36+
"maxVelocity": 5.5,
37+
"maxAcceleration": 6.5,
38+
"maxAngularVelocity": 400.0,
39+
"maxAngularAcceleration": 900.0,
40+
"nominalVoltage": 12.0,
41+
"unlimited": false
42+
},
43+
"goalEndState": {
44+
"velocity": 0,
45+
"rotation": 0.0
46+
},
47+
"reversed": false,
48+
"folder": "Blue To Reef",
49+
"idealStartingState": {
50+
"velocity": 0,
51+
"rotation": 0.0
52+
},
53+
"useDefaultConstraints": true
54+
}

src/main/deploy/pathplanner/paths/Blue C to HP.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.6985252823155137,
12-
"y": 0.8971043034675463
11+
"x": 1.677412418798617,
12+
"y": 0.8471545847260358
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue C"
1616
},
1717
{
1818
"anchor": {
19-
"x": 1.7121498842592582,
20-
"y": 0.8800611255787032
19+
"x": 1.7913482666015625,
20+
"y": 0.9482513427734375
2121
},
2222
"prevControl": {
23-
"x": 3.737200992380205,
24-
"y": 2.8530360697815818
23+
"x": 3.788332020846281,
24+
"y": 2.889014908288104
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue D to HP.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.8605444364226367,
12-
"y": 0.9854132797650605
11+
"x": 1.8225941623865167,
12+
"y": 0.9652696810756025
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue D"
1616
},
1717
{
1818
"anchor": {
19-
"x": 1.7121498842592582,
20-
"y": 0.8800611255787032
19+
"x": 1.7913482666015625,
20+
"y": 0.9482513427734375
2121
},
2222
"prevControl": {
23-
"x": 3.954160171217385,
24-
"y": 2.626486428499679
23+
"x": 4.002363647577118,
24+
"y": 2.672353652686721
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue F to HP.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.2620367554761347,
12-
"y": 1.5942877571591252
11+
"x": 3.0690825922922467,
12+
"y": 1.4826731027701139
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue F"
1616
},
1717
{
1818
"anchor": {
19-
"x": 1.7121498842592582,
20-
"y": 0.8800611255787032
19+
"x": 1.7913482666015625,
20+
"y": 0.9482513427734375
2121
},
2222
"prevControl": {
23-
"x": 4.325671129429348,
24-
"y": 2.5087394659652102
23+
"x": 4.392638728135962,
24+
"y": 2.5643336949054336
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue HP to A.path

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 1.354610655737705,
7-
"y": 6.88406762295082
6+
"x": 1.342622950819672,
7+
"y": 6.872079918032787
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.0185543074558416,
12-
"y": 4.130926506333982
11+
"x": 3.217626268326285,
12+
"y": 3.961511494358123
1313
},
1414
"isLocked": false,
15-
"linkedName": "Blue Top Mid HP"
15+
"linkedName": "aaa"
1616
},
1717
{
1818
"anchor": {
1919
"x": 3.153311593191964,
2020
"y": 4.056981985909598
2121
},
2222
"prevControl": {
23-
"x": 1.6399464096727052,
24-
"y": 6.456166923141883
23+
"x": 1.7005246407637633,
24+
"y": 6.462451079704511
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue HP to B.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 1.7121498842592582,
7-
"y": 0.8800611255787032
6+
"x": 1.7913482666015625,
7+
"y": 0.9482513427734375
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.278014707094127,
12-
"y": 3.9313783796874358
11+
"x": 3.3143676959420842,
12+
"y": 4.054023214796178
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue Bottom HP"
@@ -20,8 +20,8 @@
2020
"y": 3.745935494559151
2121
},
2222
"prevControl": {
23-
"x": 1.9655352353411903,
24-
"y": 1.1714619875691703
23+
"x": 1.9196513965557038,
24+
"y": 1.1263126583417824
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue HP to C.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 1.7121498842592582,
7-
"y": 0.8800611255787032
6+
"x": 1.7913482666015625,
7+
"y": 0.9482513427734375
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.8519385139756572,
12-
"y": 2.923855006007301
11+
"x": 3.887690042299406,
12+
"y": 2.981845960209278
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue Bottom HP"
@@ -20,8 +20,8 @@
2020
"y": 2.8778821672712045
2121
},
2222
"prevControl": {
23-
"x": 1.6621511721526612,
24-
"y": 0.8142201061463772
23+
"x": 1.7844347968057808,
24+
"y": 0.9498302079691132
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue HP to D.path

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 1.7121498842592582,
7-
"y": 0.8800611255787032
6+
"x": 1.7913482666015625,
7+
"y": 0.9482513427734375
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.9866169573934513,
12-
"y": 2.6405271372011967
11+
"x": 4.1241515435850244,
12+
"y": 2.749499850204644
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue Bottom HP"
@@ -20,8 +20,8 @@
2020
"y": 2.720726667131696
2121
},
2222
"prevControl": {
23-
"x": 1.7195736475073975,
24-
"y": 0.8937831054457632
23+
"x": 1.7412309402681876,
24+
"y": 0.9094087279150944
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

0 commit comments

Comments
 (0)