diff --git a/Robot2016/src/Robot.cpp b/Robot2016/src/Robot.cpp index 4ac3bb7..1ec2bad 100644 --- a/Robot2016/src/Robot.cpp +++ b/Robot2016/src/Robot.cpp @@ -238,8 +238,7 @@ private: // This code will become obsolete after the Shooter logic is complete. float opThrottle = SaneThrottle(operator_stick.GetThrottle()); - if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS - || opThrottle < shooter_power - DEADZONE_RADIUS)) + if(!pickupRunning && !unjamming) { shooter.SetPower(opThrottle); }