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

Fixed a bunch of logic errors.

This commit is contained in:
Jason Cox 2016-02-12 21:17:45 -05:00
parent deef7fcf20
commit 99d2397f9b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Robot2016/src/Robot.cpp
View File

@ -61,6 +61,7 @@ private:
shooter2.Enable();
left_drive.SetInverted(true);
right_drive.SetInverted(true);
launch_spinny.SetInverted(true);
inverting = false;
pickupRunning = false;
shooter_power = 0;
@ -143,7 +144,7 @@ private:
shooter.PickUp();
pickupRunning = true;
}
else if(pickupRunning)
else if(!operator_stick.GetRawButton(THUMB) && pickupRunning)
{
shooter.PickUp(false);
pickupRunning = false;
@ -185,8 +186,8 @@ private:
// This code will become obsolete after the Shooter logic is complete.
float opThrottle = SaneThrottle(operator_stick.GetThrottle());
if( opThrottle > shooter_power + DEADZONE_RADIUS
|| opThrottle < shooter_power - DEADZONE_RADIUS)
if(!pickupRunning && ( opThrottle > shooter_power + DEADZONE_RADIUS
|| opThrottle < shooter_power - DEADZONE_RADIUS))
{
shooter.SetPower(opThrottle);
}

5
Robot2016/src/Shooter.h
View File

@ -27,7 +27,6 @@ public:
pickup = s2;
launch_spinny = r;
ready = true;
shotClock = Timer();
}
/**
@ -52,12 +51,12 @@ public:
void LowerRamp()
{
launch_spinny->Set(-0.1);
launch_spinny->Set(-0.25);
}
void RaiseRamp()
{
launch_spinny->Set(0.1);
launch_spinny->Set(0.25);
}
void BoostRamp()