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

Compare commits

merge into: adam:cleanup-untested
Branches Tags
adam:master
adam:cleanup-untested
adam:cleanup
adam:release
...
pull from: adam:master
Branches Tags
adam:master
adam:cleanup-untested
adam:cleanup
adam:release
This repository has been archived on 2020-09-21. You can view files and clone it, but cannot push or open issues or pull requests.

4 Commits
cleanup-un ... master

Author SHA1 Message Date
Adam Goldsmith
165507277e Merge branch 'release' 2016-03-15 21:37:56 -04:00
Jason Cox
b88e1c48db Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016 2016-02-27 13:06:46 -05:00
Jason Cox
5e7a390bd4 something halled 2016-02-23 17:39:21 -05:00
Jason Cox
99175b1bfb slowed down the arms 2016-02-20 18:34:55 -05:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
src/Robot.cpp
View File

@ -441,7 +441,7 @@ public:
float opThrottle = SaneThrottle(operator_stick.GetThrottle()); float opThrottle = SaneThrottle(operator_stick.GetThrottle());
if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS
|| opThrottle < shooter_power - DEADZONE_RADIUS)) || opThrottle < shooter_power - DEADZONE_RADIUS))
{ {
shooter.SetPower(opThrottle); shooter.SetPower(opThrottle);
} }