Skip to content

Commit 28e044a

Browse files
Tortuga-AMTortuga-AM
committed
fixing thingies
1 parent 1de5672 commit 28e044a

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

‎src/main/java/frc/robot/Subsystems/Manager/ManagerStates.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ public HopperStates getHopperState() {
4747
}
4848

4949
public ShooterStates getShooterState() {
50-
// The WINDING_UP state's shooter target depends on the alliance at runtime. We
51-
// intentionally left the stored shooterState as null for WINDING_UP to avoid
52-
// resolving Drive/DriverStation during enum initialization. Compute it now.
50+
// Could be in shooter but would lead to wierd states i think
51+
// shhoter doesn't change between winding up and shooting only hopper does
5352
if (this == WINDING_UP && shooterState == null) {
5453
return Drive.getInstance().isAtAllianceShootingPosition() ? ShooterStates.SHOOT_ALLIANCE : ShooterStates.SHOOT_HUB;
5554
}

vendordeps/Phoenix6-26.1.0.json renamed to vendordeps/Phoenix6-26.1.1.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"fileName": "Phoenix6-26.1.0.json",
2+
"fileName": "Phoenix6-26.1.1.json",
33
"name": "CTRE-Phoenix (v6)",
4-
"version": "26.1.0",
4+
"version": "26.1.1",
55
"frcYear": "2026",
66
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
77
"mavenUrls": [
@@ -19,14 +19,14 @@
1919
{
2020
"groupId": "com.ctre.phoenix6",
2121
"artifactId": "wpiapi-java",
22-
"version": "26.1.0"
22+
"version": "26.1.1"
2323
}
2424
],
2525
"jniDependencies": [
2626
{
2727
"groupId": "com.ctre.phoenix6",
2828
"artifactId": "api-cpp",
29-
"version": "26.1.0",
29+
"version": "26.1.1",
3030
"isJar": false,
3131
"skipInvalidPlatforms": true,
3232
"validPlatforms": [
@@ -40,7 +40,7 @@
4040
{
4141
"groupId": "com.ctre.phoenix6",
4242
"artifactId": "tools",
43-
"version": "26.1.0",
43+
"version": "26.1.1",
4444
"isJar": false,
4545
"skipInvalidPlatforms": true,
4646
"validPlatforms": [
@@ -54,7 +54,7 @@
5454
{
5555
"groupId": "com.ctre.phoenix6.sim",
5656
"artifactId": "api-cpp-sim",
57-
"version": "26.1.0",
57+
"version": "26.1.1",
5858
"isJar": false,
5959
"skipInvalidPlatforms": true,
6060
"validPlatforms": [
@@ -68,7 +68,7 @@
6868
{
6969
"groupId": "com.ctre.phoenix6.sim",
7070
"artifactId": "tools-sim",
71-
"version": "26.1.0",
71+
"version": "26.1.1",
7272
"isJar": false,
7373
"skipInvalidPlatforms": true,
7474
"validPlatforms": [
@@ -82,7 +82,7 @@
8282
{
8383
"groupId": "com.ctre.phoenix6.sim",
8484
"artifactId": "simTalonSRX",
85-
"version": "26.1.0",
85+
"version": "26.1.1",
8686
"isJar": false,
8787
"skipInvalidPlatforms": true,
8888
"validPlatforms": [
@@ -96,7 +96,7 @@
9696
{
9797
"groupId": "com.ctre.phoenix6.sim",
9898
"artifactId": "simVictorSPX",
99-
"version": "26.1.0",
99+
"version": "26.1.1",
100100
"isJar": false,
101101
"skipInvalidPlatforms": true,
102102
"validPlatforms": [
@@ -110,7 +110,7 @@
110110
{
111111
"groupId": "com.ctre.phoenix6.sim",
112112
"artifactId": "simPigeonIMU",
113-
"version": "26.1.0",
113+
"version": "26.1.1",
114114
"isJar": false,
115115
"skipInvalidPlatforms": true,
116116
"validPlatforms": [
@@ -124,7 +124,7 @@
124124
{
125125
"groupId": "com.ctre.phoenix6.sim",
126126
"artifactId": "simProTalonFX",
127-
"version": "26.1.0",
127+
"version": "26.1.1",
128128
"isJar": false,
129129
"skipInvalidPlatforms": true,
130130
"validPlatforms": [
@@ -138,7 +138,7 @@
138138
{
139139
"groupId": "com.ctre.phoenix6.sim",
140140
"artifactId": "simProTalonFXS",
141-
"version": "26.1.0",
141+
"version": "26.1.1",
142142
"isJar": false,
143143
"skipInvalidPlatforms": true,
144144
"validPlatforms": [
@@ -152,7 +152,7 @@
152152
{
153153
"groupId": "com.ctre.phoenix6.sim",
154154
"artifactId": "simProCANcoder",
155-
"version": "26.1.0",
155+
"version": "26.1.1",
156156
"isJar": false,
157157
"skipInvalidPlatforms": true,
158158
"validPlatforms": [
@@ -166,7 +166,7 @@
166166
{
167167
"groupId": "com.ctre.phoenix6.sim",
168168
"artifactId": "simProPigeon2",
169-
"version": "26.1.0",
169+
"version": "26.1.1",
170170
"isJar": false,
171171
"skipInvalidPlatforms": true,
172172
"validPlatforms": [
@@ -180,7 +180,7 @@
180180
{
181181
"groupId": "com.ctre.phoenix6.sim",
182182
"artifactId": "simProCANrange",
183-
"version": "26.1.0",
183+
"version": "26.1.1",
184184
"isJar": false,
185185
"skipInvalidPlatforms": true,
186186
"validPlatforms": [
@@ -194,7 +194,7 @@
194194
{
195195
"groupId": "com.ctre.phoenix6.sim",
196196
"artifactId": "simProCANdi",
197-
"version": "26.1.0",
197+
"version": "26.1.1",
198198
"isJar": false,
199199
"skipInvalidPlatforms": true,
200200
"validPlatforms": [
@@ -208,7 +208,7 @@
208208
{
209209
"groupId": "com.ctre.phoenix6.sim",
210210
"artifactId": "simProCANdle",
211-
"version": "26.1.0",
211+
"version": "26.1.1",
212212
"isJar": false,
213213
"skipInvalidPlatforms": true,
214214
"validPlatforms": [
@@ -224,7 +224,7 @@
224224
{
225225
"groupId": "com.ctre.phoenix6",
226226
"artifactId": "wpiapi-cpp",
227-
"version": "26.1.0",
227+
"version": "26.1.1",
228228
"libName": "CTRE_Phoenix6_WPI",
229229
"headerClassifier": "headers",
230230
"sharedLibrary": true,
@@ -240,7 +240,7 @@
240240
{
241241
"groupId": "com.ctre.phoenix6",
242242
"artifactId": "tools",
243-
"version": "26.1.0",
243+
"version": "26.1.1",
244244
"libName": "CTRE_PhoenixTools",
245245
"headerClassifier": "headers",
246246
"sharedLibrary": true,
@@ -256,7 +256,7 @@
256256
{
257257
"groupId": "com.ctre.phoenix6.sim",
258258
"artifactId": "wpiapi-cpp-sim",
259-
"version": "26.1.0",
259+
"version": "26.1.1",
260260
"libName": "CTRE_Phoenix6_WPISim",
261261
"headerClassifier": "headers",
262262
"sharedLibrary": true,
@@ -272,7 +272,7 @@
272272
{
273273
"groupId": "com.ctre.phoenix6.sim",
274274
"artifactId": "tools-sim",
275-
"version": "26.1.0",
275+
"version": "26.1.1",
276276
"libName": "CTRE_PhoenixTools_Sim",
277277
"headerClassifier": "headers",
278278
"sharedLibrary": true,
@@ -288,7 +288,7 @@
288288
{
289289
"groupId": "com.ctre.phoenix6.sim",
290290
"artifactId": "simTalonSRX",
291-
"version": "26.1.0",
291+
"version": "26.1.1",
292292
"libName": "CTRE_SimTalonSRX",
293293
"headerClassifier": "headers",
294294
"sharedLibrary": true,
@@ -304,7 +304,7 @@
304304
{
305305
"groupId": "com.ctre.phoenix6.sim",
306306
"artifactId": "simVictorSPX",
307-
"version": "26.1.0",
307+
"version": "26.1.1",
308308
"libName": "CTRE_SimVictorSPX",
309309
"headerClassifier": "headers",
310310
"sharedLibrary": true,
@@ -320,7 +320,7 @@
320320
{
321321
"groupId": "com.ctre.phoenix6.sim",
322322
"artifactId": "simPigeonIMU",
323-
"version": "26.1.0",
323+
"version": "26.1.1",
324324
"libName": "CTRE_SimPigeonIMU",
325325
"headerClassifier": "headers",
326326
"sharedLibrary": true,
@@ -336,7 +336,7 @@
336336
{
337337
"groupId": "com.ctre.phoenix6.sim",
338338
"artifactId": "simProTalonFX",
339-
"version": "26.1.0",
339+
"version": "26.1.1",
340340
"libName": "CTRE_SimProTalonFX",
341341
"headerClassifier": "headers",
342342
"sharedLibrary": true,
@@ -352,7 +352,7 @@
352352
{
353353
"groupId": "com.ctre.phoenix6.sim",
354354
"artifactId": "simProTalonFXS",
355-
"version": "26.1.0",
355+
"version": "26.1.1",
356356
"libName": "CTRE_SimProTalonFXS",
357357
"headerClassifier": "headers",
358358
"sharedLibrary": true,
@@ -368,7 +368,7 @@
368368
{
369369
"groupId": "com.ctre.phoenix6.sim",
370370
"artifactId": "simProCANcoder",
371-
"version": "26.1.0",
371+
"version": "26.1.1",
372372
"libName": "CTRE_SimProCANcoder",
373373
"headerClassifier": "headers",
374374
"sharedLibrary": true,
@@ -384,7 +384,7 @@
384384
{
385385
"groupId": "com.ctre.phoenix6.sim",
386386
"artifactId": "simProPigeon2",
387-
"version": "26.1.0",
387+
"version": "26.1.1",
388388
"libName": "CTRE_SimProPigeon2",
389389
"headerClassifier": "headers",
390390
"sharedLibrary": true,
@@ -400,7 +400,7 @@
400400
{
401401
"groupId": "com.ctre.phoenix6.sim",
402402
"artifactId": "simProCANrange",
403-
"version": "26.1.0",
403+
"version": "26.1.1",
404404
"libName": "CTRE_SimProCANrange",
405405
"headerClassifier": "headers",
406406
"sharedLibrary": true,
@@ -416,7 +416,7 @@
416416
{
417417
"groupId": "com.ctre.phoenix6.sim",
418418
"artifactId": "simProCANdi",
419-
"version": "26.1.0",
419+
"version": "26.1.1",
420420
"libName": "CTRE_SimProCANdi",
421421
"headerClassifier": "headers",
422422
"sharedLibrary": true,
@@ -432,7 +432,7 @@
432432
{
433433
"groupId": "com.ctre.phoenix6.sim",
434434
"artifactId": "simProCANdle",
435-
"version": "26.1.0",
435+
"version": "26.1.1",
436436
"libName": "CTRE_SimProCANdle",
437437
"headerClassifier": "headers",
438438
"sharedLibrary": true,

0 commit comments

Comments
 (0)