From ba8df23159fe4f6dce896ffa77c9bd09259d9e3c Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 13 Mar 2014 17:11:00 -0700 Subject: [PATCH] Removed test message at top --- MyRobot.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/MyRobot.cpp b/MyRobot.cpp index d43f33c..ccfb0a6 100644 --- a/MyRobot.cpp +++ b/MyRobot.cpp @@ -1,4 +1,3 @@ -//Test comment!! //Add a button on joystick that activates "auto" to drive to 40 inches away and another to shoot when at 40 inches away (use the little joystick on both drive and shooter stick) //Sonar in auto: drive till 40in away (dashboard value) and shoot //Includes{{{ @@ -252,10 +251,6 @@ public: } } //}}} - //Test{{{ - void Test() { - } - //}}} //Autonomous{{{ void Autonomous() { //Initializations{{{ @@ -518,6 +513,7 @@ public: //}}} while(IsEnabled() && IsOperatorControl()) { //Joystick{{{ + //Shooter{{{ if(Lstick.GetRawButton(9)==1){ throttle = (-Lstick.GetRawAxis(4)+1)/2; }else if(Lstick.GetRawButton(10)){ @@ -527,6 +523,8 @@ public: }else if(Lstick.GetRawButton(8)){ throttle = SmartDashboard::GetNumber("ShooterButtonPower8"); } + //}}} + //Shooter upLimit{{{ if(Lstick.GetRawButton(3)){ upLimit=100.0f; } @@ -539,6 +537,7 @@ public: if(Lstick.GetRawButton(6)){ upLimit=130.0f; } + //}}} if(Lstick.GetRawButton(1)==1) { //Shoot{{{ shooting = true; @@ -627,5 +626,9 @@ public: compressor.Stop(); } //}}} + //Test{{{ + void Test() { + } + //}}} }; START_ROBOT_CLASS(RobotDemo);