ids

diff --git a/src/main/java/frc/robot/constants/IdConstants.java b/src/main/java/frc/robot/constants/IdConstants.java
index 7971bdd6ffd5a109b20acdf6370fb19f94841ba3..f293329ff17326c5c5276ffe5209577510d497bf 100644 (file)
--- a/src/main/java/frc/robot/constants/IdConstants.java
+++ b/src/main/java/frc/robot/constants/IdConstants.java
@@ -23,8 +23,7 @@ public class IdConstants {
     public static final int TURRET_MOTOR_ID = 20;
 
     // Shooter
-    public static final int SHOOTER_LEFT_ID = 6;
-    public static final int SHOOTER_RIGHT_ID = 4;
-    public static final int FEEDER_ID = 3;
-    public static final int SHOOTER_SENSOR_ID = 1;
+    public static final int SHOOTER_LEFT_ID = 22;
+    public static final int SHOOTER_RIGHT_ID = 23;
+    public static final int FEEDER_ID = 21;
 }

diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
index e69563edc97edb3eba4bdf55891d94b50cb08df4..4ff237904c095674b4b4932df6042195a6531a21 100644 (file)
--- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java
+++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
@@ -32,7 +32,7 @@ public class Shooter  {
     private TalonFX shooterMotorLeft = new TalonFX(IdConstants.SHOOTER_LEFT_ID, Constants.SUBSYSTEM_CANIVORE_CAN);
     private TalonFX shooterMotorRight = new TalonFX(IdConstants.SHOOTER_RIGHT_ID, Constants.SUBSYSTEM_CANIVORE_CAN);
 
-    private TalonFX feederMotor = new TalonFX(IdConstants.FEEDER_ID, Constants.SUBSYSTEM_CANIVORE_CAN);
+    private TalonFX feederMotor = new TalonFX(IdConstants.FEEDER_ID, Constants.RIO_CAN);
 
     //rotations/sec
 

diff --git a/src/main/java/frc/robot/subsystems/turret/Turret.java b/src/main/java/frc/robot/subsystems/turret/Turret.java
index 784afa07ed7370b52e8f3055d877eaf8097995a9..a30def92807f4bf117cd9bad0e86a7c4d5832109 100644 (file)
--- a/src/main/java/frc/robot/subsystems/turret/Turret.java
+++ b/src/main/java/frc/robot/subsystems/turret/Turret.java
@@ -54,7 +54,7 @@ public class Turret extends SubsystemBase {
     MechanismLigament2d ligament2d = mechanismRoot.append(new MechanismLigament2d("turret_motor", 25, 0));
 
     public Turret() {
-        motor = new TalonFX(IdConstants.TURRET_MOTOR_ID, Constants.CANIVORE_CAN); // switch of course
+        motor = new TalonFX(IdConstants.TURRET_MOTOR_ID, Constants.RIO_CAN); // switch of course
         
         if (RobotBase.isSimulation()) {
             encoderSim = motor.getSimState();