Merge branch 'remove-fieldconstants' into turret

diff --cc src/main/java/frc/robot/RobotContainer.java
Simple merge

diff --cc src/main/java/frc/robot/constants/Constants.java
index 0a519e01327227625e41732fb9da68dbdc4ba904,649cbc548b8c41e02a8f8636b61165ac50052054..f07a80043ea9c94d0f18d336c4882c1175698705
--- 1/src/main/java/frc/robot/constants/Constants.java
--- 2/src/main/java/frc/robot/constants/Constants.java
+++ b/src/main/java/frc/robot/constants/Constants.java
@@@ -11,9 -13,8 +13,9 @@@ public class Constants 
      public static final double LOOP_TIME = 0.02;
  
      // CAN bus names
-     public static final String CANIVORE_CAN = "CANivore";
-     public static final String SUBSYSTEM_CANIVORE_CAN = "CANivoreSub";
-     public static final String RIO_CAN = "rio";
+     public static final CANBus CANIVORE_CAN = new CANBus("CANivore");
+     public static final CANBus RIO_CAN = new CANBus("rio");
++    public static final CANBus SUBSYSTEM_CANIVORE_CAN = new CANBus("CANivoreSub");
  
      // Logging 
      public static final boolean USE_TELEMETRY = true;