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

something halled

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

3
src/Robot.cpp
View File

@ -238,8 +238,7 @@ private:
// This code will become obsolete after the Shooter logic is complete. // This code will become obsolete after the Shooter logic is complete.
float opThrottle = SaneThrottle(operator_stick.GetThrottle()); float opThrottle = SaneThrottle(operator_stick.GetThrottle());
if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS if(!pickupRunning && !unjamming)
|| opThrottle < shooter_power - DEADZONE_RADIUS))
{ {
shooter.SetPower(opThrottle); shooter.SetPower(opThrottle);
} }