Code now compiles. Completed refactorign of HHBase and Compressor. Continuing with refactoring. (Untested)

src/HHBase.cpp

@@ -1,7 +1,7 @@
 #include "HHBase.h"
 
-ZaphodBase::HHBase():
+HHBase::HHBase():
-  hHBot(new HHRobot()){
+  hHBot(new ZaphodRobot()){
     printf("Done\n");
   }
 void HHBase::RobotInit(){

src/HHBase.h

@@ -1,22 +1,21 @@
 #ifndef __HH_BASE_H__
 #define __HH_BASE_H__
 #include <WPILib.h>
-#include "HHRobot.h"
+#include "ZaphodRobot.h"
 #include "Subsystems/Controller.h"
 #include "Subsystems/Shooter.h"
 #include "Subsystems/Collector.h"
 #include "Subsystems/Compressor.h"
 #include "Subsystems/Dashboard.h"
 //Because this is the first header to be included, classes need to be declared here
-class HHRobot;
+class ZaphodRobot;
 class HHShooter;
 class HHCollector;
 class HHCompressor;
 class JoystickController;
-class ZaphodBase : public IterativeRobot
+class HHBase : public IterativeRobot{
-{
   private:
-    HHRobot* hHBot;
+    ZaphodRobot* hHBot;
   public:
     HHBase();
     void RobotInit();

src/Subsystems/Compressor.h

@@ -15,8 +15,8 @@ class HHCompressor
     }e_CollectorSolenoidState;
     HHCompressor();
     void compressorSystemPeriodic();
-    void extendCollector();
+    void ExtendCollector();
-    void retractCollector();
+    void RetractCollector();
-    void startCompressing();
+    void StartCompressing();
-    void stopCompressing();
+    void StopCompressing();
 };

src/ZaphodRobot.cpp

@@ -1,13 +1,11 @@
 #include "ZaphodRobot.h"
-#include "ZaphodBase.h"
+#include "HHBase.h"
-
 ZaphodRobot::ZaphodRobot():
   ControlSystem(new JoystickController()),
   shooter(new ZaphodShooter()),
   collector(new ZaphodCollector()),
-    compressorSystem(new ZaphodCompressor()),
+  compressorSystem(new HHCompressor()),
-    dashboard(new ZaphodDashboard())
+  dashboard(new ZaphodDashboard()){
-{
     left1=new Jaguar(DRIVE_LEFT_SIDECAR, DRIVE_LEFT_MOTOR_ONE);
     left2=new Jaguar(DRIVE_LEFT_SIDECAR, DRIVE_LEFT_MOTOR_TWO);
     left3=new Jaguar(DRIVE_LEFT_SIDECAR, DRIVE_LEFT_MOTOR_THREE);
@@ -23,11 +21,8 @@ ZaphodRobot::ZaphodRobot():
     rearSonarLeftA=new AnalogChannel(SONAR_REAR_LEFT_ANA);
     rearSonarRightA=new AnalogChannel(SONAR_REAR_RIGHT_ANA);
   }
-
 //Functions to get sonar values and return as INCH values
-
+float ZaphodRobot::getFrontSonar(){
-float ZaphodRobot::getFrontSonar()
-{
   frontSonarLeftD->Set(1);
   frontSonarLeftV=(frontSonarLeftA->GetAverageVoltage()/0.00488f)/2.54f;
   frontSonarLeftD->Set(0);
@@ -38,9 +33,7 @@ float ZaphodRobot::getFrontSonar()
   //Returns the average (useful for throwing out useless readings)
   return (frontSonarRightV+frontSonarLeftV)/2;
 }
-
+float ZaphodRobot::getRearSonar(){
-float ZaphodRobot::getRearSonar()
-{
   rearSonarLeftD->Set(1);
   rearSonarLeftV=(rearSonarLeftA->GetAverageVoltage()/0.00488f)/2.54f;
   rearSonarLeftD->Set(0);
@@ -51,9 +44,7 @@ float ZaphodRobot::getRearSonar()
   //Returns the average (useful for throwing out useless readings)
   return (rearSonarRightV+rearSonarLeftV)/2;
 }
-
+bool ZaphodRobot::checkJoystickValues(){
-bool ZaphodRobot::checkJoystickValues()
-{
   float x=ControlSystem->rightJoystickAxisValues[1];
   float y=ControlSystem->rightJoystickAxisValues[2];
   if((-.1 < x && x < .1) && (-.1 < y && y < .1)) {
@@ -65,9 +56,7 @@ bool ZaphodRobot::checkJoystickValues()
     return false;
   }
 }
-
+void ZaphodRobot::driveRobot(float x, float y){
-void ZaphodRobot::driveRobot(float x, float y)
-{
   if(y>1.0f) {
     y=1.0f;
   } else if(y!=0.0f&&y<-1.0f) {
@@ -82,16 +71,11 @@ void ZaphodRobot::driveRobot(float x, float y)
   left2->SetRaw(int(leftPower));
   left3->SetRaw(int(leftPower));
 }
-
+void ZaphodRobot::updateDashboard(){
-void ZaphodRobot::updateDashboard()
-{
   dashboard->putFloatValue("Shooting Power", ControlSystem->throttle);
 }
-
 //Main function used to handle periodic tasks on the robot
-
+void ZaphodRobot::handler(){
-void ZaphodRobot::handler()
-{
   //Periodic tasks that should be run by every loop
   ControlSystem->updateJoysticks();
   shooter->updateShooterPosition();

src/ZaphodRobot.h

@@ -1,19 +1,15 @@
 #ifndef __ZAPHOD_ROBOT_H__
 #define __ZAPHOD_ROBOT_H__
-
 #include <WPILib.h>
-#include "ZaphodBase.h"
+#include "HHBase.h"
 #include "Definitions.h"
-
 class JoystickController;
 class ZaphodShooter;
 class ZaphodCollector;
-class ZaphodCompressor;
+class HHCompressor;
 class ZaphodDashboard;
 class ZaphodRobot;
-
+class ZaphodRobot{
-class ZaphodRobot
-{
   private:
     Jaguar *right1, *right2, *right3, *left1, *left2, *left3;
     DigitalOutput *frontSonarLeftD, *frontSonarRightD, *rearSonarLeftD, *rearSonarRightD;
@@ -21,7 +17,7 @@ class ZaphodRobot
     JoystickController *ControlSystem;
     ZaphodShooter *shooter;
     ZaphodCollector *collector;
-    ZaphodCompressor *compressorSystem;
+    HHCompressor *compressorSystem;
     ZaphodDashboard *dashboard;
   public:
     ZaphodRobot();