Skip to content

Commit 4072df7

Browse files
authored
Merge pull request #26 from StuyPulse/nyc
NYC
2 parents 18cc42b + a694dfd commit 4072df7

File tree

120 files changed

+919
-944
lines changed

Some content is hidden

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

120 files changed

+919
-944
lines changed

simgui-ds.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"System Joysticks": {
3+
"window": {
4+
"enabled": false
5+
}
6+
},
27
"keyboardJoysticks": [
38
{
49
"axisConfig": [

src/main/deploy/pathplanner/paths/Blue A BackOut.path

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 2.6641779148956406,
12-
"y": 4.972283149069261
11+
"x": 3.3939730258141516,
12+
"y": 4.124673010781706
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue A"
1616
},
1717
{
1818
"anchor": {
19-
"x": 1.8559243338448659,
20-
"y": 7.084099905831473
19+
"x": 2.5413934426229505,
20+
"y": 3.9950307377049183
2121
},
2222
"prevControl": {
23-
"x": 2.7977664352389278,
24-
"y": 5.225288698149829
23+
"x": 2.837867022538778,
24+
"y": 3.9693032358804126
2525
},
2626
"nextControl": null,
2727
"isLocked": false,
28-
"linkedName": "Blue Top HP"
28+
"linkedName": "Blue AB Algae"
2929
}
3030
],
3131
"rotationTargets": [],
@@ -42,7 +42,7 @@
4242
},
4343
"goalEndState": {
4444
"velocity": 0,
45-
"rotation": -55.0
45+
"rotation": 0.0
4646
},
4747
"reversed": false,
4848
"folder": "Blue To Reef",

src/main/deploy/pathplanner/paths/Blue ABCD Algae.path

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 3.1795806884765625,
7-
"y": 3.9121194022042407
6+
"x": 2.5413934426229505,
7+
"y": 3.9950307377049183
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 3.152801513671875,
12-
"y": 3.469319370814732
11+
"x": 2.514614267818263,
12+
"y": 3.5522307063154095
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue AB Algae"

src/main/deploy/pathplanner/paths/Blue B BackOut.path

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 2.5011932060553352,
12-
"y": 2.464376835764683
11+
"x": 2.6376128519675124,
12+
"y": 3.9875407294086775
1313
},
1414
"isLocked": false,
1515
"linkedName": "Blue B"
1616
},
1717
{
1818
"anchor": {
19-
"x": 1.8468959263392855,
20-
"y": 0.9474352155412942
19+
"x": 2.5413934426229505,
20+
"y": 3.9950307377049183
2121
},
2222
"prevControl": {
23-
"x": 2.1690102149791093,
24-
"y": 1.59102742093715
23+
"x": 2.945003548155746,
24+
"y": 3.84207309808113
2525
},
2626
"nextControl": null,
2727
"isLocked": false,
28-
"linkedName": "Blue Bottom HP"
28+
"linkedName": "Blue AB Algae"
2929
}
3030
],
3131
"rotationTargets": [],
@@ -42,7 +42,7 @@
4242
},
4343
"goalEndState": {
4444
"velocity": 0,
45-
"rotation": 55.0
45+
"rotation": 0.0
4646
},
4747
"reversed": false,
4848
"folder": "Blue To Reef",

src/main/deploy/pathplanner/paths/Blue Barge 3 to EF Algae.path

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
},
1717
{
1818
"anchor": {
19-
"x": 5.250605555943079,
20-
"y": 2.9040492466517858
19+
"x": 5.526331967213115,
20+
"y": 2.4006659836065567
2121
},
2222
"prevControl": {
23-
"x": 5.762929425920759,
24-
"y": 1.9403560093470984
23+
"x": 6.038655837190794,
24+
"y": 1.4369727463018693
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue Barge 3 to IJ Algae.path

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
},
1717
{
1818
"anchor": {
19-
"x": 5.036270141601562,
20-
"y": 5.243937029157366
19+
"x": 5.4304303278688515,
20+
"y": 5.68529713114754
2121
},
2222
"prevControl": {
23-
"x": 5.613782174246652,
24-
"y": 6.43344247000558
23+
"x": 6.007942360513942,
24+
"y": 6.874802571995754
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

src/main/deploy/pathplanner/paths/Blue Barge BackOut.path

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"pointTowardsZones": [],
3434
"eventMarkers": [],
3535
"globalConstraints": {
36-
"maxVelocity": 6.5,
37-
"maxAcceleration": 7.5,
36+
"maxVelocity": 5.75,
37+
"maxAcceleration": 6.75,
3838
"maxAngularVelocity": 400.0,
3939
"maxAngularAcceleration": 900.0,
4040
"nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/Blue Barge to EF (1).path

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"pointTowardsZones": [],
3434
"eventMarkers": [],
3535
"globalConstraints": {
36-
"maxVelocity": 6.0,
37-
"maxAcceleration": 7.0,
36+
"maxVelocity": 5.75,
37+
"maxAcceleration": 6.75,
3838
"maxAngularVelocity": 400.0,
3939
"maxAngularAcceleration": 900.0,
4040
"nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/Blue Barge to EF (2).path

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"pointTowardsZones": [],
3434
"eventMarkers": [],
3535
"globalConstraints": {
36-
"maxVelocity": 6.0,
37-
"maxAcceleration": 7.0,
36+
"maxVelocity": 5.75,
37+
"maxAcceleration": 6.75,
3838
"maxAngularVelocity": 400.0,
3939
"maxAngularAcceleration": 900.0,
4040
"nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/Blue Barge to IJ (1).path

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"pointTowardsZones": [],
3434
"eventMarkers": [],
3535
"globalConstraints": {
36-
"maxVelocity": 6.0,
37-
"maxAcceleration": 7.0,
36+
"maxVelocity": 5.75,
37+
"maxAcceleration": 6.75,
3838
"maxAngularVelocity": 400.0,
3939
"maxAngularAcceleration": 900.0,
4040
"nominalVoltage": 12.0,

0 commit comments

Comments
 (0)