Skip to content

Commit 1e844fa

Browse files
nlaverdurenlaverdure
authored
Continue tuning (#98)
* update constants * update CTRE
1 parent 9f7a9c9 commit 1e844fa

File tree

4 files changed

+63
-33
lines changed

4 files changed

+63
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public static final class ClimberConstants {
288288
kMaxVelocityInchesPerSecond / kVelocityConversionFactor;
289289
public static final double kMaxAccelerationRPMPerSecond = kMaxVelocityRPM; // 100% accel in 1s
290290

291-
public static final double kDeployPosition = 7.0; // inches
291+
public static final double kDeployPosition = 10.0; // inches
292292
}
293293

294294
public static final class LedConstants {

‎src/main/java/frc/robot/elevator/AlgaeRoller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public AlgaeRoller() {
3333
// spotless:off
3434
config
3535
.voltageCompensation(RobotConstants.kNominalVoltage)
36-
.idleMode(IdleMode.kCoast)
36+
.idleMode(IdleMode.kBrake)
3737
.smartCurrentLimit(RobotConstants.kDefaultNEO550CurretnLimit)
3838
.inverted(false);
3939

‎src/main/java/frc/robot/elevator/ElevatorConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public final class LifterController {
4848
public static enum LifterState {
4949
Unknown(0.0),
5050
Min(0.0),
51-
AlgaeIntakeFloor(0.0),
51+
AlgaeIntakeFloor(1.0),
5252
EncoderReset(0.36),
5353
CoralL1(3.0),
5454
CoralL2(13.8),
5555
CoralL3(30.0),
5656
CoralL4(60.75),
57-
CoralIntake(7.7),
57+
CoralIntake(9.7),
5858
AlgaeProcessor(12.0),
5959
AlgaeL2(30),
6060
AlgaeL3(46.5),

‎vendordeps/Phoenix6-25.2.2.json renamed to ‎vendordeps/Phoenix6-25.3.1.json

Lines changed: 59 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"fileName": "Phoenix6-25.2.2.json",
2+
"fileName": "Phoenix6-25.3.1.json",
33
"name": "CTRE-Phoenix (v6)",
4-
"version": "25.2.2",
4+
"version": "25.3.1",
55
"frcYear": "2025",
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": "25.2.2"
22+
"version": "25.3.1"
2323
}
2424
],
2525
"jniDependencies": [
2626
{
2727
"groupId": "com.ctre.phoenix6",
2828
"artifactId": "api-cpp",
29-
"version": "25.2.2",
29+
"version": "25.3.1",
3030
"isJar": false,
3131
"skipInvalidPlatforms": true,
3232
"validPlatforms": [
@@ -40,7 +40,7 @@
4040
{
4141
"groupId": "com.ctre.phoenix6",
4242
"artifactId": "tools",
43-
"version": "25.2.2",
43+
"version": "25.3.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": "25.2.2",
57+
"version": "25.3.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": "25.2.2",
71+
"version": "25.3.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": "25.2.2",
85+
"version": "25.3.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": "25.2.2",
99+
"version": "25.3.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": "25.2.2",
113+
"version": "25.3.1",
114114
"isJar": false,
115115
"skipInvalidPlatforms": true,
116116
"validPlatforms": [
@@ -124,7 +124,7 @@
124124
{
125125
"groupId": "com.ctre.phoenix6.sim",
126126
"artifactId": "simCANCoder",
127-
"version": "25.2.2",
127+
"version": "25.3.1",
128128
"isJar": false,
129129
"skipInvalidPlatforms": true,
130130
"validPlatforms": [
@@ -138,7 +138,7 @@
138138
{
139139
"groupId": "com.ctre.phoenix6.sim",
140140
"artifactId": "simProTalonFX",
141-
"version": "25.2.2",
141+
"version": "25.3.1",
142142
"isJar": false,
143143
"skipInvalidPlatforms": true,
144144
"validPlatforms": [
@@ -152,7 +152,7 @@
152152
{
153153
"groupId": "com.ctre.phoenix6.sim",
154154
"artifactId": "simProTalonFXS",
155-
"version": "25.2.2",
155+
"version": "25.3.1",
156156
"isJar": false,
157157
"skipInvalidPlatforms": true,
158158
"validPlatforms": [
@@ -166,7 +166,7 @@
166166
{
167167
"groupId": "com.ctre.phoenix6.sim",
168168
"artifactId": "simProCANcoder",
169-
"version": "25.2.2",
169+
"version": "25.3.1",
170170
"isJar": false,
171171
"skipInvalidPlatforms": true,
172172
"validPlatforms": [
@@ -180,7 +180,7 @@
180180
{
181181
"groupId": "com.ctre.phoenix6.sim",
182182
"artifactId": "simProPigeon2",
183-
"version": "25.2.2",
183+
"version": "25.3.1",
184184
"isJar": false,
185185
"skipInvalidPlatforms": true,
186186
"validPlatforms": [
@@ -194,7 +194,21 @@
194194
{
195195
"groupId": "com.ctre.phoenix6.sim",
196196
"artifactId": "simProCANrange",
197-
"version": "25.2.2",
197+
"version": "25.3.1",
198+
"isJar": false,
199+
"skipInvalidPlatforms": true,
200+
"validPlatforms": [
201+
"windowsx86-64",
202+
"linuxx86-64",
203+
"linuxarm64",
204+
"osxuniversal"
205+
],
206+
"simMode": "swsim"
207+
},
208+
{
209+
"groupId": "com.ctre.phoenix6.sim",
210+
"artifactId": "simProCANdi",
211+
"version": "25.3.1",
198212
"isJar": false,
199213
"skipInvalidPlatforms": true,
200214
"validPlatforms": [
@@ -210,7 +224,7 @@
210224
{
211225
"groupId": "com.ctre.phoenix6",
212226
"artifactId": "wpiapi-cpp",
213-
"version": "25.2.2",
227+
"version": "25.3.1",
214228
"libName": "CTRE_Phoenix6_WPI",
215229
"headerClassifier": "headers",
216230
"sharedLibrary": true,
@@ -226,7 +240,7 @@
226240
{
227241
"groupId": "com.ctre.phoenix6",
228242
"artifactId": "tools",
229-
"version": "25.2.2",
243+
"version": "25.3.1",
230244
"libName": "CTRE_PhoenixTools",
231245
"headerClassifier": "headers",
232246
"sharedLibrary": true,
@@ -242,7 +256,7 @@
242256
{
243257
"groupId": "com.ctre.phoenix6.sim",
244258
"artifactId": "wpiapi-cpp-sim",
245-
"version": "25.2.2",
259+
"version": "25.3.1",
246260
"libName": "CTRE_Phoenix6_WPISim",
247261
"headerClassifier": "headers",
248262
"sharedLibrary": true,
@@ -258,7 +272,7 @@
258272
{
259273
"groupId": "com.ctre.phoenix6.sim",
260274
"artifactId": "tools-sim",
261-
"version": "25.2.2",
275+
"version": "25.3.1",
262276
"libName": "CTRE_PhoenixTools_Sim",
263277
"headerClassifier": "headers",
264278
"sharedLibrary": true,
@@ -274,7 +288,7 @@
274288
{
275289
"groupId": "com.ctre.phoenix6.sim",
276290
"artifactId": "simTalonSRX",
277-
"version": "25.2.2",
291+
"version": "25.3.1",
278292
"libName": "CTRE_SimTalonSRX",
279293
"headerClassifier": "headers",
280294
"sharedLibrary": true,
@@ -290,7 +304,7 @@
290304
{
291305
"groupId": "com.ctre.phoenix6.sim",
292306
"artifactId": "simVictorSPX",
293-
"version": "25.2.2",
307+
"version": "25.3.1",
294308
"libName": "CTRE_SimVictorSPX",
295309
"headerClassifier": "headers",
296310
"sharedLibrary": true,
@@ -306,7 +320,7 @@
306320
{
307321
"groupId": "com.ctre.phoenix6.sim",
308322
"artifactId": "simPigeonIMU",
309-
"version": "25.2.2",
323+
"version": "25.3.1",
310324
"libName": "CTRE_SimPigeonIMU",
311325
"headerClassifier": "headers",
312326
"sharedLibrary": true,
@@ -322,7 +336,7 @@
322336
{
323337
"groupId": "com.ctre.phoenix6.sim",
324338
"artifactId": "simCANCoder",
325-
"version": "25.2.2",
339+
"version": "25.3.1",
326340
"libName": "CTRE_SimCANCoder",
327341
"headerClassifier": "headers",
328342
"sharedLibrary": true,
@@ -338,7 +352,7 @@
338352
{
339353
"groupId": "com.ctre.phoenix6.sim",
340354
"artifactId": "simProTalonFX",
341-
"version": "25.2.2",
355+
"version": "25.3.1",
342356
"libName": "CTRE_SimProTalonFX",
343357
"headerClassifier": "headers",
344358
"sharedLibrary": true,
@@ -354,7 +368,7 @@
354368
{
355369
"groupId": "com.ctre.phoenix6.sim",
356370
"artifactId": "simProTalonFXS",
357-
"version": "25.2.2",
371+
"version": "25.3.1",
358372
"libName": "CTRE_SimProTalonFXS",
359373
"headerClassifier": "headers",
360374
"sharedLibrary": true,
@@ -370,7 +384,7 @@
370384
{
371385
"groupId": "com.ctre.phoenix6.sim",
372386
"artifactId": "simProCANcoder",
373-
"version": "25.2.2",
387+
"version": "25.3.1",
374388
"libName": "CTRE_SimProCANcoder",
375389
"headerClassifier": "headers",
376390
"sharedLibrary": true,
@@ -386,7 +400,7 @@
386400
{
387401
"groupId": "com.ctre.phoenix6.sim",
388402
"artifactId": "simProPigeon2",
389-
"version": "25.2.2",
403+
"version": "25.3.1",
390404
"libName": "CTRE_SimProPigeon2",
391405
"headerClassifier": "headers",
392406
"sharedLibrary": true,
@@ -402,7 +416,7 @@
402416
{
403417
"groupId": "com.ctre.phoenix6.sim",
404418
"artifactId": "simProCANrange",
405-
"version": "25.2.2",
419+
"version": "25.3.1",
406420
"libName": "CTRE_SimProCANrange",
407421
"headerClassifier": "headers",
408422
"sharedLibrary": true,
@@ -414,6 +428,22 @@
414428
"osxuniversal"
415429
],
416430
"simMode": "swsim"
431+
},
432+
{
433+
"groupId": "com.ctre.phoenix6.sim",
434+
"artifactId": "simProCANdi",
435+
"version": "25.3.1",
436+
"libName": "CTRE_SimProCANdi",
437+
"headerClassifier": "headers",
438+
"sharedLibrary": true,
439+
"skipInvalidPlatforms": true,
440+
"binaryPlatforms": [
441+
"windowsx86-64",
442+
"linuxx86-64",
443+
"linuxarm64",
444+
"osxuniversal"
445+
],
446+
"simMode": "swsim"
417447
}
418448
]
419449
}

0 commit comments

Comments
 (0)