diff --git a/Robot2016/src/Robot.cpp b/Robot2016/src/Robot.cpp index 17f8986..a8b3198 100644 --- a/Robot2016/src/Robot.cpp +++ b/Robot2016/src/Robot.cpp @@ -208,7 +208,7 @@ private: * Every time the method is called. This cannot be a loop in the Shoot method because * that would lock the robot every time the trigger is hit. */ - if(operator_stick.GetRawButton(TRIGGER)) + /*if(operator_stick.GetRawButton(TRIGGER)) { shooting = true; shooter.Shoot(); @@ -217,7 +217,7 @@ private: { shooting = false; shooter.StopShooter(); - } + }*/ if(!arming && driver_stick.GetRawButton(RAMP_RAISE)) { diff --git a/Robot2016/src/Shooter.h b/Robot2016/src/Shooter.h index 2b729cc..82e4ace 100644 --- a/Robot2016/src/Shooter.h +++ b/Robot2016/src/Shooter.h @@ -165,7 +165,7 @@ public: */ void Unjam() { - pickup->Set(-1 * PICKUP_POWER); + pickup->Set(PICKUP_POWER * -0.75); } void ShootLow()