added turret disable dashboard button

Valor6800 · Sep 14, 2022 · c66bb86 · c66bb86
1 parent 85bebfd
commit c66bb86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Competition/src/main/cpp/subsystems/Shooter.cpp b/Competition/src/main/cpp/subsystems/Shooter.cpp
@@ -44,6 +44,8 @@ void Shooter::init()
     table->PutNumber("Hood Y Int 1X", ShooterConstants::cHood_1x);
     table->PutNumber("Power Y Int 1X", ShooterConstants::cPower_1x);
 
+    table->PutBoolean("Disable Turret", false);
+
     // table->PutNumber("Hood Y Int 2X", ShooterConstants::cHood_2x);
     // table->PutNumber("Power Y Int 2X", ShooterConstants::cPower_2x);
 
@@ -120,6 +122,8 @@ void Shooter::init()
 
     state.pipeline = 0;
     state.LoBFZoom = 1;
+
+    state.disableTurret = false;
 
     resetState();
     resetEncoder();
@@ -275,6 +279,8 @@ void Shooter::analyzeDashboard()
     }
     state.lastTurretState = state.turretState;
 
+    state.disableTurret = table->GetBoolean("Disable Turret", false);
+
     table->PutNumber("Hood degrees", hoodEncoder.GetPosition());
     table->PutNumber("Turret pos", turretEncoder.GetPosition());
 
@@ -320,7 +326,11 @@ void Shooter::assignOutputs()
 
     //MANUAL
     state.turretTarget = 0;
-    if (state.turretState == TurretState::TURRET_MANUAL) {
+    if (state.disableTurret) {
+        state.turretOutput = 0;
+        turret.Set(state.turretOutput);
+    }
+    else if (state.turretState == TurretState::TURRET_MANUAL) {
         state.turretOutput = operatorController->leftStickX(3) * ShooterConstants::TURRET_SPEED_MULTIPLIER;
         if( (turretEncoder.GetPosition() > 160 && state.turretOutput > ShooterConstants::pDeadband) ||
          (turretEncoder.GetPosition() < 20 && state.turretOutput < -1 * ShooterConstants::pDeadband) ){

diff --git a/Competition/src/main/include/subsystems/Shooter.h b/Competition/src/main/include/subsystems/Shooter.h
@@ -123,6 +123,8 @@ class Shooter : public ValorSubsystem
           double tv;
           double tx;
 
+          bool disableTurret;
+
     } state;
 
      void limelightTrack(bool track);