Skip to content

Commit 606d71a

Browse files
committed
Pull in AK26 updates
modified: AdvantageScope Swerve Calibration.json modified: src/main/java/frc/robot/Robot.java
1 parent 3de4208 commit 606d71a

2 files changed

Lines changed: 33 additions & 28 deletions

File tree

AdvantageScope Swerve Calibration.json

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"title": "",
2525
"controller": null,
2626
"controllerUUID": "grimvlgu9aluj8btvwotco2wpj0pto2h",
27-
"renderer": "#/",
27+
"renderer": "",
2828
"controlsHeight": 0
2929
},
3030
{
@@ -122,8 +122,7 @@
122122
}
123123
}
124124
],
125-
"game": "2025 Field",
126-
"origin": "blue"
125+
"game": ""
127126
},
128127
"controllerUUID": "psf0y633oclnjyocus23hcnq1d4tpyte",
129128
"renderer": {
@@ -193,12 +192,12 @@
193192
"leftLockedRange": null,
194193
"rightLockedRange": null,
195194
"leftUnitConversion": {
196-
"type": null,
197-
"factor": 1
195+
"autoTarget": null,
196+
"preset": null
198197
},
199198
"rightUnitConversion": {
200-
"type": null,
201-
"factor": 1
199+
"autoTarget": null,
200+
"preset": null
202201
},
203202
"leftFilter": 0,
204203
"rightFilter": 0
@@ -258,12 +257,12 @@
258257
"leftLockedRange": null,
259258
"rightLockedRange": null,
260259
"leftUnitConversion": {
261-
"type": null,
262-
"factor": 1
260+
"autoTarget": null,
261+
"preset": null
263262
},
264263
"rightUnitConversion": {
265-
"type": null,
266-
"factor": 1
264+
"autoTarget": null,
265+
"preset": null
267266
},
268267
"leftFilter": 0,
269268
"rightFilter": 0
@@ -303,12 +302,12 @@
303302
"leftLockedRange": null,
304303
"rightLockedRange": null,
305304
"leftUnitConversion": {
306-
"type": null,
307-
"factor": 1
305+
"autoTarget": null,
306+
"preset": null
308307
},
309308
"rightUnitConversion": {
310-
"type": null,
311-
"factor": 1
309+
"autoTarget": null,
310+
"preset": null
312311
},
313312
"leftFilter": 0,
314313
"rightFilter": 0
@@ -348,12 +347,12 @@
348347
"leftLockedRange": null,
349348
"rightLockedRange": null,
350349
"leftUnitConversion": {
351-
"type": null,
352-
"factor": 1
350+
"autoTarget": null,
351+
"preset": null
353352
},
354353
"rightUnitConversion": {
355-
"type": null,
356-
"factor": 1
354+
"autoTarget": null,
355+
"preset": null
357356
},
358357
"leftFilter": 0,
359358
"rightFilter": 0
@@ -393,12 +392,12 @@
393392
"leftLockedRange": null,
394393
"rightLockedRange": null,
395394
"leftUnitConversion": {
396-
"type": null,
397-
"factor": 1
395+
"autoTarget": null,
396+
"preset": null
398397
},
399398
"rightUnitConversion": {
400-
"type": null,
401-
"factor": 1
399+
"autoTarget": null,
400+
"preset": null
402401
},
403402
"leftFilter": 0,
404403
"rightFilter": 0
@@ -439,12 +438,12 @@
439438
"leftLockedRange": null,
440439
"rightLockedRange": null,
441440
"leftUnitConversion": {
442-
"type": null,
443-
"factor": 1
441+
"autoTarget": null,
442+
"preset": null
444443
},
445444
"rightUnitConversion": {
446-
"type": null,
447-
"factor": 1
445+
"autoTarget": null,
446+
"preset": null
448447
},
449448
"leftFilter": 0,
450449
"rightFilter": 0
@@ -459,5 +458,5 @@
459458
}
460459
],
461460
"satellites": [],
462-
"version": "4.0.0-beta-3"
461+
"version": "26.0.0"
463462
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package frc.robot;
99

10+
import com.revrobotics.util.StatusLogger;
1011
import edu.wpi.first.wpilibj.Threads;
1112
import edu.wpi.first.wpilibj.Timer;
1213
import edu.wpi.first.wpilibj2.command.Command;
@@ -18,6 +19,7 @@
1819
import org.littletonrobotics.junction.networktables.NT4Publisher;
1920
import org.littletonrobotics.junction.wpilog.WPILOGReader;
2021
import org.littletonrobotics.junction.wpilog.WPILOGWriter;
22+
import org.littletonrobotics.urcl.URCL;
2123

2224
/**
2325
* The VM is configured to automatically run this class, and to call the functions corresponding to
@@ -78,6 +80,10 @@ public Robot() {
7880
break;
7981
}
8082

83+
// Initialize URCL
84+
Logger.registerURCL(URCL.startExternal());
85+
StatusLogger.disableAutoLogging(); // Disable REVLib's built-in logging
86+
8187
// Add pointer to LoggedPowerDitrubution here!!!
8288
// LoggedPowerDistribution.getInstance(50, ModuleType.kRev); // Example: PDH on CAN ID 50
8389

0 commit comments

Comments
 (0)