Merge branch 'main' into 2027

2026-07-04 03:11:43 +00:00 · 2024-12-19 20:40:37 -08:00
parent 03f0fc4dea f46c81cfe3
commit 529bab6ca1
46 changed files with 1512 additions and 431 deletions
--- a/hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java
+++ b/hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java
@@ -47,6 +47,8 @@ public final class CANAPITypes {
    kMiscellaneous(10),
    /** IO breakout. */
    kIOBreakout(11),
+    /** Servo Controller. */
+    kServoController(12),
    /** Firmware update. */
    kFirmwareUpdate(31);

--- a/hal/src/main/native/include/hal/CANAPITypes.h
+++ b/hal/src/main/native/include/hal/CANAPITypes.h
@@ -44,6 +44,8 @@ HAL_ENUM(HAL_CANDeviceType) {
  HAL_CAN_Dev_kMiscellaneous = 10,
  /// IO breakout.
  HAL_CAN_Dev_kIOBreakout = 11,
+  // Servo controller.
+  HAL_CAN_Dev_kServoController = 12,
  /// Firmware update.
  HAL_CAN_Dev_kFirmwareUpdate = 31
 };