Merge branch 'release'

Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016
something halled
2016-03-15 21:37:56 -04:00 · 2016-02-27 13:06:46 -05:00 · 2016-02-23 17:39:21 -05:00 · 2016-02-20 18:34:55 -05:00
1 changed files with 1 additions and 1 deletions
--- a/src/Robot.cpp
+++ b/src/Robot.cpp
@ -441,7 +441,7 @@ public:
 		float opThrottle = SaneThrottle(operator_stick.GetThrottle());
 		
 		if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS
-				||	opThrottle < shooter_power - DEADZONE_RADIUS))
+                               ||      opThrottle < shooter_power - DEADZONE_RADIUS))
 		{
 			shooter.SetPower(opThrottle);
 		}
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