Skip to content

Commit

Permalink
Home, fix auto stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ohowe1
ohowe1 committed Mar 5, 2024
1 parent eb6b40b commit 673c931
Show file tree
Hide file tree
Showing 26 changed files with 172 additions and 163 deletions.
3 changes: 2 additions & 1 deletion .run/Format.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="Format" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/Competition2024" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
Expand All @@ -18,6 +18,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/AmpSpeaker2NoteCloseAmp.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"x": 0.74,
"y": 6.596235535725297
},
"rotation": 57.68778662786143
"rotation": 60.0
},
"command": {
"type": "sequential",
Expand All @@ -24,7 +24,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -46,7 +46,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down
22 changes: 8 additions & 14 deletions src/main/deploy/pathplanner/autos/AmpSpeaker2NoteFarAmp.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"x": 0.74,
"y": 6.596235535725297
},
"rotation": 57.68778662786143
"rotation": 60.0
},
"command": {
"type": "sequential",
Expand All @@ -27,12 +27,6 @@
"type": "deadline",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
},
{
"type": "sequential",
"data": {
Expand All @@ -46,7 +40,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.25
"waitTime": 0.5
}
},
{
Expand All @@ -57,16 +51,16 @@
}
]
}
},
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "ShootNote"
}
},
{
"type": "named",
"data": {
Expand Down
44 changes: 28 additions & 16 deletions src/main/deploy/pathplanner/autos/AmpSpeaker3NoteFarAmpCloseAmp.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"x": 0.74,
"y": 6.596235535725297
},
"rotation": 57.68778662786143
"rotation": 60.0
},
"command": {
"type": "sequential",
Expand All @@ -24,15 +24,9 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
},
{
"type": "sequential",
"data": {
Expand All @@ -43,6 +37,12 @@
"pathName": "AmpSpeaker-FarAmp"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "path",
"data": {
Expand All @@ -51,6 +51,12 @@
}
]
}
},
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
}
]
}
Expand All @@ -62,15 +68,9 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
},
{
"type": "sequential",
"data": {
Expand All @@ -81,6 +81,12 @@
"pathName": "AmpSpeaker-CloseAmp"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.3
}
},
{
"type": "path",
"data": {
Expand All @@ -89,6 +95,12 @@
}
]
}
},
{
"type": "named",
"data": {
"name": "IntakeUntilNote"
}
}
]
}
Expand All @@ -104,4 +116,4 @@
},
"folder": "Amp Speaker",
"choreoAuto": false
}
}
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/CenterSpeaker2NoteCloseAmp.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -40,7 +40,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -72,4 +72,4 @@
},
"folder": "Center Speaker",
"choreoAuto": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/CenterSpeaker2NoteCloseMid.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/autos/CenterSpeaker2NoteCloseSource.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.74,
"y": 4.48
"x": 1.29,
"y": 5.45
},
"rotation": -60.0
"rotation": 0.0
},
"command": {
"type": "sequential",
Expand All @@ -24,7 +24,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -40,7 +40,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -72,4 +72,4 @@
},
"folder": "Center Speaker",
"choreoAuto": false
}
}
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/CenterSpeaker3NoteCloseAmpCloseMid.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -40,7 +40,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -68,7 +68,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -84,7 +84,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -116,4 +116,4 @@
},
"folder": "Center Speaker",
"choreoAuto": false
}
}
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/CenterSpeaker3NoteCloseSourceCloseMid.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -40,7 +40,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -68,7 +68,7 @@
}
},
{
"type": "parallel",
"type": "deadline",
"data": {
"commands": [
{
Expand All @@ -84,7 +84,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.1
"waitTime": 0.3
}
},
{
Expand Down Expand Up @@ -116,4 +116,4 @@
},
"folder": "Center Speaker",
"choreoAuto": false
}
}
Loading

0 comments on commit 673c931

Please sign in to comment.