Skip to content

Commit 4acd2b7

Browse files
authored
Merge pull request #35 from IgniteRobotics/debug/launchBuilding
Debug/launch building
2 parents 9061d1d + ae1c2c1 commit 4acd2b7

37 files changed

+387
-660
lines changed

simgui-ds.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,10 @@
8888
"buttonCount": 0,
8989
"povCount": 0
9090
}
91+
],
92+
"robotJoysticks": [
93+
{
94+
"guid": "Keyboard0"
95+
}
9196
]
9297
}

src/main/deploy/pathplanner/autos/Basic Comp Auto - RIGHT.auto

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/main/deploy/pathplanner/autos/Basic Comp Auto - LEFT.auto renamed to src/main/deploy/pathplanner/autos/Basic Comp Auto.auto

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,49 @@
77
{
88
"type": "path",
99
"data": {
10-
"pathName": "Start to Shoot - LEFT"
10+
"pathName": "Start to Shoot"
1111
}
1212
},
1313
{
14-
"type": "named",
14+
"type": "wait",
1515
"data": {
16-
"name": "Shoot"
16+
"waitTime": 1.0
1717
}
1818
},
1919
{
2020
"type": "path",
2121
"data": {
22-
"pathName": "Shoot to Overbump - LEFT"
22+
"pathName": "Shoot to Overbump"
2323
}
2424
},
2525
{
2626
"type": "path",
2727
"data": {
28-
"pathName": "Collect - LEFT"
28+
"pathName": "Collect"
2929
}
3030
},
3131
{
3232
"type": "path",
3333
"data": {
34-
"pathName": "Overbump to Shoot - LEFT"
34+
"pathName": "Overbump to Shoot"
3535
}
3636
},
3737
{
38-
"type": "named",
38+
"type": "wait",
3939
"data": {
40-
"name": "Shoot"
40+
"waitTime": 1.0
4141
}
4242
},
4343
{
4444
"type": "path",
4545
"data": {
46-
"pathName": "Shoot to Climb - LEFT"
46+
"pathName": "Shoot to Climber"
4747
}
4848
}
4949
]
5050
}
5151
},
5252
"resetOdom": true,
53-
"folder": "Comp Autos",
53+
"folder": null,
5454
"choreoAuto": false
5555
}

src/main/deploy/pathplanner/autos/Full Simple Auto.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
}
2727
},
2828
"resetOdom": true,
29-
"folder": "Simple Autos",
29+
"folder": null,
3030
"choreoAuto": false
3131
}

src/main/deploy/pathplanner/autos/Plus Auto.auto

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
"type": "sequential",
55
"data": {
66
"commands": [
7-
{
8-
"type": "named",
9-
"data": {
10-
"name": "Seed"
11-
}
12-
},
137
{
148
"type": "path",
159
"data": {
@@ -37,7 +31,7 @@
3731
]
3832
}
3933
},
40-
"resetOdom": true,
34+
"resetOdom": false,
4135
"folder": "Test Autos",
4236
"choreoAuto": false
4337
}

src/main/deploy/pathplanner/autos/Rotate and Move Auto.auto

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
"type": "sequential",
55
"data": {
66
"commands": [
7-
{
8-
"type": "named",
9-
"data": {
10-
"name": "Seed"
11-
}
12-
},
137
{
148
"type": "path",
159
"data": {
@@ -25,7 +19,7 @@
2519
]
2620
}
2721
},
28-
"resetOdom": true,
22+
"resetOdom": false,
2923
"folder": "Test Autos",
3024
"choreoAuto": false
3125
}

src/main/deploy/pathplanner/autos/Simple Forward Auto.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
}
2121
},
2222
"resetOdom": true,
23-
"folder": "Simple Autos",
23+
"folder": null,
2424
"choreoAuto": false
2525
}

src/main/deploy/pathplanner/autos/Simple Rotation Auto.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
}
2121
},
2222
"resetOdom": true,
23-
"folder": "Simple Autos",
23+
"folder": null,
2424
"choreoAuto": false
2525
}

src/main/deploy/pathplanner/autos/Square Auto.auto

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
"type": "sequential",
55
"data": {
66
"commands": [
7-
{
8-
"type": "named",
9-
"data": {
10-
"name": "Seed"
11-
}
12-
},
137
{
148
"type": "path",
159
"data": {
@@ -37,7 +31,7 @@
3731
]
3832
}
3933
},
40-
"resetOdom": true,
34+
"resetOdom": false,
4135
"folder": "Test Autos",
4236
"choreoAuto": false
4337
}

src/main/deploy/pathplanner/paths/Collect - LEFT.path

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)