impotent debug code!

This commit is contained in:
Aidan Ferguson 2016-02-10 15:23:07 -05:00
parent b4d5ead23a
commit 470a4b6f4b

View File

@ -35,7 +35,8 @@ public:
* *
*/ */
Shooter(CANTalon *s1, CANTalon *s2, CANTalon *r) { Shooter(CANTalon *s1, CANTalon *s2, CANTalon *r) {
shooterDrive = new RobotDrive(s1, s2); // shooterDrive = new RobotDrive(s1, s2);
launcher = s1;
pickup = s2; pickup = s2;
ramp = r; ramp = r;
rampState = Uncalibrated; rampState = Uncalibrated;
@ -54,13 +55,14 @@ public:
} }
virtual ~Shooter() { virtual ~Shooter() {
delete shooterDrive; delete launcher;
delete pickup; delete pickup;
delete ramp; delete ramp;
} }
void PickUp(bool state = true) { void PickUp(bool state = true) {
pickup->Set((float) (state * PICKUP_POWER)); pickup->Set((float) (state * PICKUP_POWER));
std::cout << "picking up!\n";
} }
void SetRamp(RampState state) { void SetRamp(RampState state) {
@ -88,11 +90,14 @@ public:
} }
void SetPower(float power) { void SetPower(float power) {
shooterDrive->TankDrive(power, -power, false); pickup->Set(power);
launcher->Set(power);
std::cout << "setting shooter power" << std::endl;
} }
private: private:
RobotDrive *shooterDrive; RobotDrive *shooterDrive;
CANTalon *launcher;
CANTalon *pickup; CANTalon *pickup;
CANTalon *ramp; CANTalon *ramp;