qf

Scorpions-Robotics · Mar 17, 2024 · d75d8e0 · d75d8e0
1 parent c866a31
commit d75d8e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -72,8 +72,8 @@ public class RobotContainer {
         public final IntakeSubsystem m_intake = new IntakeSubsystem();
         public final ShooterSubsystem m_shooter = new ShooterSubsystem();
         public final SwerveSubsystem swerveSubsystem = new SwerveSubsystem();
-        public final XboxController driverJoytick = new XboxController(0);
-        public final XboxController subJoytick = new XboxController(1);
+        public final XboxController driverJoytick = new XboxController(1);
+        public final XboxController subJoytick = new XboxController(3);
         public final FeederSubsystem m_feeder = new FeederSubsystem();
         public final ArmSubsystem m_arm = new ArmSubsystem();
         public final JoystickSubsystem m_joystick = new JoystickSubsystem();

diff --git a/src/main/java/frc/robot/subsystems/NetworkSubsystem.java b/src/main/java/frc/robot/subsystems/NetworkSubsystem.java
@@ -14,7 +14,7 @@ public class NetworkSubsystem extends SubsystemBase {
   double apriltag_x_value;
   double apriltag_y_value;
   double apriltag_target_value;
-  ShooterSubsystem m_shooter;
+  //ShooterSubsystem m_shooter;
 
   public NetworkTableInstance inst = NetworkTableInstance.getDefault();
   //table
@@ -61,7 +61,7 @@ public void periodic() {
     SmartDashboard.putNumber("apriltag y value", apriltag_y_value);
     SmartDashboard.putBoolean("connection",inst.isConnected());
 
-    apriltag_reverse.setBoolean(m_shooter.whichSide());
+    //apriltag_reverse.setBoolean(m_shooter.whichSide());
   }