Merge branch 'main' into 2027

hal/src/generate/ResourceType.txt

@@ -124,3 +124,4 @@ kResourceType_Koors40 = 122
 kResourceType_ThriftyNova = 123
 kResourceType_PWFSEN36005 = 124
 kResourceType_LaserShark = 125
+kResourceType_RevServoHub = 126

hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java

@@ -271,6 +271,8 @@ public final class FRCNetComm {
     public static final int kResourceType_PWFSEN36005 = 124;
     /** kResourceType_LaserShark = 125. */
     public static final int kResourceType_LaserShark = 125;
+    /** kResourceType_RevServoHub = 126. */
+    public static final int kResourceType_RevServoHub = 126;
   }
 
   /**

hal/src/generated/main/native/include/hal/FRCUsageReporting.h

@@ -177,6 +177,7 @@ namespace HALUsageReporting {
     kResourceType_ThriftyNova = 123,
     kResourceType_PWFSEN36005 = 124,
     kResourceType_LaserShark = 125,
+    kResourceType_RevServoHub = 126,
   };
   enum tInstances : int32_t {
     kLanguage_LabVIEW = 1,

hal/src/generated/main/native/include/hal/UsageReporting.h

@@ -146,6 +146,7 @@ typedef enum
     kResourceType_ThriftyNova = 123,
     kResourceType_PWFSEN36005 = 124,
     kResourceType_LaserShark = 125,
+    kResourceType_RevServoHub = 126,
 
 //    kResourceType_MaximumID = 255,
 } tResourceType;

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);
 

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
 };