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

Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms

Browse Source
This commit is contained in:
Jason Cox 2016-02-13 17:17:56 -05:00
commit cc7eee8975
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Robot.cpp
View File

@ -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))