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

More Tweaking

This commit is contained in:
Jason Cox 2016-02-20 18:32:40 -05:00
parent 1e9af3ce6d
commit d61fdffc3d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Robot2016/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
* 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))
{

2
Robot2016/src/Shooter.h
View File

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