2
0
mirror of https://github.com/team2059/Zaphod synced 2024-12-18 20:12:28 -05:00

Committing possibly broken code. (Untested)

This commit is contained in:
Austen Adler 2014-10-11 08:31:22 -07:00
parent 97fa3bef12
commit 84b4fca7f1

View File

@ -109,7 +109,7 @@ public:
SmartDashboard::PutNumber("Autonomous sequence",2.0f); SmartDashboard::PutNumber("Autonomous sequence",2.0f);
//Shooter presets //Shooter presets
SmartDashboard::PutNumber("ShortRange",0.465f); //Power for the shooter when against the low goal SmartDashboard::PutNumber("ShortRange",0.465f); //Power for the shooter when against the low goal
SmartDashboard::PutNumber("ShooterButtonPower10",0.605f); SmartDashboard::PutNumber("ShooterButtonPower10",0.855f);
SmartDashboard::PutNumber("ShooterButtonPower7",1.0f); SmartDashboard::PutNumber("ShooterButtonPower7",1.0f);
SmartDashboard::PutNumber("ShooterButtonPower8",0.5f); SmartDashboard::PutNumber("ShooterButtonPower8",0.5f);
//Bool switches //Bool switches
@ -549,7 +549,8 @@ public:
//}}} //}}}
//Lower Shooter{{{ //Lower Shooter{{{
if(currentStep==3){ if(currentStep==3){
if(40.0f<=potToDegrees(armPot.GetAverageVoltage())){ shootRobot(-0.1f); if(40.0f<=potToDegrees(armPot.GetAverageVoltage())){
shootRobot(-0.1f);
}else{ }else{
shootRobot(0.0f); shootRobot(0.0f);
} }