Skip to content

Commit b5621a4

Browse files
owen-beckowen-beck
committed
Merge branch 'dev'
2 parents a2a91e7 + 80557b5 commit b5621a4

88 files changed

Lines changed: 2210 additions & 2001 deletions

File tree

Some content is hidden

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

‎.github/workflows/AddPRsToProject.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/add-to-project@v0.5.0
2121
with:
2222
project-url: https://github.com/orgs/Decatur-Robotics/projects/1
23-
github-token: ${{ secrets.GITHUB_TOKEN }}
23+
github-token: ${{ secrets.WORKFLOWS_AUTH }}
2424
add-labels:
2525
name: Add labels to Issues/PRs
2626
runs-on: ubuntu-latest

‎simgui-ds.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,31 @@
33
{
44
"axisConfig": [
55
{
6-
"decKey": 65,
7-
"incKey": 68
6+
"decKey": 68,
7+
"decayRate": 0.5,
8+
"incKey": 65,
9+
"keyRate": 0.5
810
},
911
{
10-
"decKey": 87,
11-
"incKey": 83
12+
"decKey": 83,
13+
"decayRate": 0.5,
14+
"incKey": 87,
15+
"keyRate": 0.5
1216
},
1317
{
14-
"decKey": 69,
15-
"decayRate": 0.0,
16-
"incKey": 82,
17-
"keyRate": 0.009999999776482582
18+
"decKey": 81,
19+
"decayRate": 0.5,
20+
"incKey": 69,
21+
"keyRate": 0.5
1822
}
1923
],
2024
"axisCount": 3,
2125
"buttonCount": 8,
2226
"buttonKeys": [
2327
-1,
28+
80,
2429
-1,
25-
-1,
26-
-1,
30+
79,
2731
90,
2832
88,
2933
67,

‎src/main/deploy/pathplanner/autos/3 Coral test.auto‎

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

‎src/main/deploy/pathplanner/autos/4 Coral test.auto‎

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

‎src/main/deploy/pathplanner/autos/Left Side 3 Coral.auto‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "Left Initial to J"
11+
}
12+
},
13+
{
14+
"type": "named",
15+
"data": {
16+
"name": "Score J"
17+
}
18+
},
19+
{
20+
"type": "parallel",
21+
"data": {
22+
"commands": [
23+
{
24+
"type": "named",
25+
"data": {
26+
"name": "Intake"
27+
}
28+
},
29+
{
30+
"type": "path",
31+
"data": {
32+
"pathName": "J to Left Source"
33+
}
34+
}
35+
]
36+
}
37+
},
38+
{
39+
"type": "path",
40+
"data": {
41+
"pathName": "Left Source to L"
42+
}
43+
},
44+
{
45+
"type": "named",
46+
"data": {
47+
"name": "Score L"
48+
}
49+
},
50+
{
51+
"type": "parallel",
52+
"data": {
53+
"commands": [
54+
{
55+
"type": "named",
56+
"data": {
57+
"name": "Intake"
58+
}
59+
},
60+
{
61+
"type": "path",
62+
"data": {
63+
"pathName": "L to Left Source"
64+
}
65+
}
66+
]
67+
}
68+
},
69+
{
70+
"type": "path",
71+
"data": {
72+
"pathName": "Left Source to K"
73+
}
74+
},
75+
{
76+
"type": "named",
77+
"data": {
78+
"name": "Score K"
79+
}
80+
},
81+
{
82+
"type": "parallel",
83+
"data": {
84+
"commands": [
85+
{
86+
"type": "named",
87+
"data": {
88+
"name": "Intake"
89+
}
90+
},
91+
{
92+
"type": "path",
93+
"data": {
94+
"pathName": "K to Left Source"
95+
}
96+
}
97+
]
98+
}
99+
}
100+
]
101+
}
102+
},
103+
"resetOdom": true,
104+
"folder": null,
105+
"choreoAuto": false
106+
}

‎src/main/deploy/pathplanner/autos/Right Side 3 Coral.auto‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "Right Initial to E"
11+
}
12+
},
13+
{
14+
"type": "named",
15+
"data": {
16+
"name": "Score E"
17+
}
18+
},
19+
{
20+
"type": "deadline",
21+
"data": {
22+
"commands": [
23+
{
24+
"type": "named",
25+
"data": {
26+
"name": "Intake"
27+
}
28+
},
29+
{
30+
"type": "path",
31+
"data": {
32+
"pathName": "E to Right Source"
33+
}
34+
}
35+
]
36+
}
37+
},
38+
{
39+
"type": "path",
40+
"data": {
41+
"pathName": "Right Source to C"
42+
}
43+
},
44+
{
45+
"type": "named",
46+
"data": {
47+
"name": "Score C"
48+
}
49+
},
50+
{
51+
"type": "deadline",
52+
"data": {
53+
"commands": [
54+
{
55+
"type": "named",
56+
"data": {
57+
"name": "Intake"
58+
}
59+
},
60+
{
61+
"type": "path",
62+
"data": {
63+
"pathName": "C to Right Source"
64+
}
65+
}
66+
]
67+
}
68+
},
69+
{
70+
"type": "path",
71+
"data": {
72+
"pathName": "Right Source to D"
73+
}
74+
},
75+
{
76+
"type": "named",
77+
"data": {
78+
"name": "Score D"
79+
}
80+
},
81+
{
82+
"type": "deadline",
83+
"data": {
84+
"commands": [
85+
{
86+
"type": "named",
87+
"data": {
88+
"name": "Intake"
89+
}
90+
},
91+
{
92+
"type": "path",
93+
"data": {
94+
"pathName": "D to Right Source"
95+
}
96+
}
97+
]
98+
}
99+
}
100+
]
101+
}
102+
},
103+
"resetOdom": true,
104+
"folder": null,
105+
"choreoAuto": false
106+
}

‎src/main/deploy/pathplanner/autos/Test J to Left Source.auto‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "Left Initial to J"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}

‎src/main/deploy/pathplanner/navgrid.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/main/deploy/pathplanner/paths/Algae 1 to K.path‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"rotation": -58.240519915187235
4646
},
4747
"reversed": false,
48-
"folder": "Auto Path",
48+
"folder": null,
4949
"idealStartingState": {
5050
"velocity": 0,
5151
"rotation": 178.854237161825

0 commit comments

Comments
 (0)