From df194f7bd3f082d5d985bf105acb53947aee0cf2 Mon Sep 17 00:00:00 2001
From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:29:04 -0800
Subject: [PATCH] ids

---
 src/main/java/frc/robot/constants/IdConstants.java      | 7 +++----
 src/main/java/frc/robot/subsystems/shooter/Shooter.java | 2 +-
 src/main/java/frc/robot/subsystems/turret/Turret.java   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/frc/robot/constants/IdConstants.java b/src/main/java/frc/robot/constants/IdConstants.java
index 7971bdd..f293329 100644
--- 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 e69563e..4ff2379 100644
--- 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 784afa0..a30def9 100644
--- 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();
-- 
2.39.5