Skip to content

Commit 673c931

Browse files
ohowe1ohowe1
committed
Home, fix auto stuff
1 parent eb6b40b commit 673c931

26 files changed

+172
-163
lines changed

‎.run/Format.run.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration default="false" name="Format" type="GradleRunConfiguration" factoryName="Gradle">
33
<ExternalSystemSettings>
44
<option name="executionName" />
5-
<option name="externalProjectPath" value="$PROJECT_DIR$/Competition2024" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
66
<option name="externalSystemIdString" value="GRADLE" />
77
<option name="scriptParameters" value="" />
88
<option name="taskDescriptions">
@@ -18,6 +18,7 @@
1818
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
1919
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2020
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
2122
<method v="2" />
2223
</configuration>
2324
</component>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"x": 0.74,
66
"y": 6.596235535725297
77
},
8-
"rotation": 57.68778662786143
8+
"rotation": 60.0
99
},
1010
"command": {
1111
"type": "sequential",
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
3030
{
@@ -46,7 +46,7 @@
4646
{
4747
"type": "wait",
4848
"data": {
49-
"waitTime": 0.1
49+
"waitTime": 0.3
5050
}
5151
},
5252
{

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"x": 0.74,
66
"y": 6.596235535725297
77
},
8-
"rotation": 57.68778662786143
8+
"rotation": 60.0
99
},
1010
"command": {
1111
"type": "sequential",
@@ -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": {
@@ -46,7 +40,7 @@
4640
{
4741
"type": "wait",
4842
"data": {
49-
"waitTime": 0.25
43+
"waitTime": 0.5
5044
}
5145
},
5246
{
@@ -57,16 +51,16 @@
5751
}
5852
]
5953
}
54+
},
55+
{
56+
"type": "named",
57+
"data": {
58+
"name": "IntakeUntilNote"
59+
}
6060
}
6161
]
6262
}
6363
},
64-
{
65-
"type": "named",
66-
"data": {
67-
"name": "ShootNote"
68-
}
69-
},
7064
{
7165
"type": "named",
7266
"data": {

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

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"x": 0.74,
66
"y": 6.596235535725297
77
},
8-
"rotation": 57.68778662786143
8+
"rotation": 60.0
99
},
1010
"command": {
1111
"type": "sequential",
@@ -24,15 +24,9 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
30-
{
31-
"type": "named",
32-
"data": {
33-
"name": "IntakeUntilNote"
34-
}
35-
},
3630
{
3731
"type": "sequential",
3832
"data": {
@@ -43,6 +37,12 @@
4337
"pathName": "AmpSpeaker-FarAmp"
4438
}
4539
},
40+
{
41+
"type": "wait",
42+
"data": {
43+
"waitTime": 0.5
44+
}
45+
},
4646
{
4747
"type": "path",
4848
"data": {
@@ -51,6 +51,12 @@
5151
}
5252
]
5353
}
54+
},
55+
{
56+
"type": "named",
57+
"data": {
58+
"name": "IntakeUntilNote"
59+
}
5460
}
5561
]
5662
}
@@ -62,15 +68,9 @@
6268
}
6369
},
6470
{
65-
"type": "parallel",
71+
"type": "deadline",
6672
"data": {
6773
"commands": [
68-
{
69-
"type": "named",
70-
"data": {
71-
"name": "IntakeUntilNote"
72-
}
73-
},
7474
{
7575
"type": "sequential",
7676
"data": {
@@ -81,6 +81,12 @@
8181
"pathName": "AmpSpeaker-CloseAmp"
8282
}
8383
},
84+
{
85+
"type": "wait",
86+
"data": {
87+
"waitTime": 0.3
88+
}
89+
},
8490
{
8591
"type": "path",
8692
"data": {
@@ -89,6 +95,12 @@
8995
}
9096
]
9197
}
98+
},
99+
{
100+
"type": "named",
101+
"data": {
102+
"name": "IntakeUntilNote"
103+
}
92104
}
93105
]
94106
}
@@ -104,4 +116,4 @@
104116
},
105117
"folder": "Amp Speaker",
106118
"choreoAuto": false
107-
}
119+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
3030
{
@@ -40,7 +40,7 @@
4040
{
4141
"type": "wait",
4242
"data": {
43-
"waitTime": 0.1
43+
"waitTime": 0.3
4444
}
4545
},
4646
{
@@ -72,4 +72,4 @@
7272
},
7373
"folder": "Center Speaker",
7474
"choreoAuto": false
75-
}
75+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131
},
3232
{
33-
"type": "parallel",
33+
"type": "deadline",
3434
"data": {
3535
"commands": [
3636
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"version": 1.0,
33
"startingPose": {
44
"position": {
5-
"x": 0.74,
6-
"y": 4.48
5+
"x": 1.29,
6+
"y": 5.45
77
},
8-
"rotation": -60.0
8+
"rotation": 0.0
99
},
1010
"command": {
1111
"type": "sequential",
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
3030
{
@@ -40,7 +40,7 @@
4040
{
4141
"type": "wait",
4242
"data": {
43-
"waitTime": 0.1
43+
"waitTime": 0.3
4444
}
4545
},
4646
{
@@ -72,4 +72,4 @@
7272
},
7373
"folder": "Center Speaker",
7474
"choreoAuto": false
75-
}
75+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
3030
{
@@ -40,7 +40,7 @@
4040
{
4141
"type": "wait",
4242
"data": {
43-
"waitTime": 0.1
43+
"waitTime": 0.3
4444
}
4545
},
4646
{
@@ -68,7 +68,7 @@
6868
}
6969
},
7070
{
71-
"type": "parallel",
71+
"type": "deadline",
7272
"data": {
7373
"commands": [
7474
{
@@ -84,7 +84,7 @@
8484
{
8585
"type": "wait",
8686
"data": {
87-
"waitTime": 0.1
87+
"waitTime": 0.3
8888
}
8989
},
9090
{
@@ -116,4 +116,4 @@
116116
},
117117
"folder": "Center Speaker",
118118
"choreoAuto": false
119-
}
119+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"type": "parallel",
27+
"type": "deadline",
2828
"data": {
2929
"commands": [
3030
{
@@ -40,7 +40,7 @@
4040
{
4141
"type": "wait",
4242
"data": {
43-
"waitTime": 0.1
43+
"waitTime": 0.3
4444
}
4545
},
4646
{
@@ -68,7 +68,7 @@
6868
}
6969
},
7070
{
71-
"type": "parallel",
71+
"type": "deadline",
7272
"data": {
7373
"commands": [
7474
{
@@ -84,7 +84,7 @@
8484
{
8585
"type": "wait",
8686
"data": {
87-
"waitTime": 0.1
87+
"waitTime": 0.3
8888
}
8989
},
9090
{
@@ -116,4 +116,4 @@
116116
},
117117
"folder": "Center Speaker",
118118
"choreoAuto": false
119-
}
119+
}

0 commit comments

Comments
 (0)