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

Initial Arm stuff

Browse Source
This commit is contained in:
Jason Cox 2016-02-13 16:44:57 -05:00
parent e6934c9117
commit bf184ca305
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Robot2016/src/Robot.cpp
View File

@ -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());