From 5cc26334ace3956a57c09f2d48a6361a25dcc82e Mon Sep 17 00:00:00 2001 From: Jason Cox Date: Tue, 23 Feb 2016 17:39:21 -0500 Subject: [PATCH] something halled --- Robot2016/src/Robot.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); }