Skip to content

Commit 2ca34d0

Browse files
committed
Merge branch 'feature-auto-enhancement' into dev
2 parents 0e4e715 + 98f77fe commit 2ca34d0

21 files changed

+812
-181
lines changed

.pathplanner/settings.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"robotWidth": 0.92,
33
"robotLength": 1.2,
44
"holonomicMode": true,
5-
"pathFolders": [],
5+
"pathFolders": [
6+
"speaker-ampside",
7+
"speaker-center"
8+
],
69
"autoFolders": [],
710
"defaultMaxVel": 4.0,
811
"defaultMaxAccel": 3.0,

field24.png

186 KB
Loading

src/main/deploy/pathplanner/autos/C-4NOTE.auto src/main/deploy/pathplanner/autos/AS-PL-00.auto

+35-22
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"version": 1.0,
33
"startingPose": {
44
"position": {
5-
"x": 1.5144000463439524,
6-
"y": 5.5555704093864335
5+
"x": 0.765872873427322,
6+
"y": 6.843527962547876
77
},
8-
"rotation": 180.0
8+
"rotation": -120.62502060853139
99
},
1010
"command": {
1111
"type": "sequential",
@@ -17,16 +17,41 @@
1717
"name": "setObjectiveSpeaker"
1818
}
1919
},
20+
{
21+
"type": "named",
22+
"data": {
23+
"name": "disableAimAssist"
24+
}
25+
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "disableUseFedPoseIntention"
30+
}
31+
},
2032
{
2133
"type": "named",
2234
"data": {
2335
"name": "readyToShootMode"
2436
}
2537
},
2638
{
27-
"type": "wait",
39+
"type": "race",
2840
"data": {
29-
"waitTime": 2.0
41+
"commands": [
42+
{
43+
"type": "wait",
44+
"data": {
45+
"waitTime": 5.0
46+
}
47+
},
48+
{
49+
"type": "named",
50+
"data": {
51+
"name": "waitForArmError"
52+
}
53+
}
54+
]
3055
}
3156
},
3257
{
@@ -44,7 +69,7 @@
4469
{
4570
"type": "named",
4671
"data": {
47-
"name": "holdMode"
72+
"name": "intakeMode"
4873
}
4974
},
5075
{
@@ -54,7 +79,7 @@
5479
{
5580
"type": "path",
5681
"data": {
57-
"pathName": "centerToCenterNote"
82+
"pathName": "speakerAmpsideToNote00"
5883
}
5984
},
6085
{
@@ -64,13 +89,13 @@
6489
{
6590
"type": "wait",
6691
"data": {
67-
"waitTime": 0.1
92+
"waitTime": 0.7
6893
}
6994
},
7095
{
7196
"type": "named",
7297
"data": {
73-
"name": "intakeMode"
98+
"name": "enableAimAssist"
7499
}
75100
}
76101
]
@@ -110,7 +135,7 @@
110135
{
111136
"type": "wait",
112137
"data": {
113-
"waitTime": 2.6
138+
"waitTime": 3.0
114139
}
115140
}
116141
]
@@ -121,18 +146,6 @@
121146
"data": {
122147
"name": "shootMode"
123148
}
124-
},
125-
{
126-
"type": "wait",
127-
"data": {
128-
"waitTime": 0.4
129-
}
130-
},
131-
{
132-
"type": "named",
133-
"data": {
134-
"name": "holdMode"
135-
}
136149
}
137150
]
138151
}

0 commit comments

Comments
 (0)