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

untested one-touch shooting

Browse Source
This commit is contained in:
Aidan Ferguson 2016-02-20 13:58:35 -05:00
parent 139ae70b1b
commit 3584fc4634
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Robot.cpp
View File

@ -202,7 +202,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) || (shooter.GetState() != 0))
{ {
shooting = true; shooting = true;
shooter.Shoot(); shooter.Shoot();

5
src/Shooter.h
View File

@ -175,6 +175,11 @@ public:
launcher->Set(power); launcher->Set(power);
//std::cout << "setting shooter power" << std::endl; //std::cout << "setting shooter power" << std::endl;
} }
int GetState()
{
return state;
}
private: private:
//RobotDrive *shooterDrive; //RobotDrive *shooterDrive;