adam
/
FRC2016-old
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

something halled

This commit is contained in:
Jason Cox 2016-02-23 17:39:21 -05:00
parent 53e12c5051
commit 5cc26334ac
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Robot2016/src/Robot.cpp
View File

@ -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);
}