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

More Tweaking

Browse Source
This commit is contained in:
Jason Cox 2016-02-20 18:32:40 -05:00
parent 4d13792643
commit 62819bc05c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Robot.cpp
View File

@ -208,7 +208,7 @@ private:
* Every time the method is called. This cannot be a loop in the Shoot method because * 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. * that would lock the robot every time the trigger is hit.
*/ */
if(operator_stick.GetRawButton(TRIGGER)) /*if(operator_stick.GetRawButton(TRIGGER))
{ {
shooting = true; shooting = true;
shooter.Shoot(); shooter.Shoot();
@ -217,7 +217,7 @@ private:
{ {
shooting = false; shooting = false;
shooter.StopShooter(); shooter.StopShooter();
} }*/
if(!arming && driver_stick.GetRawButton(RAMP_RAISE)) if(!arming && driver_stick.GetRawButton(RAMP_RAISE))
{ {

2
src/Shooter.h
View File

@ -165,7 +165,7 @@ public:
*/ */
void Unjam() void Unjam()
{ {
pickup->Set(-1 * PICKUP_POWER); pickup->Set(PICKUP_POWER * -0.75);
} }
void ShootLow() void ShootLow()