From 5184252863f4f3e44f27093592533c762b2660fa Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Mon, 31 Mar 2014 22:41:42 -0400 Subject: [PATCH] Fixed shooting --- MyRobot.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MyRobot.cpp b/MyRobot.cpp index 74a1ba6..815cf66 100644 --- a/MyRobot.cpp +++ b/MyRobot.cpp @@ -539,11 +539,12 @@ public: if(Lstick.GetRawButton(1)==1){ //Shoot{{{ shooting=true; - shootRobot(throttle); setMotorValue(6,1,1); if(collectorExtended==false){ shooting=false; } + //shootRobot(throttle); + //TODO: test this code, we don't know if it works, but if it does not, run this code: ^ if(collectorExtended==true&&(SmartDashboard::GetBoolean("Ignore Pot")||upLimit>=potToDegrees(armPot.GetAverageVoltage()))){ shooting=true; shootRobot(throttle);