Update field name to fit m_val pattern

wpilibsuite · Dec 31, 2023 · 3d97c0a · 3d97c0a
1 parent 59eff86
commit 3d97c0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java b/hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java
@@ -36,10 +36,10 @@ public enum CANDeviceType {
     kIOBreakout(11),
     kFirmwareUpdate(31);
 
-    public final int id;
+    public final int m_id;
 
     CANDeviceType(int id) {
-      this.id = id;
+      this.m_id = id;
     }
   }
 
@@ -72,10 +72,10 @@ public enum CANManufacturer {
     kAndyMark(15),
     kVividHosting(16);
 
-    public final int id;
+    public final int m_id;
 
     CANManufacturer(int id) {
-      this.id = id;
+      this.m_id = id;
     }
   }
 }
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java
@@ -22,8 +22,8 @@
  * calls.
  */
 public class CAN implements Closeable {
-  public static final int kTeamManufacturer = CANAPITypes.CANManufacturer.kTeamUse.id;
-  public static final int kTeamDeviceType = CANAPITypes.CANDeviceType.kMiscellaneous.id;
+  public static final int kTeamManufacturer = CANAPITypes.CANManufacturer.kTeamUse.m_id;
+  public static final int kTeamDeviceType = CANAPITypes.CANDeviceType.kMiscellaneous.m_id;
 
   private final int m_handle;