Removed compressor

CommandBase.cpp

@@ -2,11 +2,9 @@
 #include "Subsystems/Drivetrain.h"
 #include "Subsystems/Collector.h"
 #include "Subsystems/Elevator.h"
-#include "Subsystems/AirCompressor.h"
 Drivetrain* CommandBase::drivetrain = NULL;
 Collector* CommandBase::collector = NULL;
 Elevator* CommandBase::elevator = NULL;
-AirCompressor* CommandBase::airCompressor = NULL;
 OI* CommandBase::oi = NULL;
 CommandBase::CommandBase(char const *name) : Command(name) {
 }
@@ -16,6 +14,5 @@ void CommandBase::init(){
   drivetrain = new Drivetrain();
   collector = new Collector();
   elevator = new Elevator();
-  airCompressor = new AirCompressor();
   oi = new OI();
 }

CommandBase.h

@@ -5,7 +5,6 @@
 #include "Subsystems/Drivetrain.h"
 #include "Subsystems/Collector.h"
 #include "Subsystems/Elevator.h"
-#include "Subsystems/AirCompressor.h"
 #include "OI.h"
 #include "WPILib.h"
 
@@ -17,7 +16,6 @@ class CommandBase: public Command {
     static Drivetrain *drivetrain;
     static Collector *collector;
     static Elevator *elevator;
-    static AirCompressor *airCompressor;
     static OI *oi;
 };
 #endif

Commands/Autonomous/Autonomous.cpp

@@ -4,4 +4,5 @@
 #include "../Elevator/Raise.h"
 Autonomous::Autonomous(){
   AddSequential(new AutoDrive());
+  AddSequential(new Raise());
 }

Commands/Compressor/StartCompressing.cpp

@@ -1,18 +0,0 @@
-#include "StartCompressing.h"
-#include "../../DentRobot.h"
-StartCompressing::StartCompressing() : Command("StartCompressing"){
-  Requires(DentRobot::airCompressor);
-}
-void StartCompressing::Initialize(){
-}
-void StartCompressing::Execute(){
-  DentRobot::airCompressor->StartCompressing();
-}
-bool StartCompressing::IsFinished(){
-  return false;
-}
-void StartCompressing::End(){
-}
-void StartCompressing::Interrupted(){
-  End();
-}

Commands/Compressor/StartCompressing.h

@@ -1,18 +0,0 @@
-#ifndef STARTCOMPRESSING_H
-#define STARTCOMPRESSING_H
-
-#include "../../CommandBase.h"
-#include "../../DentRobot.h"
-#include "Commands/Command.h"
-#include "WPILib.h"
-
-class StartCompressing: public Command{
-  public:
-    StartCompressing();
-    void Initialize();
-    void Execute();
-    bool IsFinished();
-    void End();
-    void Interrupted();
-};
-#endif

Commands/Compressor/StopCompressing.cpp

@@ -1,18 +0,0 @@
-#include "StopCompressing.h"
-#include "../../DentRobot.h"
-StopCompressing::StopCompressing() : Command("StopCompressing"){
-  Requires(DentRobot::airCompressor);
-}
-void StopCompressing::Initialize(){
-}
-void StopCompressing::Execute(){
-  DentRobot::airCompressor->StopCompressing();
-}
-bool StopCompressing::IsFinished(){
-  return false;
-}
-void StopCompressing::End(){
-}
-void StopCompressing::Interrupted(){
-  End();
-}

Commands/Compressor/StopCompressing.h

@@ -1,18 +0,0 @@
-#ifndef STOPCOMPRESSING_H
-#define STOPCOMPRESSING_H
-
-#include "../../CommandBase.h"
-#include "../../DentRobot.h"
-#include "Commands/Command.h"
-#include "WPILib.h"
-
-class StopCompressing: public Command{
-  public:
-    StopCompressing();
-    void Initialize();
-    void Execute();
-    bool IsFinished();
-    void End();
-    void Interrupted();
-};
-#endif

DentRobot.cpp

@@ -4,14 +4,12 @@ OI* DentRobot::oi=NULL;
 Collector* DentRobot::collector=NULL;
 Drivetrain* DentRobot::drivetrain=NULL;
 Elevator* DentRobot::elevator=NULL;
-AirCompressor* DentRobot::airCompressor=NULL;
 CommandGroup* DentRobot::aut=NULL;
 DentRobot::DentRobot(){
   oi=new OI();
   collector=new Collector();
   drivetrain=new Drivetrain();
   elevator=new Elevator();
-  airCompressor=new AirCompressor();
   aut=new Autonomous();
   printf("Initialized");
 }

DentRobot.h

@@ -5,7 +5,6 @@
 #include "Subsystems/Elevator.h"
 #include "Subsystems/Drivetrain.h"
 #include "Subsystems/Collector.h"
-#include "Subsystems/AirCompressor.h"
 #include "Commands/Autonomous/Autonomous.h"
 class DentRobot: public IterativeRobot {
   private:
@@ -16,7 +15,6 @@ class DentRobot: public IterativeRobot {
     static Collector* collector;
     static Drivetrain* drivetrain;
     static Elevator* elevator;
-    static AirCompressor* airCompressor;
     static CommandGroup* aut;
     void RobotInit();
     void DisabledPeriodic();

OI.cpp

@@ -5,7 +5,6 @@
 #include "Commands/Collector/CloseCollector.h"
 #include "Commands/Collector/CollectTote.h"
 #include "Commands/Collector/ReleaseTote.h"
-#include "Commands/Compressor/StartCompressing.h"
 
 OI::OI() {
   leftStick=new Joystick(0);

RobotMap.h

@@ -24,7 +24,4 @@
 #define COLLECTOR_LEFT_CAN 8
 #define COLLECTOR_RIGHT_CAN 9
 
-// Compressor
-#define COMPRESSOR_CAN 10
-
 #endif

Subsystems/AirCompressor.cpp

@@ -1,20 +0,0 @@
-#include "AirCompressor.h"
-#include "../RobotMap.h"
-
-AirCompressor::AirCompressor() : Subsystem("AirCompressor") {
-  compressor = new Compressor(COMPRESSOR_CAN);
-}
-void AirCompressor::InitDefaultCommand() {
-}
-void AirCompressor::StartCompressing() {
-  if(compressor->Enabled()){
-    printf("Starting compressor\n");
-    compressor->Start();
-  }
-}
-void AirCompressor::StopCompressing() {
-  if(compressor->Enabled()){
-    printf("Stopping compressor\n");
-    compressor->Stop();
-  }
-}

Subsystems/AirCompressor.h

@@ -1,15 +0,0 @@
-#ifndef AIRCOMPRESSOR_H
-#define AIRCOMPRESSOR_H
-
-#include "WPILib.h"
-class AirCompressor: public Subsystem
-{
-  private:
-    Compressor *compressor;
-  public:
-    AirCompressor();
-    void InitDefaultCommand();
-    void StartCompressing();
-    void StopCompressing();
-};
-#endif

TODO.txt

@@ -1,2 +0,0 @@
-Compressor isn't in use
-  (dos compressor on compressor start or stop)?