Skip to content

Commit 91117a5

Browse files
StarbuckBaristaStarbuckBarista
authored
Merge pull request #18 from FIRST1939/cmo
CMO Changes
2 parents 84d7f64 + b631be0 commit 91117a5

34 files changed

+688
-177
lines changed

‎src/main/deploy/pathplanner/autos/BL.auto‎

Lines changed: 93 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,116 @@
1010
"pathName": "BL_D"
1111
}
1212
},
13+
{
14+
"type": "named",
15+
"data": {
16+
"name": "ElevatorToL4"
17+
}
18+
},
19+
{
20+
"type": "named",
21+
"data": {
22+
"name": "CoralScore"
23+
}
24+
},
1325
{
1426
"type": "path",
1527
"data": {
1628
"pathName": "D_BHP"
1729
}
1830
},
1931
{
20-
"type": "path",
32+
"type": "parallel",
2133
"data": {
22-
"pathName": "BHP_C"
34+
"commands": [
35+
{
36+
"type": "named",
37+
"data": {
38+
"name": "LoadCoral"
39+
}
40+
},
41+
{
42+
"type": "sequential",
43+
"data": {
44+
"commands": [
45+
{
46+
"type": "wait",
47+
"data": {
48+
"waitTime": 1.0
49+
}
50+
},
51+
{
52+
"type": "path",
53+
"data": {
54+
"pathName": "BHP_C"
55+
}
56+
}
57+
]
58+
}
59+
}
60+
]
2361
}
2462
},
2563
{
26-
"type": "path",
64+
"type": "named",
65+
"data": {
66+
"name": "ElevatorToL4"
67+
}
68+
},
69+
{
70+
"type": "named",
2771
"data": {
28-
"pathName": "C_BHP"
72+
"name": "CoralScore"
2973
}
3074
},
3175
{
3276
"type": "path",
3377
"data": {
34-
"pathName": "BHP_B"
78+
"pathName": "c_bHP"
79+
}
80+
},
81+
{
82+
"type": "parallel",
83+
"data": {
84+
"commands": [
85+
{
86+
"type": "named",
87+
"data": {
88+
"name": "LoadCoral"
89+
}
90+
},
91+
{
92+
"type": "sequential",
93+
"data": {
94+
"commands": [
95+
{
96+
"type": "wait",
97+
"data": {
98+
"waitTime": 1.0
99+
}
100+
},
101+
{
102+
"type": "path",
103+
"data": {
104+
"pathName": "BHP_b"
105+
}
106+
}
107+
]
108+
}
109+
}
110+
]
111+
}
112+
},
113+
{
114+
"type": "named",
115+
"data": {
116+
"name": "ElevatorToL4"
117+
}
118+
},
119+
{
120+
"type": "named",
121+
"data": {
122+
"name": "CoralScore"
35123
}
36124
}
37125
]

‎src/main/deploy/pathplanner/autos/TL.auto‎

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,66 @@
1010
"pathName": "TL_K"
1111
}
1212
},
13+
{
14+
"type": "named",
15+
"data": {
16+
"name": "ElevatorToL4"
17+
}
18+
},
19+
{
20+
"type": "named",
21+
"data": {
22+
"name": "CoralScore"
23+
}
24+
},
1325
{
1426
"type": "path",
1527
"data": {
1628
"pathName": "K_THP"
1729
}
1830
},
1931
{
20-
"type": "path",
32+
"type": "parallel",
33+
"data": {
34+
"commands": [
35+
{
36+
"type": "named",
37+
"data": {
38+
"name": "LoadCoral"
39+
}
40+
},
41+
{
42+
"type": "sequential",
43+
"data": {
44+
"commands": [
45+
{
46+
"type": "wait",
47+
"data": {
48+
"waitTime": 1.0
49+
}
50+
},
51+
{
52+
"type": "path",
53+
"data": {
54+
"pathName": "THP_L"
55+
}
56+
}
57+
]
58+
}
59+
}
60+
]
61+
}
62+
},
63+
{
64+
"type": "named",
2165
"data": {
22-
"pathName": "THP_L"
66+
"name": "ElevatorToL4"
67+
}
68+
},
69+
{
70+
"type": "named",
71+
"data": {
72+
"name": "CoralScore"
2373
}
2474
},
2575
{
@@ -29,9 +79,47 @@
2979
}
3080
},
3181
{
32-
"type": "path",
82+
"type": "parallel",
83+
"data": {
84+
"commands": [
85+
{
86+
"type": "named",
87+
"data": {
88+
"name": "LoadCoral"
89+
}
90+
},
91+
{
92+
"type": "sequential",
93+
"data": {
94+
"commands": [
95+
{
96+
"type": "wait",
97+
"data": {
98+
"waitTime": 1.0
99+
}
100+
},
101+
{
102+
"type": "path",
103+
"data": {
104+
"pathName": "THP_A"
105+
}
106+
}
107+
]
108+
}
109+
}
110+
]
111+
}
112+
},
113+
{
114+
"type": "named",
115+
"data": {
116+
"name": "ElevatorToL4"
117+
}
118+
},
119+
{
120+
"type": "named",
33121
"data": {
34-
"pathName": "THP_A"
122+
"name": "CoralScore"
35123
}
36124
}
37125
]

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ public final class BuildConstants {
77
public static final String MAVEN_GROUP = "";
88
public static final String MAVEN_NAME = "Reefscape2025";
99
public static final String VERSION = "unspecified";
10-
public static final int GIT_REVISION = 167;
11-
public static final String GIT_SHA = "ecd5e98507db43c25aa59df26ed8be2b3f5078df";
12-
public static final String GIT_DATE = "2025-03-06 08:12:25 CST";
13-
public static final String GIT_BRANCH = "feature/indexing";
14-
public static final String BUILD_DATE = "2025-03-06 17:55:48 CST";
15-
public static final long BUILD_UNIX_TIME = 1741305348569L;
16-
public static final int DIRTY = 1;
10+
public static final int GIT_REVISION = 189;
11+
public static final String GIT_SHA = "5b27c4079a5c5e2be847b1b6f1674afd6ebff3a8";
12+
public static final String GIT_DATE = "2025-03-13 16:49:35 CDT";
13+
public static final String GIT_BRANCH = "cmo";
14+
public static final String BUILD_DATE = "2025-03-14 12:12:51 CDT";
15+
public static final long BUILD_UNIX_TIME = 1741972371999L;
16+
public static final int DIRTY = 0;
1717

1818
private BuildConstants(){}
1919
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.littletonrobotics.junction.wpilog.WPILOGReader;
2020
import org.littletonrobotics.junction.wpilog.WPILOGWriter;
2121

22+
import edu.wpi.first.wpilibj.DriverStation;
2223
import edu.wpi.first.wpilibj.PowerDistribution;
2324
import edu.wpi.first.wpilibj.PowerDistribution.ModuleType;
2425
import edu.wpi.first.wpilibj2.command.Command;
@@ -96,6 +97,7 @@ public void disabledExit () {
9697
public void autonomousInit () {
9798

9899
//this.autoCommand = this.autoSelector.getSelected();
100+
this.autoCommand = this.robotContainer.getAutonomousCommand();
99101

100102
if (this.autoCommand != null) {
101103

0 commit comments

Comments
 (0)