From 19ed530a85478b10128986c15a55771d870f3779 Mon Sep 17 00:00:00 2001
From: Jason Cox <jason@dublinschool.org>
Date: Sat, 13 Feb 2016 16:44:57 -0500
Subject: [PATCH] Initial Arm stuff

---
 src/Robot.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Robot.cpp b/src/Robot.cpp
index 86b0612..399834c 100644
--- a/src/Robot.cpp
+++ b/src/Robot.cpp
@@ -20,7 +20,8 @@ class Robot: public IterativeRobot
 {
 	Talon left_drive, right_drive;
 	CANTalon shooter1, shooter2,
-			launch_spinny;
+			launch_spinny,
+			arms;
 	RobotDrive drive;
 	Shooter shooter;
 	Joystick driver_stick, operator_stick;
@@ -31,6 +32,7 @@ public:
 		shooter1(11),  			// shooter drive 1
 		shooter2(10),   		// shooter drive 2
 		launch_spinny(12),
+		arms(13),
 		drive(&left_drive, &right_drive),
 		shooter(				// initialize Shooter object.
 				&shooter1, &shooter2, &launch_spinny),
@@ -47,6 +49,7 @@ private:
 	bool ramping;
 	bool shooting;
 	bool unjamming;
+	bool arming;
 	float shooter_power;
 
 	LiveWindow *lw = LiveWindow::GetInstance();
@@ -71,6 +74,7 @@ private:
 		ramping = false;
 		shooting = false;
 		unjamming = false;
+		arming = false;
 		shooter_power = 0;
 
 	}
@@ -218,6 +222,8 @@ private:
 			shooter.StopShooter();
 		}
 		
+
+
         // This code will become obsolete after the Shooter logic is complete.
 		float opThrottle = SaneThrottle(operator_stick.GetThrottle());