Skip to content

Commit 5816df5

Browse files
Arnav814Arnav814
committed
Merge branch 'week-2-merge-260307-3'
2 parents 7227e4c + 5663c92 commit 5816df5

Some content is hidden

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

41 files changed

+974
-442
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
<!--
2-
PLEASE CHECK THE PR GUIDELINES:
3-
https://docs.google.com/document/d/14ZIhQRlUPK0wl5_AmM80N2D2KJUd6k_7I6isLS89YKU/edit
4-
These are the things we are going to be checking your PR has, if it doesn't your PR will be rejected!
5-
-->
6-
71
## Overview
82
<!-- A general very short overview of the PR -->
93
This PR will...

‎src/main/deploy/pathplanner/autos/Left Week 2.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": "Full Left Path"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}

‎src/main/deploy/pathplanner/autos/Left(No SOTM) - Under Trench.auto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
{
88
"type": "path",
99
"data": {
10-
"pathName": "#1 Left under the trench"
10+
"pathName": "#1 Left 2 - Under the trench"
1111
}
1212
},
1313
{
1414
"type": "path",
1515
"data": {
16-
"pathName": "Duplicated Not Working"
16+
"pathName": "#2 Left(No SOTM) under the trench"
1717
}
1818
},
1919
{

‎src/main/deploy/pathplanner/autos/Straight Test.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": "Straight Line"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}

‎src/main/deploy/pathplanner/paths/#1 Left 2 - Under the trench.path‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
{
2+
"version": "2025.0",
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 4.332135231316728,
7+
"y": 7.623190984578885
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 5.332740213523133,
12+
"y": 7.3757295373665475
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 7.6997627520759195,
20+
"y": 7.128268090154211
21+
},
22+
"prevControl": {
23+
"x": 7.036176926828434,
24+
"y": 7.610051586728687
25+
},
26+
"nextControl": {
27+
"x": 8.08506207136292,
28+
"y": 6.848529062870701
29+
},
30+
"isLocked": false,
31+
"linkedName": null
32+
},
33+
{
34+
"anchor": {
35+
"x": 7.979501779359431,
36+
"y": 6.1814590747330955
37+
},
38+
"prevControl": {
39+
"x": 8.02072158843106,
40+
"y": 6.462503227494206
41+
},
42+
"nextControl": {
43+
"x": 7.8611506524317925,
44+
"y": 5.374519572953736
45+
},
46+
"isLocked": false,
47+
"linkedName": null
48+
},
49+
{
50+
"anchor": {
51+
"x": 7.841663907284769,
52+
"y": 4.4778559602649
53+
},
54+
"prevControl": {
55+
"x": 7.936465005931199,
56+
"y": 5.460593119810201
57+
},
58+
"nextControl": null,
59+
"isLocked": false,
60+
"linkedName": null
61+
}
62+
],
63+
"rotationTargets": [
64+
{
65+
"waypointRelativePos": 1.6,
66+
"rotationDegrees": -104.27189939195472
67+
}
68+
],
69+
"constraintZones": [],
70+
"pointTowardsZones": [],
71+
"eventMarkers": [
72+
{
73+
"name": "Extend intake",
74+
"waypointRelativePos": 0.0,
75+
"endWaypointRelativePos": null,
76+
"command": {
77+
"type": "parallel",
78+
"data": {
79+
"commands": [
80+
{
81+
"type": "named",
82+
"data": {
83+
"name": "Spin Intake Rollers"
84+
}
85+
},
86+
{
87+
"type": "named",
88+
"data": {
89+
"name": "Extend Intake"
90+
}
91+
}
92+
]
93+
}
94+
}
95+
},
96+
{
97+
"name": "Hood Down",
98+
"waypointRelativePos": 0,
99+
"endWaypointRelativePos": null,
100+
"command": {
101+
"type": "named",
102+
"data": {
103+
"name": "Hood Down"
104+
}
105+
}
106+
},
107+
{
108+
"name": "Stop Hood Down",
109+
"waypointRelativePos": 0.5534308211473522,
110+
"endWaypointRelativePos": null,
111+
"command": {
112+
"type": "named",
113+
"data": {
114+
"name": "Stop Hood Down"
115+
}
116+
}
117+
}
118+
],
119+
"globalConstraints": {
120+
"maxVelocity": 2.0,
121+
"maxAcceleration": 2.0,
122+
"maxAngularVelocity": 200.0,
123+
"maxAngularAcceleration": 300.0,
124+
"nominalVoltage": 12.0,
125+
"unlimited": false
126+
},
127+
"goalEndState": {
128+
"velocity": 0,
129+
"rotation": -110.0
130+
},
131+
"reversed": false,
132+
"folder": "Left Autos",
133+
"idealStartingState": {
134+
"velocity": 0.0,
135+
"rotation": 0.0
136+
},
137+
"useDefaultConstraints": true
138+
}

‎src/main/deploy/pathplanner/paths/#1 Left under the trench.path‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191
"type": "parallel",
9292
"data": {
9393
"commands": [
94-
{
95-
"type": "named",
96-
"data": {
97-
"name": "Extend Intake"
98-
}
99-
},
10094
{
10195
"type": "named",
10296
"data": {
@@ -131,10 +125,10 @@
131125
}
132126
],
133127
"globalConstraints": {
134-
"maxVelocity": 3.0,
135-
"maxAcceleration": 3.0,
136-
"maxAngularVelocity": 540.0,
137-
"maxAngularAcceleration": 720.0,
128+
"maxVelocity": 2.0,
129+
"maxAcceleration": 2.0,
130+
"maxAngularVelocity": 200.0,
131+
"maxAngularAcceleration": 300.0,
138132
"nominalVoltage": 12.0,
139133
"unlimited": false
140134
},

‎src/main/deploy/pathplanner/paths/#1 Right - Under the trench.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
"pointTowardsZones": [],
7373
"eventMarkers": [],
7474
"globalConstraints": {
75-
"maxVelocity": 3.0,
76-
"maxAcceleration": 3.0,
77-
"maxAngularVelocity": 540.0,
78-
"maxAngularAcceleration": 720.0,
75+
"maxVelocity": 2.0,
76+
"maxAcceleration": 2.0,
77+
"maxAngularVelocity": 200.0,
78+
"maxAngularAcceleration": 300.0,
7979
"nominalVoltage": 12.0,
8080
"unlimited": false
8181
},

‎src/main/deploy/pathplanner/paths/#1 Right to neutral to outpost (diagonal).path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@
174174
}
175175
],
176176
"globalConstraints": {
177-
"maxVelocity": 3.0,
178-
"maxAcceleration": 3.0,
179-
"maxAngularVelocity": 540.0,
180-
"maxAngularAcceleration": 720.0,
177+
"maxVelocity": 2.0,
178+
"maxAcceleration": 2.0,
179+
"maxAngularVelocity": 200.0,
180+
"maxAngularAcceleration": 300.0,
181181
"nominalVoltage": 12.0,
182182
"unlimited": false
183183
},

‎src/main/deploy/pathplanner/paths/#1(2) Right - Under the trench.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@
143143
}
144144
],
145145
"globalConstraints": {
146-
"maxVelocity": 3.0,
147-
"maxAcceleration": 3.0,
148-
"maxAngularVelocity": 540.0,
149-
"maxAngularAcceleration": 720.0,
146+
"maxVelocity": 2.0,
147+
"maxAcceleration": 2.0,
148+
"maxAngularVelocity": 200.0,
149+
"maxAngularAcceleration": 300.0,
150150
"nominalVoltage": 12.0,
151151
"unlimited": false
152152
},

‎src/main/deploy/pathplanner/paths/#2 Left under the trench.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
"pointTowardsZones": [],
167167
"eventMarkers": [],
168168
"globalConstraints": {
169-
"maxVelocity": 3.0,
170-
"maxAcceleration": 3.0,
171-
"maxAngularVelocity": 540.0,
172-
"maxAngularAcceleration": 720.0,
169+
"maxVelocity": 2.0,
170+
"maxAcceleration": 2.0,
171+
"maxAngularVelocity": 200.0,
172+
"maxAngularAcceleration": 300.0,
173173
"nominalVoltage": 12.0,
174174
"unlimited": false
175175
},

0 commit comments

Comments
 (0)