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

Merge branch 'master' of 76.182.74.61:hitchhikers/MyRobot

Browse Source
This commit is contained in:
Austen Adler 2014-04-03 22:01:36 -04:00
commit 46865ab478
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MyRobot.cpp
View File

@ -263,6 +263,14 @@ public:
}
}
//}}}
//updateJoystick{{{
bool updateJoystick(*stick){
for(i=1,i<=12,i++){
state[i] = stick.GetRawButton(i);
}
return state;
}
//}}}
//Autonomous{{{
void Autonomous(){
//Initializations{{{
@ -518,6 +526,8 @@ public:
collectorSole2.Set(false);
compressing=false;
SmartDashboard::PutBoolean("CollectorState",false);
ShootStick = *updateJoystick(joystick &Lstick);
DriveStick = *updateJoystick(joystick &Rstick);
//}}}
while(IsEnabled()&&IsOperatorControl()){
//Joystick{{{
@ -595,7 +605,7 @@ public:
//}}}
}
//Collector Motor{{{
if(Lstick.GetRawButton(11)==1){
if(Lstick.GetRawButton(11)==1&&50<=potToDegrees(armPot.GetAverageVoltage())){
setMotorValue(6,1,1);
}else if(Lstick.GetRawButton(12)==1){
setMotorValue(6,1,255);