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

fixed some git conflicts

Browse Source
This commit is contained in:
dkbug 2016-02-20 17:01:51 -05:00
parent e92e036a5c
commit bff46f5476
1 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Shooter.h
View File

@ -64,51 +64,28 @@ public:
void LowerRamp() void LowerRamp()
{ {
<<<<<<< HEAD ramp->Set(-0.5);
launch_spinny->Set(-0.5); if(ramp->Limits::kReverseLimit){
if(launch_spinny->Limits::kReverseLimit){
SmartDashboard::PutNumber("ramp", 2); //going to put a circlar dial to show where the ramp could be SmartDashboard::PutNumber("ramp", 2); //going to put a circlar dial to show where the ramp could be
} else { } else {
SmartDashboard::PutNumber("ramp", 1); SmartDashboard::PutNumber("ramp", 1);
} }
=======
ramp->Set(-.5);
>>>>>>> arms
} }
void RaiseRamp() void RaiseRamp()
{ {
<<<<<<< HEAD ramp->Set(0.5);
launch_spinny->Set(0.5); if(ramp->Limits::kForwardLimit){
if(launch_spinny->Limits::kForwardLimit){
SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be SmartDashboard::PutNumber("ramp", 0); //going to put a circlar dial to show where the ramp could be
} else { } else {
SmartDashboard::PutNumber("ramp", 1); SmartDashboard::PutNumber("ramp", 1);
} }
=======
ramp->Set(0.5);
>>>>>>> arms
} }
void StopRamp() void StopRamp()
{ {
ramp->Set(0); ramp->Set(0);
} }
<<<<<<< HEAD
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);
}
}
=======
>>>>>>> arms
void Shoot() void Shoot()
{ {
// TODO: Shooter Logic should go as follows: // TODO: Shooter Logic should go as follows:
@ -123,15 +100,9 @@ public:
case READY: case READY:
{ {
state = SPINNINGUP; state = SPINNINGUP;
<<<<<<< HEAD
launch_spinny->Set(-1);
launcher->Set(LAUNCH_POWER);
pickup->Set(LAUNCH_POWER);
=======
ramp->Set(-1); ramp->Set(-1);
launcher->Set(PICKUP_POWER); launcher->Set(PICKUP_POWER);
pickup->Set(PICKUP_POWER); pickup->Set(PICKUP_POWER);
>>>>>>> arms
shotClock.Reset(); shotClock.Reset();
shotClock.Start(); shotClock.Start();
break; break;
@ -151,11 +122,7 @@ public:
} }
case LAUNCH: case LAUNCH:
{ {
<<<<<<< HEAD
launch_spinny->Set(LAUNCH_POWER);
=======
ramp->Set(1); ramp->Set(1);
>>>>>>> arms
state = LAUNCHING; state = LAUNCHING;
break; break;
} }
@ -170,7 +137,7 @@ public:
} }
case RESETTING: case RESETTING:
{ {
launch_spinny->Set(0); ramp->Set(0);
launcher->Set(0); launcher->Set(0);
pickup->Set(0); pickup->Set(0);
state = READY; state = READY;