diff --git a/Robot2016/src/Shooter.h b/Robot2016/src/Shooter.h index 5c04da7..562bf75 100644 --- a/Robot2016/src/Shooter.h +++ b/Robot2016/src/Shooter.h @@ -64,14 +64,22 @@ public: void LowerRamp() { - if(ramp->GetReverseLimitOK()) - ramp->Set(-1); + ramp->Set(-1); + if(ramp->Limits::kReverseLimit){ + SmartDashboard::PutNumber("ramp", 2); //going to put a circlar dial to show where the ramp could be + } else { + SmartDashboard::PutNumber("ramp", 1); + } } void RaiseRamp() { - if(ramp->GetForwardLimitOK()) - ramp->Set(1); + ramp->Set(1); + if(ramp->Limits::kForwardLimit){ + SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be + } else { + SmartDashboard::PutNumber("ramp", 1); + } } void StopRamp() @@ -82,6 +90,11 @@ public: void BoostRamp() { ramp->Set(1); + if(ramp->Limits::kForwardLimit){ + SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be + } else { + SmartDashboard::PutNumber("ramp", 1); + } } void Shoot() @@ -151,13 +164,6 @@ public: { pickup->Set((float) (state * PICKUP_POWER)); launcher->Set((float) (state * PICKUP_POWER * -1)); - if (state) - { - ramp->Set(-1.0); - } else - { - ramp->Set(1); - } //std::cout << "picking up!\n"; } @@ -190,6 +196,7 @@ private: Timer shotClock; bool ready; + int fake_position; }; #endif /* SRC_SHOOTER_H_ */