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

This commit is contained in:
Jason 2016-02-09 16:24:33 -05:00
commit 79c8e891d6
1 changed files with 5 additions and 2 deletions

View File

@ -11,8 +11,8 @@
#ifndef BUTTON_LAYOUT
#define BUTTON_LAYOUT
#define TRIGGER 10 // I have no idea what the right button number is...
#define THUMB 11
#define TRIGGER 0
#define THUMB 1
#endif // BUTTON_LAYOUT
@ -77,15 +77,18 @@ public:
if(rstick.GetRawButton(TRIGGER))
{
// SHOOT THE BALL
ramp.Set(-0.5);
}
if(rstick.GetRawButton(THUMB))
{
// lower the ramp
ramp.Set(0.5);
}
else
{
// raise the ramp to HALF (so it isn't down all the time!)
ramp.Set(0);
}
// How to pickup?