Skip to content

Commit 8b472f7

Browse files
Nins97Nins97
committed
SCREAM
1 parent 2926bca commit 8b472f7

Some content is hidden

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

49 files changed

+399
-132
lines changed

‎.pathplanner/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"Center Speaker",
1313
"Source Speaker"
1414
],
15-
"defaultMaxVel": 4.0,
15+
"defaultMaxVel": 3.8,
1616
"defaultMaxAccel": 4.0,
1717
"defaultMaxAngVel": 500.0,
1818
"defaultMaxAngAccel": 2000.0,

‎src/main/deploy/pathplanner/autos/AmpSpeaker1Note.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"startingPose": {
44
"position": {
55
"x": 0.74,
6-
"y": 6.6
6+
"y": 6.61
77
},
88
"rotation": 60.0
99
},

‎src/main/deploy/pathplanner/autos/AmpSpeaker2NoteCloseAmp.auto

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"startingPose": {
44
"position": {
55
"x": 0.74,
6-
"y": 6.596235535725297
6+
"y": 6.61
77
},
88
"rotation": 60.0
99
},
@@ -27,12 +27,6 @@
2727
"type": "deadline",
2828
"data": {
2929
"commands": [
30-
{
31-
"type": "named",
32-
"data": {
33-
"name": "IntakeUntilNote"
34-
}
35-
},
3630
{
3731
"type": "sequential",
3832
"data": {
@@ -57,6 +51,12 @@
5751
}
5852
]
5953
}
54+
},
55+
{
56+
"type": "named",
57+
"data": {
58+
"name": "IntakeUntilNote"
59+
}
6060
}
6161
]
6262
}

‎src/main/deploy/pathplanner/autos/AmpSpeaker2NoteFarAmp.auto

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"startingPose": {
44
"position": {
55
"x": 0.74,
6-
"y": 6.596235535725297
6+
"y": 6.61
77
},
88
"rotation": 60.0
99
},
@@ -27,6 +27,12 @@
2727
"type": "deadline",
2828
"data": {
2929
"commands": [
30+
{
31+
"type": "named",
32+
"data": {
33+
"name": "IntakeUntilNote"
34+
}
35+
},
3036
{
3137
"type": "sequential",
3238
"data": {
@@ -40,7 +46,7 @@
4046
{
4147
"type": "wait",
4248
"data": {
43-
"waitTime": 0.5
49+
"waitTime": 0.25
4450
}
4551
},
4652
{
@@ -51,12 +57,6 @@
5157
}
5258
]
5359
}
54-
},
55-
{
56-
"type": "named",
57-
"data": {
58-
"name": "IntakeUntilNote"
59-
}
6060
}
6161
]
6262
}

‎src/main/deploy/pathplanner/autos/AmpSpeaker3NoteFarAmpCloseAmp.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"startingPose": {
44
"position": {
55
"x": 0.74,
6-
"y": 6.596235535725297
6+
"y": 6.61
77
},
88
"rotation": 60.0
99
},

‎src/main/deploy/pathplanner/autos/CenterSpeaker2NoteCloseMid.auto

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
"name": "ShootNote"
2424
}
2525
},
26-
{
27-
"type": "wait",
28-
"data": {
29-
"waitTime": 0.5
30-
}
31-
},
3226
{
3327
"type": "deadline",
3428
"data": {
@@ -46,7 +40,7 @@
4640
{
4741
"type": "wait",
4842
"data": {
49-
"waitTime": 0.5
43+
"waitTime": 0.3
5044
}
5145
},
5246
{

‎src/main/deploy/pathplanner/autos/CenterSpeaker2NoteCloseSource.auto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"version": 1.0,
33
"startingPose": {
44
"position": {
5-
"x": 1.29,
6-
"y": 5.45
5+
"x": 0.74,
6+
"y": 4.48
77
},
8-
"rotation": 0.0
8+
"rotation": -60.0
99
},
1010
"command": {
1111
"type": "sequential",

‎src/main/deploy/pathplanner/autos/CenterSpeaker4NoteFarMidAmpCloseMidCloseAmp.auto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "deadline",
27+
"type": "parallel",
2828
"data": {
2929
"commands": [
3030
{
@@ -112,7 +112,7 @@
112112
}
113113
},
114114
{
115-
"type": "deadline",
115+
"type": "parallel",
116116
"data": {
117117
"commands": [
118118
{

‎src/main/deploy/pathplanner/autos/TestAuto.auto

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 2,
6+
"y": 7.0
7+
},
8+
"rotation": 0
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "path",
16+
"data": {
17+
"pathName": "TestPath"
18+
}
19+
}
20+
]
21+
}
22+
},
23+
"folder": null,
24+
"choreoAuto": false
25+
}

‎src/main/deploy/pathplanner/paths/AmpMobility.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"constraintZones": [],
3939
"eventMarkers": [],
4040
"globalConstraints": {
41-
"maxVelocity": 4.0,
41+
"maxVelocity": 3.8,
4242
"maxAcceleration": 4.0,
4343
"maxAngularVelocity": 500.0,
4444
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/AmpSpeaker-CloseAmp.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
],
7272
"eventMarkers": [],
7373
"globalConstraints": {
74-
"maxVelocity": 4.0,
74+
"maxVelocity": 3.8,
7575
"maxAcceleration": 4.0,
7676
"maxAngularVelocity": 500.0,
7777
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/AmpSpeaker-FarAmp.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
],
8888
"eventMarkers": [],
8989
"globalConstraints": {
90-
"maxVelocity": 4.0,
90+
"maxVelocity": 3.8,
9191
"maxAcceleration": 4.0,
9292
"maxAngularVelocity": 500.0,
9393
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CenterSpeaker-CloseAmp.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
],
7272
"eventMarkers": [],
7373
"globalConstraints": {
74-
"maxVelocity": 4.0,
74+
"maxVelocity": 3.8,
7575
"maxAcceleration": 4.0,
7676
"maxAngularVelocity": 500.0,
7777
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CenterSpeaker-CloseMid.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
],
7272
"eventMarkers": [],
7373
"globalConstraints": {
74-
"maxVelocity": 4.0,
74+
"maxVelocity": 3.8,
7575
"maxAcceleration": 4.0,
7676
"maxAngularVelocity": 500.0,
7777
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CenterSpeaker-CloseSource.path

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
},
3333
{
3434
"anchor": {
35-
"x": 2.58076817012177,
35+
"x": 2.7,
3636
"y": 4.100916501780468
3737
},
3838
"prevControl": {
39-
"x": 2.53076817012177,
39+
"x": 2.6500000000000004,
4040
"y": 4.100916501780468
4141
},
4242
"nextControl": null,
@@ -71,7 +71,7 @@
7171
],
7272
"eventMarkers": [],
7373
"globalConstraints": {
74-
"maxVelocity": 4.0,
74+
"maxVelocity": 3.8,
7575
"maxAcceleration": 4.0,
7676
"maxAngularVelocity": 500.0,
7777
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CenterSpeaker-FarMidAmp-NoCloseNotes.path

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 2.2850623701247397,
12-
"y": 5.453516007032013
11+
"x": 2.2655457718322847,
12+
"y": 5.7999534332402
1313
},
1414
"isLocked": false,
1515
"linkedName": "CenterSpeaker"
1616
},
1717
{
1818
"anchor": {
19-
"x": 5.657051569387574,
20-
"y": 6.227974218780084
19+
"x": 5.840782251008946,
20+
"y": 6.363273643213954
2121
},
2222
"prevControl": {
23-
"x": 4.149611502585436,
24-
"y": 6.245087746886545
23+
"x": 4.333342184206808,
24+
"y": 6.3803871713204146
2525
},
2626
"nextControl": {
27-
"x": 6.33691527859793,
28-
"y": 6.220255924068165
27+
"x": 6.520645960219302,
28+
"y": 6.355555348502034
2929
},
3030
"isLocked": false,
3131
"linkedName": null
@@ -75,7 +75,7 @@
7575
"constraintZones": [],
7676
"eventMarkers": [],
7777
"globalConstraints": {
78-
"maxVelocity": 4.0,
78+
"maxVelocity": 3.8,
7979
"maxAcceleration": 4.0,
8080
"maxAngularVelocity": 500.0,
8181
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CenterSpeaker-FarMidAmp.path

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
},
3333
{
3434
"anchor": {
35-
"x": 5.914181342244099,
36-
"y": 6.302167118229941
35+
"x": 5.879857171751381,
36+
"y": 6.592616111158148
3737
},
3838
"prevControl": {
39-
"x": 5.57760624348574,
40-
"y": 6.302167118229941
39+
"x": 5.543282072993022,
40+
"y": 6.592616111158148
4141
},
4242
"nextControl": {
43-
"x": 6.492415011577995,
44-
"y": 6.302167118229941
43+
"x": 6.458090841085276,
44+
"y": 6.592616111158148
4545
},
4646
"isLocked": false,
4747
"linkedName": null
@@ -98,7 +98,7 @@
9898
],
9999
"eventMarkers": [],
100100
"globalConstraints": {
101-
"maxVelocity": 4.0,
101+
"maxVelocity": 3.8,
102102
"maxAcceleration": 4.0,
103103
"maxAngularVelocity": 500.0,
104104
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CloseAmp-AmpSpeaker.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"constraintZones": [],
3333
"eventMarkers": [],
3434
"globalConstraints": {
35-
"maxVelocity": 4.0,
35+
"maxVelocity": 3.8,
3636
"maxAcceleration": 4.0,
3737
"maxAngularVelocity": 500.0,
3838
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CloseAmp-CenterSpeaker.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"constraintZones": [],
3939
"eventMarkers": [],
4040
"globalConstraints": {
41-
"maxVelocity": 4.0,
41+
"maxVelocity": 3.8,
4242
"maxAcceleration": 4.0,
4343
"maxAngularVelocity": 500.0,
4444
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CloseMid-CenterSpeaker.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"constraintZones": [],
3939
"eventMarkers": [],
4040
"globalConstraints": {
41-
"maxVelocity": 4.0,
41+
"maxVelocity": 3.8,
4242
"maxAcceleration": 4.0,
4343
"maxAngularVelocity": 500.0,
4444
"maxAngularAcceleration": 2000.0

‎src/main/deploy/pathplanner/paths/CloseSource-CenterSpeaker.path

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 2.58076817012177,
6+
"x": 2.7,
77
"y": 4.100916501780468
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.9444219888439773,
11+
"x": 2.0636538187222073,
1212
"y": 4.73014246028492
1313
},
1414
"isLocked": false,
@@ -38,7 +38,7 @@
3838
"constraintZones": [],
3939
"eventMarkers": [],
4040
"globalConstraints": {
41-
"maxVelocity": 4.0,
41+
"maxVelocity": 3.8,
4242
"maxAcceleration": 4.0,
4343
"maxAngularVelocity": 500.0,
4444
"maxAngularAcceleration": 2000.0

0 commit comments

Comments
 (0)