team2059/zaphod
2
0
Fork 0
mirror of https://github.com/team2059/Zaphod synced 2024-12-18 20:12:28 -05:00
Code Issues Releases Wiki Activity

Fixed indenting

Browse Source
This commit is contained in:
Adam Long 2014-10-10 17:17:28 -04:00
parent b8b3e06347
commit 610a675f5d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Zaphod.cpp
View File

@ -120,7 +120,7 @@ public:
SmartDashboard::PutBoolean("CollectorState",false); SmartDashboard::PutBoolean("CollectorState",false);
SmartDashboard::PutBoolean("Compressor Running",compressing); SmartDashboard::PutBoolean("Compressor Running",compressing);
SmartDashboard::PutBoolean("Ignore Pot",false); SmartDashboard::PutBoolean("Ignore Pot",false);
SmartDashboard::PutBoolean("Compressor Enabled",compressorEnabled); SmartDashboard::PutBoolean("Compressor Enabled",compressorEnabled);
} }
//}}} //}}}
//updateDashboard{{{ //updateDashboard{{{
@ -133,7 +133,7 @@ public:
SmartDashboard::PutNumber("Ball Right",voltToDistance(BallSonicRight.GetAverageVoltage())); SmartDashboard::PutNumber("Ball Right",voltToDistance(BallSonicRight.GetAverageVoltage()));
SmartDashboard::PutNumber("upLimit",upLimit); SmartDashboard::PutNumber("upLimit",upLimit);
SmartDashboard::PutBoolean("Compressor Running",compressing); SmartDashboard::PutBoolean("Compressor Running",compressing);
SmartDashboard::PutBoolean("Compressor Enabled",compressorEnabled); SmartDashboard::PutBoolean("Compressor Enabled",compressorEnabled);
if(upLimit > 167){ if(upLimit > 167){
upLimit=167; upLimit=167;
} }
@ -316,7 +316,7 @@ public:
}else{ }else{
//Important part the stops the whole shooting sequence and tells the user that the shooter is back at its original state //Important part the stops the whole shooting sequence and tells the user that the shooter is back at its original state
shooter_idle=true; shooter_idle=true;
compressorEnabled = true; compressorEnabled = true;
shooter_fired(0); shooter_fired(0);
} }
} }
@ -539,8 +539,7 @@ public:
//}}} //}}}
//Lower Shooter{{{ //Lower Shooter{{{
if(currentStep==3){ if(currentStep==3){
if(40.0f<=potToDegrees(armPot.GetAverageVoltage())){ if(40.0f<=potToDegrees(armPot.GetAverageVoltage())){ shootRobot(-0.1f);
shootRobot(-0.1f);
}else{ }else{
shootRobot(0.0f); shootRobot(0.0f);
} }
@ -633,7 +632,7 @@ public:
//}}} //}}}
//Shoot{{{ //Shoot{{{
if(Lstick.GetRawButton(1)==1){ if(Lstick.GetRawButton(1)==1){
compressorEnabled= false; compressorEnabled= false;
shooter_idle=false; //Cause the robot to start the shooting sequence shooter_idle=false; //Cause the robot to start the shooting sequence
} }
//}}} //}}}