Skip to content

Commit 3ef8428

Browse files
davidchen20davidchen20
committed
changed b1c2c3 to b1c2
1 parent 36673cc commit 3ef8428

11 files changed

Lines changed: 98 additions & 107 deletions

File tree

‎.pathplanner/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"holonomicMode": true,
55
"pathFolders": [
66
"$a!p-b1-c1-c2",
7+
"$a!p-b1-c2-c3",
78
"$c!p-b2-c3",
89
"$c!p-b3-b2-b1",
910
"$s!p-b3-c5-c4",
@@ -13,7 +14,7 @@
1314
"$s!p-c4-c5",
1415
"$s!p-c5-c3",
1516
"$s!p-c5-c4",
16-
"$a!p-b1-c2-c3"
17+
"$a!p-c1-c2"
1718
],
1819
"autoFolders": [
1920
"limelight autos"

src/main/deploy/pathplanner/autos/$a!p-b1-c2-c3.auto renamed to src/main/deploy/pathplanner/autos/$a!p-b1-c2.auto

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -94,42 +94,6 @@
9494
"data": {
9595
"pathName": "$apb1c(23)!c3"
9696
}
97-
},
98-
{
99-
"type": "named",
100-
"data": {
101-
"name": "C3"
102-
}
103-
},
104-
{
105-
"type": "named",
106-
"data": {
107-
"name": "AlignToNote"
108-
}
109-
},
110-
{
111-
"type": "path",
112-
"data": {
113-
"pathName": "$apb1c(23)!score c3"
114-
}
115-
},
116-
{
117-
"type": "named",
118-
"data": {
119-
"name": "AimbotStatic"
120-
}
121-
},
122-
{
123-
"type": "wait",
124-
"data": {
125-
"waitTime": 0.2
126-
}
127-
},
128-
{
129-
"type": "named",
130-
"data": {
131-
"name": "DisableOverride"
132-
}
13397
}
13498
]
13599
}

‎src/main/deploy/pathplanner/paths/$apb1c(12)!c2.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 2.533077793428314,
7-
"y": 6.9872307017341315
6+
"x": 2.918404239090931,
7+
"y": 6.991369417831561
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 5.074329323862901,
12-
"y": 7.12776074028351
11+
"x": 5.459655769525517,
12+
"y": 7.13189945638094
1313
},
1414
"isLocked": false,
1515
"linkedName": "$apb1c(12)!score c1 end"

‎src/main/deploy/pathplanner/paths/$apb1c(12)!score c1.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
},
1717
{
1818
"anchor": {
19-
"x": 2.533077793428314,
20-
"y": 6.9872307017341315
19+
"x": 2.918404239090931,
20+
"y": 6.991369417831561
2121
},
2222
"prevControl": {
23-
"x": 3.5519205729113064,
24-
"y": 7.326844961561795
23+
"x": 3.937247018573923,
24+
"y": 7.3309836776592245
2525
},
2626
"nextControl": null,
2727
"isLocked": false,

‎src/main/deploy/pathplanner/paths/$apb1c(23)! score c2.path‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 7.833635975678066,
7-
"y": 5.801660911909887
6+
"x": 6.548763568283198,
7+
"y": 6.394116753996703
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 6.524761791335811,
12-
"y": 6.165252748991669
11+
"x": 5.239889383940944,
12+
"y": 6.757708591078485
1313
},
1414
"isLocked": false,
1515
"linkedName": null

‎src/main/deploy/pathplanner/paths/$apb1c(23)!c2.path‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"waypoints": [
44
{
55
"anchor": {
6-
"x": 2.533077793428314,
7-
"y": 6.9872307017341315
6+
"x": 2.918404239090931,
7+
"y": 6.991369417831561
88
},
99
"prevControl": null,
1010
"nextControl": {
11-
"x": 6.0100650871772485,
12-
"y": 6.979658581285779
11+
"x": 6.150595125726627,
12+
"y": 6.382405917450922
1313
},
1414
"isLocked": false,
1515
"linkedName": "$apb1c(12)!score c1 end"
1616
},
1717
{
1818
"anchor": {
19-
"x": 7.193212122959909,
20-
"y": 5.8386690308679015
19+
"x": 7.087462049389147,
20+
"y": 6.113056676897948
2121
},
2222
"prevControl": {
23-
"x": 5.631770458409913,
24-
"y": 5.827336176142513
23+
"x": 5.998354250631467,
24+
"y": 6.499514282908736
2525
},
2626
"nextControl": null,
2727
"isLocked": false,
@@ -31,7 +31,7 @@
3131
"rotationTargets": [
3232
{
3333
"waypointRelativePos": 0.5,
34-
"rotationDegrees": 0,
34+
"rotationDegrees": -18.63458487744634,
3535
"rotateFast": false
3636
}
3737
],
@@ -62,8 +62,8 @@
6262
"maxAngularAcceleration": 720.0
6363
},
6464
"goalEndState": {
65-
"velocity": 2.0,
66-
"rotation": 0,
65+
"velocity": 3.2,
66+
"rotation": -19.6538240580532,
6767
"rotateFast": false
6868
},
6969
"reversed": false,

‎src/main/deploy/pathplanner/paths/$apb1c(23)!c3.path‎

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,12 @@
1616
},
1717
{
1818
"anchor": {
19-
"x": 4.255980704465048,
20-
"y": 5.402988951902212
19+
"x": 7.216281251392744,
20+
"y": 6.944526071648434
2121
},
2222
"prevControl": {
23-
"x": 3.874928537967454,
24-
"y": 6.175854333451697
25-
},
26-
"nextControl": {
27-
"x": 4.933694821902017,
28-
"y": 4.028421829587472
29-
},
30-
"isLocked": false,
31-
"linkedName": null
32-
},
33-
{
34-
"anchor": {
35-
"x": 5.862706763623136,
36-
"y": 4.113976955226638
37-
},
38-
"prevControl": {
39-
"x": 5.636637899402766,
40-
"y": 4.125907513920935
41-
},
42-
"nextControl": {
43-
"x": 6.038560259428534,
44-
"y": 4.104696462485903
45-
},
46-
"isLocked": false,
47-
"linkedName": null
48-
},
49-
{
50-
"anchor": {
51-
"x": 7.057519569584594,
52-
"y": 4.113976955226638
53-
},
54-
"prevControl": {
55-
"x": 6.384347251045304,
56-
"y": 4.098488026852327
23+
"x": 6.543108932853454,
24+
"y": 6.9290371432741225
5725
},
5826
"nextControl": null,
5927
"isLocked": false,
@@ -65,7 +33,7 @@
6533
"eventMarkers": [
6634
{
6735
"name": "pivot 39",
68-
"waypointRelativePos": 0.85,
36+
"waypointRelativePos": 0.25,
6937
"command": {
7038
"type": "sequential",
7139
"data": {
@@ -83,12 +51,12 @@
8351
],
8452
"globalConstraints": {
8553
"maxVelocity": 4.0,
86-
"maxAcceleration": 3.5,
54+
"maxAcceleration": 4.0,
8755
"maxAngularVelocity": 540.0,
8856
"maxAngularAcceleration": 720.0
8957
},
9058
"goalEndState": {
91-
"velocity": 2.0,
59+
"velocity": 3.5,
9260
"rotation": 0,
9361
"rotateFast": false
9462
},

‎src/main/deploy/pathplanner/paths/New Path.path‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 1.44283883432246,
7+
"y": 6.405827590542485
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 5.131752346243635,
12+
"y": 5.925683292165443
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 6.888377828110863,
20+
"y": 7.401248696933913
21+
},
22+
"prevControl": {
23+
"x": 5.1785956924267635,
24+
"y": 7.389537860388131
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [
32+
{
33+
"waypointRelativePos": 0.5,
34+
"rotationDegrees": 0,
35+
"rotateFast": false
36+
}
37+
],
38+
"constraintZones": [],
39+
"eventMarkers": [],
40+
"globalConstraints": {
41+
"maxVelocity": 4.0,
42+
"maxAcceleration": 3.5,
43+
"maxAngularVelocity": 540.0,
44+
"maxAngularAcceleration": 720.0
45+
},
46+
"goalEndState": {
47+
"velocity": 3.23,
48+
"rotation": 0,
49+
"rotateFast": false
50+
},
51+
"reversed": false,
52+
"folder": "$a!p-c1-c2",
53+
"previewStartingState": {
54+
"rotation": 45.0,
55+
"velocity": 0
56+
},
57+
"useDefaultConstraints": false
58+
}

‎src/main/java/frc/robot/BuildConstants.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ public final class BuildConstants {
55
public static final String MAVEN_GROUP = "";
66
public static final String MAVEN_NAME = "2024RobotCode";
77
public static final String VERSION = "unspecified";
8-
public static final int GIT_REVISION = 355;
9-
public static final String GIT_SHA = "a1e239c47e0c0a8e0dcd569d1d9ff6ccb8abaef5";
10-
public static final String GIT_DATE = "2024-10-06 23:26:26 EDT";
11-
public static final String GIT_BRANCH = "pre-bloomfield";
12-
public static final String BUILD_DATE = "2024-10-16 18:59:50 EDT";
13-
public static final long BUILD_UNIX_TIME = 1729119590187L;
8+
public static final int GIT_REVISION = 356;
9+
public static final String GIT_SHA = "36673cccf9e6578a8fd26610f4ef8e2ed4179da1";
10+
public static final String GIT_DATE = "2024-10-17 18:59:53 EDT";
11+
public static final String GIT_BRANCH = "bloomfield";
12+
public static final String BUILD_DATE = "2024-10-19 17:27:17 EDT";
13+
public static final long BUILD_UNIX_TIME = 1729373237051L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

‎src/main/java/frc/robot/RobotContainer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ public RobotContainer() {
459459
autos.addOption("$c!p-b2-c3", AutoBuilder.buildAuto("$c!p-b2-c3"));
460460

461461
autos.addOption("$a!p-b1-c1-c2", AutoBuilder.buildAuto("$a!p-b1-c1-c2"));
462-
autos.addOption("$a!p-b1-c2-c3", AutoBuilder.buildAuto("$a!p-b1-c2-c3"));
462+
autos.addOption("$a!p-b1-c2", AutoBuilder.buildAuto("$a!p-b1-c2"));
463463

464464
autoChooser = new LoggedDashboardChooser<>("Auto Choices", autos);
465465

0 commit comments

Comments
 (0)