From 0fdb206098a375c27fc48cbae83a93ab49443b09 Mon Sep 17 00:00:00 2001 From: Aidan Ferguson Date: Thu, 11 Feb 2016 16:35:41 -0500 Subject: [PATCH 1/2] Swapped Talon objects for TalonSRX objects. --- Robot2016/src/Robot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Robot2016/src/Robot.cpp b/Robot2016/src/Robot.cpp index 2cc4f0a..3813ab6 100644 --- a/Robot2016/src/Robot.cpp +++ b/Robot2016/src/Robot.cpp @@ -13,7 +13,7 @@ class Robot: public IterativeRobot { - Talon left_drive, right_drive; + TalonSRX left_drive, right_drive; CANTalon shooter1, shooter2, ramp; RobotDrive drive; From 4755bf7c46adfecc72a074e43f54ef0870866cff Mon Sep 17 00:00:00 2001 From: john sandstedt Date: Sat, 20 Feb 2016 14:27:43 -0500 Subject: [PATCH 2/2] added ramp status to the smartdashboard --- Robot2016/src/Shooter.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Robot2016/src/Shooter.h b/Robot2016/src/Shooter.h index c8980f5..5abaf94 100644 --- a/Robot2016/src/Shooter.h +++ b/Robot2016/src/Shooter.h @@ -65,11 +65,23 @@ public: void LowerRamp() { launch_spinny->Set(-1); + if(launch_spinny->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() { launch_spinny->Set(1); + if(launch_spinny->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() @@ -80,6 +92,11 @@ public: void BoostRamp() { launch_spinny->Set(1); + if(launch_spinny->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() @@ -180,6 +197,7 @@ private: Timer shotClock; bool ready; + int fake_position; }; #endif /* SRC_SHOOTER_H_ */