Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms
This commit is contained in:
commit
86e6a1b33c
@ -121,10 +121,6 @@ private:
|
|||||||
//std::cout << "Ramp position: "<< launch_spinny.GetEncPosition() << std::endl;
|
//std::cout << "Ramp position: "<< launch_spinny.GetEncPosition() << std::endl;
|
||||||
drive.ArcadeDrive(&driver_stick, true);
|
drive.ArcadeDrive(&driver_stick, true);
|
||||||
|
|
||||||
if (operator_stick.GetRawButton(TRIGGER))
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
//bool rampDoing = false;
|
//bool rampDoing = false;
|
||||||
// This is shit code for testing. Replace it with real code.
|
// This is shit code for testing. Replace it with real code.
|
||||||
if(!ramping && operator_stick.GetRawButton(RAMP_RAISE))
|
if(!ramping && operator_stick.GetRawButton(RAMP_RAISE))
|
||||||
|
Reference in New Issue
Block a user