Skip to content

Commit d8674e1

Browse files
Wisdo1Wisdo1
committed
Updated Vendor Libs and Changed Config type
1 parent 1011dde commit d8674e1

File tree

5 files changed

+69
-43
lines changed

5 files changed

+69
-43
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import frc.robot.subsystems.drive.ModuleIOSpark;
3434
import frc.robot.subsystems.vision.Vision;
3535
import frc.robot.subsystems.vision.VisionIO;
36-
import frc.robot.subsystems.vision.VisionIOPhotonVision;
3736
import frc.robot.subsystems.vision.VisionIOPhotonVisionSim;
3837
import org.littletonrobotics.junction.networktables.LoggedDashboardChooser;
3938

@@ -69,11 +68,9 @@ public RobotContainer() {
6968
new ModuleIOSpark(1),
7069
new ModuleIOSpark(2),
7170
new ModuleIOSpark(3));
72-
vision =
73-
new Vision(
74-
drive::addVisionMeasurement,
75-
new VisionIOPhotonVision(camera0Name, robotToCamera0),
76-
new VisionIOPhotonVision(camera1Name, robotToCamera1));
71+
vision = new Vision(drive::addVisionMeasurement); // no cameras for now
72+
// new VisionIOPhotonVision(camera0Name, robotToCamera0),
73+
// new VisionIOPhotonVision(camera1Name, robotToCamera1));
7774
break;
7875

7976
case SIM:

‎src/main/java/frc/robot/subsystems/drive/DriveConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class DriveConstants {
3434
new Translation2d(-trackWidth / 2.0, -wheelBase / 2.0)
3535
};
3636

37-
// Zeroed rotation values for each module, see setup instructions
37+
// TODO: Zeroed rotation values for each module, see setup instructions
3838
public static final Rotation2d frontLeftZeroRotation = new Rotation2d(0.0);
3939
public static final Rotation2d frontRightZeroRotation = new Rotation2d(0.0);
4040
public static final Rotation2d backLeftZeroRotation = new Rotation2d(0.0);

‎src/main/java/frc/robot/subsystems/drive/ModuleIOSpark.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.revrobotics.spark.SparkMax;
2929
import com.revrobotics.spark.config.ClosedLoopConfig.FeedbackSensor;
3030
import com.revrobotics.spark.config.SparkBaseConfig.IdleMode;
31-
import com.revrobotics.spark.config.SparkFlexConfig;
3231
import com.revrobotics.spark.config.SparkMaxConfig;
3332
import edu.wpi.first.math.MathUtil;
3433
import edu.wpi.first.math.filter.Debouncer;
@@ -97,7 +96,7 @@ public ModuleIOSpark(int module) {
9796
turnController = turnSpark.getClosedLoopController();
9897

9998
// Configure drive motor
100-
var driveConfig = new SparkFlexConfig();
99+
var driveConfig = new SparkMaxConfig();
101100
driveConfig
102101
.idleMode(IdleMode.kBrake)
103102
.smartCurrentLimit(driveMotorCurrentLimit)

‎vendordeps/PathplannerLib.json‎ renamed to ‎vendordeps/PathplannerLib-2025.2.7.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"fileName": "PathplannerLib.json",
2+
"fileName": "PathplannerLib-2025.2.7.json",
33
"name": "PathplannerLib",
4-
"version": "2025.2.6",
4+
"version": "2025.2.7",
55
"uuid": "1b42324f-17c6-4875-8e77-1c312bc8c786",
66
"frcYear": "2025",
77
"mavenUrls": [
@@ -12,15 +12,15 @@
1212
{
1313
"groupId": "com.pathplanner.lib",
1414
"artifactId": "PathplannerLib-java",
15-
"version": "2025.2.6"
15+
"version": "2025.2.7"
1616
}
1717
],
1818
"jniDependencies": [],
1919
"cppDependencies": [
2020
{
2121
"groupId": "com.pathplanner.lib",
2222
"artifactId": "PathplannerLib-cpp",
23-
"version": "2025.2.6",
23+
"version": "2025.2.7",
2424
"libName": "PathplannerLib",
2525
"headerClassifier": "headers",
2626
"sharedLibrary": false,

‎vendordeps/Phoenix6.json‎ renamed to ‎vendordeps/Phoenix6-frc2025-latest.json‎

Lines changed: 60 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"fileName": "Phoenix6-frc2025-latest.json",
33
"name": "CTRE-Phoenix (v6)",
4-
"version": "25.3.1",
4+
"version": "25.4.0",
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.3.1"
22+
"version": "25.4.0"
2323
}
2424
],
2525
"jniDependencies": [
2626
{
2727
"groupId": "com.ctre.phoenix6",
2828
"artifactId": "api-cpp",
29-
"version": "25.3.1",
29+
"version": "25.4.0",
3030
"isJar": false,
3131
"skipInvalidPlatforms": true,
3232
"validPlatforms": [
@@ -40,7 +40,7 @@
4040
{
4141
"groupId": "com.ctre.phoenix6",
4242
"artifactId": "tools",
43-
"version": "25.3.1",
43+
"version": "25.4.0",
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.3.1",
57+
"version": "25.4.0",
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.3.1",
71+
"version": "25.4.0",
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.3.1",
85+
"version": "25.4.0",
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.3.1",
99+
"version": "25.4.0",
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.3.1",
113+
"version": "25.4.0",
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.3.1",
127+
"version": "25.4.0",
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.3.1",
141+
"version": "25.4.0",
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.3.1",
155+
"version": "25.4.0",
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.3.1",
169+
"version": "25.4.0",
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.3.1",
183+
"version": "25.4.0",
184184
"isJar": false,
185185
"skipInvalidPlatforms": true,
186186
"validPlatforms": [
@@ -194,7 +194,7 @@
194194
{
195195
"groupId": "com.ctre.phoenix6.sim",
196196
"artifactId": "simProCANrange",
197-
"version": "25.3.1",
197+
"version": "25.4.0",
198198
"isJar": false,
199199
"skipInvalidPlatforms": true,
200200
"validPlatforms": [
@@ -208,7 +208,21 @@
208208
{
209209
"groupId": "com.ctre.phoenix6.sim",
210210
"artifactId": "simProCANdi",
211-
"version": "25.3.1",
211+
"version": "25.4.0",
212+
"isJar": false,
213+
"skipInvalidPlatforms": true,
214+
"validPlatforms": [
215+
"windowsx86-64",
216+
"linuxx86-64",
217+
"linuxarm64",
218+
"osxuniversal"
219+
],
220+
"simMode": "swsim"
221+
},
222+
{
223+
"groupId": "com.ctre.phoenix6.sim",
224+
"artifactId": "simProCANdle",
225+
"version": "25.4.0",
212226
"isJar": false,
213227
"skipInvalidPlatforms": true,
214228
"validPlatforms": [
@@ -224,7 +238,7 @@
224238
{
225239
"groupId": "com.ctre.phoenix6",
226240
"artifactId": "wpiapi-cpp",
227-
"version": "25.3.1",
241+
"version": "25.4.0",
228242
"libName": "CTRE_Phoenix6_WPI",
229243
"headerClassifier": "headers",
230244
"sharedLibrary": true,
@@ -240,7 +254,7 @@
240254
{
241255
"groupId": "com.ctre.phoenix6",
242256
"artifactId": "tools",
243-
"version": "25.3.1",
257+
"version": "25.4.0",
244258
"libName": "CTRE_PhoenixTools",
245259
"headerClassifier": "headers",
246260
"sharedLibrary": true,
@@ -256,7 +270,7 @@
256270
{
257271
"groupId": "com.ctre.phoenix6.sim",
258272
"artifactId": "wpiapi-cpp-sim",
259-
"version": "25.3.1",
273+
"version": "25.4.0",
260274
"libName": "CTRE_Phoenix6_WPISim",
261275
"headerClassifier": "headers",
262276
"sharedLibrary": true,
@@ -272,7 +286,7 @@
272286
{
273287
"groupId": "com.ctre.phoenix6.sim",
274288
"artifactId": "tools-sim",
275-
"version": "25.3.1",
289+
"version": "25.4.0",
276290
"libName": "CTRE_PhoenixTools_Sim",
277291
"headerClassifier": "headers",
278292
"sharedLibrary": true,
@@ -288,7 +302,7 @@
288302
{
289303
"groupId": "com.ctre.phoenix6.sim",
290304
"artifactId": "simTalonSRX",
291-
"version": "25.3.1",
305+
"version": "25.4.0",
292306
"libName": "CTRE_SimTalonSRX",
293307
"headerClassifier": "headers",
294308
"sharedLibrary": true,
@@ -304,7 +318,7 @@
304318
{
305319
"groupId": "com.ctre.phoenix6.sim",
306320
"artifactId": "simVictorSPX",
307-
"version": "25.3.1",
321+
"version": "25.4.0",
308322
"libName": "CTRE_SimVictorSPX",
309323
"headerClassifier": "headers",
310324
"sharedLibrary": true,
@@ -320,7 +334,7 @@
320334
{
321335
"groupId": "com.ctre.phoenix6.sim",
322336
"artifactId": "simPigeonIMU",
323-
"version": "25.3.1",
337+
"version": "25.4.0",
324338
"libName": "CTRE_SimPigeonIMU",
325339
"headerClassifier": "headers",
326340
"sharedLibrary": true,
@@ -336,7 +350,7 @@
336350
{
337351
"groupId": "com.ctre.phoenix6.sim",
338352
"artifactId": "simCANCoder",
339-
"version": "25.3.1",
353+
"version": "25.4.0",
340354
"libName": "CTRE_SimCANCoder",
341355
"headerClassifier": "headers",
342356
"sharedLibrary": true,
@@ -352,7 +366,7 @@
352366
{
353367
"groupId": "com.ctre.phoenix6.sim",
354368
"artifactId": "simProTalonFX",
355-
"version": "25.3.1",
369+
"version": "25.4.0",
356370
"libName": "CTRE_SimProTalonFX",
357371
"headerClassifier": "headers",
358372
"sharedLibrary": true,
@@ -368,7 +382,7 @@
368382
{
369383
"groupId": "com.ctre.phoenix6.sim",
370384
"artifactId": "simProTalonFXS",
371-
"version": "25.3.1",
385+
"version": "25.4.0",
372386
"libName": "CTRE_SimProTalonFXS",
373387
"headerClassifier": "headers",
374388
"sharedLibrary": true,
@@ -384,7 +398,7 @@
384398
{
385399
"groupId": "com.ctre.phoenix6.sim",
386400
"artifactId": "simProCANcoder",
387-
"version": "25.3.1",
401+
"version": "25.4.0",
388402
"libName": "CTRE_SimProCANcoder",
389403
"headerClassifier": "headers",
390404
"sharedLibrary": true,
@@ -400,7 +414,7 @@
400414
{
401415
"groupId": "com.ctre.phoenix6.sim",
402416
"artifactId": "simProPigeon2",
403-
"version": "25.3.1",
417+
"version": "25.4.0",
404418
"libName": "CTRE_SimProPigeon2",
405419
"headerClassifier": "headers",
406420
"sharedLibrary": true,
@@ -416,7 +430,7 @@
416430
{
417431
"groupId": "com.ctre.phoenix6.sim",
418432
"artifactId": "simProCANrange",
419-
"version": "25.3.1",
433+
"version": "25.4.0",
420434
"libName": "CTRE_SimProCANrange",
421435
"headerClassifier": "headers",
422436
"sharedLibrary": true,
@@ -432,7 +446,7 @@
432446
{
433447
"groupId": "com.ctre.phoenix6.sim",
434448
"artifactId": "simProCANdi",
435-
"version": "25.3.1",
449+
"version": "25.4.0",
436450
"libName": "CTRE_SimProCANdi",
437451
"headerClassifier": "headers",
438452
"sharedLibrary": true,
@@ -444,6 +458,22 @@
444458
"osxuniversal"
445459
],
446460
"simMode": "swsim"
461+
},
462+
{
463+
"groupId": "com.ctre.phoenix6.sim",
464+
"artifactId": "simProCANdle",
465+
"version": "25.4.0",
466+
"libName": "CTRE_SimProCANdle",
467+
"headerClassifier": "headers",
468+
"sharedLibrary": true,
469+
"skipInvalidPlatforms": true,
470+
"binaryPlatforms": [
471+
"windowsx86-64",
472+
"linuxx86-64",
473+
"linuxarm64",
474+
"osxuniversal"
475+
],
476+
"simMode": "swsim"
447477
}
448478
]
449479
}

0 commit comments

Comments
 (0)