2
0
mirror of https://github.com/team2059/Zaphod synced 2025-01-07 22:14:14 -05:00

Made changes

This commit is contained in:
Austen Adler 2014-08-22 15:57:39 -04:00
parent 0edf7dc593
commit 508e55c10d
4 changed files with 7 additions and 13 deletions

View File

@ -1,5 +1,4 @@
#include "HHBase.h" #include "HHBase.h"
HHBase::HHBase(): HHBase::HHBase():
hHBot(new HHRobot()){ hHBot(new HHRobot()){
printf("Done\n"); printf("Done\n");

View File

@ -36,6 +36,7 @@ void HHRobot::DriveRobot(float x, float y){
void HHRobot::UpdateDashboard(){ void HHRobot::UpdateDashboard(){
dashboard->PutFloatValue("Shooting Power", ControlSystem->throttle); dashboard->PutFloatValue("Shooting Power", ControlSystem->throttle);
} }
//Main function used to handle periodic tasks on the robot //Main function used to handle periodic tasks on the robot
void HHRobot::Handler(){ void HHRobot::Handler(){
//Periodic tasks that should be run by every loop //Periodic tasks that should be run by every loop

View File

@ -9,26 +9,22 @@ void HHCompressor::CompressorSystemPeriodic(){
case EXTENDED: case EXTENDED:
solenoid1->Set(false); solenoid1->Set(false);
solenoid2->Set(true); solenoid2->Set(true);
e_CollectorSolenoidState = IDLE;
break; break;
case RETRACTED: case RETRACTED:
solenoid1->Set(true); solenoid1->Set(true);
solenoid2->Set(false); solenoid2->Set(false);
e_CollectorSolenoidState = IDLE;
break; break;
case IDLE: case IDLE:
e_CollectorSolenoidState = IDLE;
break; break;
default: default:
break; break;
} }
//e_CollectorSolenoidState=IDLE; e_CollectorSolenoidState=IDLE;
} if(compressor->GetPressureSwitchValue()==1){
void HHCompressor::StartCompressing(){
compressor->Start(); compressor->Start();
} }else{
void HHCompressor::StopCompressing(){
compressor->Stop(); compressor->Stop();
}
} }
void HHCompressor::ExtendCollector(){ void HHCompressor::ExtendCollector(){
e_CollectorSolenoidState=EXTENDED; e_CollectorSolenoidState=EXTENDED;

View File

@ -14,6 +14,4 @@ class HHCompressor{
void CompressorSystemPeriodic(); void CompressorSystemPeriodic();
void ExtendCollector(); void ExtendCollector();
void RetractCollector(); void RetractCollector();
void StartCompressing();
void StopCompressing();
}; };