Skip to content

Commit d374e8a

Browse files
AyushSagar16AyushSagar16
committed
3/23
3/23
1 parent 0bc0052 commit d374e8a

19 files changed

+760
-514
lines changed

‎Hardware.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ This document details all of the hardware (motors, motor controllers, sensors, e
2222
| 13 | Shooter L | NEO | SPARK MAX | ? |
2323
| 14 | Shooter R | NEO | SPARK MAX | ? |
2424
| 15 | Feeder | NEO 550 | SPARK MAX | ? |
25+
| 16 | Climber L | NEO | SPARK MAX | ? |
26+
| 17 | Climber R | NEO | SPARK MAX | ? |
2527

2628

2729

‎src/main/deploy/pathplanner/paths/go_straight.path‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 1.3674521584632144,
7+
"y": 5.555162990025228
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 2.3674521584632147,
12+
"y": 5.555162990025228
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 3.3529085604537125,
20+
"y": 5.555162990025228
21+
},
22+
"prevControl": {
23+
"x": 2.3529085604537125,
24+
"y": 5.555162990025228
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 2.0,
36+
"maxAcceleration": 1.0,
37+
"maxAngularVelocity": 540.0,
38+
"maxAngularAcceleration": 720.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": 0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": null,
47+
"previewStartingState": {
48+
"rotation": 0,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": false
52+
}

‎src/main/deploy/pathplanner/paths/left_intake.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
},
3333
{
3434
"anchor": {
35-
"x": 2.663656856135768,
36-
"y": 6.882229704309033
35+
"x": 2.622507500654099,
36+
"y": 6.913091720920284
3737
},
3838
"prevControl": {
39-
"x": 2.3138873345415867,
40-
"y": 6.697057604641525
39+
"x": 2.272737979059918,
40+
"y": 6.727919621252776
4141
},
4242
"nextControl": null,
4343
"isLocked": false,

‎src/main/deploy/pathplanner/paths/left_one_intake.path‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,25 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 0.8633725538127772,
7-
"y": 4.186946920259755
6+
"x": 0.7913611817198578,
7+
"y": 6.71763228238236
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.1514180421844555,
12-
"y": 3.3433851328855546
11+
"x": 1.295440786370295,
12+
"y": 6.697057604641525
1313
},
1414
"isLocked": false,
1515
"linkedName": null
1616
},
1717
{
1818
"anchor": {
19-
"x": 4.165608331216663,
20-
"y": 1.6356868803963172
19+
"x": 2.7665302448399385,
20+
"y": 6.985103093013204
2121
},
2222
"prevControl": {
23-
"x": 3.3837705770649635,
24-
"y": 2.01631841860175
25-
},
26-
"nextControl": {
27-
"x": 5.1190189640251695,
28-
"y": 1.1715264407395432
29-
},
30-
"isLocked": false,
31-
"linkedName": null
32-
},
33-
{
34-
"anchor": {
35-
"x": 8.537727351143927,
36-
"y": 2.479248667770519
37-
},
38-
"prevControl": {
39-
"x": 7.869050324566816,
40-
"y": 1.9443070465088308
23+
"x": 1.7665302448399385,
24+
"y": 6.985103093013204
4125
},
4226
"nextControl": null,
4327
"isLocked": false,
@@ -46,28 +30,28 @@
4630
],
4731
"rotationTargets": [
4832
{
49-
"waypointRelativePos": 0.65,
50-
"rotationDegrees": 0,
51-
"rotateFast": true
33+
"waypointRelativePos": 0.2,
34+
"rotationDegrees": 30.20212909921521,
35+
"rotateFast": false
5236
}
5337
],
5438
"constraintZones": [],
5539
"eventMarkers": [],
5640
"globalConstraints": {
57-
"maxVelocity": 3.0,
58-
"maxAcceleration": 1.0,
41+
"maxVelocity": 1.5,
42+
"maxAcceleration": 2.0,
5943
"maxAngularVelocity": 540.0,
6044
"maxAngularAcceleration": 720.0
6145
},
6246
"goalEndState": {
6347
"velocity": 0,
64-
"rotation": 13.736268305622598,
65-
"rotateFast": false
48+
"rotation": 0,
49+
"rotateFast": true
6650
},
6751
"reversed": false,
6852
"folder": null,
6953
"previewStartingState": {
70-
"rotation": -56.689369175439175,
54+
"rotation": 57.804266065286676,
7155
"velocity": 0
7256
},
7357
"useDefaultConstraints": false

‎src/main/deploy/pathplanner/paths/left_one_middle_intake.path‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 0.8633725538127772,
7+
"y": 4.186946920259755
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 1.1514180421844555,
12+
"y": 3.3433851328855546
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 4.165608331216663,
20+
"y": 1.6356868803963172
21+
},
22+
"prevControl": {
23+
"x": 3.3837705770649635,
24+
"y": 2.01631841860175
25+
},
26+
"nextControl": {
27+
"x": 5.1190189640251695,
28+
"y": 1.1715264407395432
29+
},
30+
"isLocked": false,
31+
"linkedName": null
32+
},
33+
{
34+
"anchor": {
35+
"x": 8.537727351143927,
36+
"y": 2.479248667770519
37+
},
38+
"prevControl": {
39+
"x": 7.869050324566816,
40+
"y": 1.9443070465088308
41+
},
42+
"nextControl": null,
43+
"isLocked": false,
44+
"linkedName": null
45+
}
46+
],
47+
"rotationTargets": [
48+
{
49+
"waypointRelativePos": 0.65,
50+
"rotationDegrees": 0,
51+
"rotateFast": true
52+
}
53+
],
54+
"constraintZones": [],
55+
"eventMarkers": [],
56+
"globalConstraints": {
57+
"maxVelocity": 3.0,
58+
"maxAcceleration": 1.0,
59+
"maxAngularVelocity": 540.0,
60+
"maxAngularAcceleration": 720.0
61+
},
62+
"goalEndState": {
63+
"velocity": 0,
64+
"rotation": 13.736268305622598,
65+
"rotateFast": false
66+
},
67+
"reversed": false,
68+
"folder": null,
69+
"previewStartingState": {
70+
"rotation": -56.689369175439175,
71+
"velocity": 0
72+
},
73+
"useDefaultConstraints": false
74+
}

‎src/main/deploy/pathplanner/paths/middle_intake.path‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 2.66,
7-
"y": 6.88
6+
"x": 2.64,
7+
"y": 6.91
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.7535594707553053,
12-
"y": 6.848039577897337
11+
"x": 1.6354976468348932,
12+
"y": 6.871080348827365
1313
},
1414
"isLocked": false,
1515
"linkedName": null
1616
},
1717
{
1818
"anchor": {
19-
"x": 2.4476227398570094,
20-
"y": 5.627174362118149
19+
"x": 2.66,
20+
"y": 5.67
2121
},
2222
"prevControl": {
23-
"x": 1.6904421454958207,
24-
"y": 5.608516870257711
23+
"x": 1.9028194056388115,
24+
"y": 5.651342508139562
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

‎src/main/deploy/pathplanner/paths/middle_middle_intake.path‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 1.36,
7-
"y": 5.54
6+
"x": 0.8427978760719429,
7+
"y": 6.635333571419023
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.3891117107334343,
12-
"y": 5.54
11+
"x": 0.871909586805377,
12+
"y": 6.635333571419023
1313
},
1414
"isLocked": false,
1515
"linkedName": null
1616
},
1717
{
1818
"anchor": {
19-
"x": 2.43733540098525,
20-
"y": 5.54
19+
"x": 2.5710708063020142,
20+
"y": 6.995390431883621
2121
},
2222
"prevControl": {
23-
"x": 2.425951143643719,
24-
"y": 5.54
23+
"x": 2.5596865489604834,
24+
"y": 6.995390431883621
2525
},
2626
"nextControl": null,
2727
"isLocked": false,
@@ -40,12 +40,12 @@
4040
"goalEndState": {
4141
"velocity": 0,
4242
"rotation": 0,
43-
"rotateFast": false
43+
"rotateFast": true
4444
},
4545
"reversed": false,
4646
"folder": null,
4747
"previewStartingState": {
48-
"rotation": 0,
48+
"rotation": 58.49573328079566,
4949
"velocity": 0
5050
},
5151
"useDefaultConstraints": false

‎src/main/deploy/pathplanner/paths/right_intake.path‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 2.52,
6+
"x": 2.67,
77
"y": 5.54
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 1.7881894381970584,
11+
"x": 1.9381894381970584,
1212
"y": 5.521946336619947
1313
},
1414
"isLocked": false,
1515
"linkedName": null
1616
},
1717
{
1818
"anchor": {
19-
"x": 2.3653240288936717,
20-
"y": 4.228096275741424
19+
"x": 2.437335400986592,
20+
"y": 4.372119019927263
2121
},
2222
"prevControl": {
23-
"x": 1.6664955367326586,
24-
"y": 4.548392667981888
23+
"x": 1.6966470023165623,
24+
"y": 4.660164508298942
2525
},
2626
"nextControl": {
27-
"x": 2.6122201617836818,
28-
"y": 4.114935548166836
27+
"x": 2.690461848566369,
28+
"y": 4.273680956979572
2929
},
3030
"isLocked": false,
3131
"linkedName": null
3232
},
3333
{
3434
"anchor": {
35-
"x": 2.735668228228687,
35+
"x": 2.807679600321607,
3636
"y": 4.228096275741424
3737
},
3838
"prevControl": {
39-
"x": 2.571070806302013,
40-
"y": 4.197234259130172
39+
"x": 3.023713716600366,
40+
"y": 4.0429241760739165
4141
},
4242
"nextControl": null,
4343
"isLocked": false,
@@ -61,7 +61,7 @@
6161
},
6262
"goalEndState": {
6363
"velocity": 0,
64-
"rotation": -24.863696571751913,
64+
"rotation": -33.31063082456073,
6565
"rotateFast": true
6666
},
6767
"reversed": false,

0 commit comments

Comments
 (0)