From 693664f39c4b1ffcc60192773bf632ac3c64bb91 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Mon, 9 Mar 2015 10:53:35 -0400 Subject: [PATCH] Removed extra file, CommandBase.(h|cpp) --- CommandBase.cpp | 25 ------------------------- CommandBase.h | 26 -------------------------- Commands/Autonomous/AutoDrive.h | 2 +- Commands/Autonomous/Autonomous.h | 2 +- Commands/Autonomous/CollectTote.h | 2 +- Commands/Autonomous/ReleaseTote.h | 2 +- Commands/Autonomous/Turn.h | 2 +- Commands/Collector/RollIn.h | 2 +- Commands/Collector/RollOut.h | 2 +- Commands/Drivetrain/Drive.h | 2 +- Commands/Test/CheckDrive.h | 2 +- Commands/Test/CheckRobot.h | 2 +- 12 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 CommandBase.cpp delete mode 100644 CommandBase.h diff --git a/CommandBase.cpp b/CommandBase.cpp deleted file mode 100644 index 72a2ffc..0000000 --- a/CommandBase.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "CommandBase.h" -#include "Subsystems/Drivetrain.h" -#include "Subsystems/Collector.h" -#include "Subsystems/Elevator.h" -#include "Subsystems/BinElevator.h" -#include "Subsystems/Pneumatics.h" -Drivetrain* CommandBase::drivetrain = NULL; -Collector* CommandBase::collector = NULL; -Elevator* CommandBase::elevator = NULL; -BinElevator* CommandBase::binElevator = NULL; -Pneumatics* CommandBase::pneumatics=NULL; -OI* CommandBase::oi = NULL; -CommandBase::CommandBase(char const *name): Command(name){ -} -CommandBase::CommandBase(): Command(){ -} -void CommandBase::init(){ - drivetrain = new Drivetrain(); - collector = new Collector(); - elevator = new Elevator(); - binElevator = new BinElevator(); - pneumatics = new Pneumatics(); - oi = new OI(); -} -// vim: ts=2:sw=2:et diff --git a/CommandBase.h b/CommandBase.h deleted file mode 100644 index d0a855f..0000000 --- a/CommandBase.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef COMMAND_BASE_H -#define COMMAND_BASE_H - -#include -#include "Subsystems/Drivetrain.h" -#include "Subsystems/Collector.h" -#include "Subsystems/Elevator.h" -#include "Subsystems/BinElevator.h" -#include "Subsystems/Pneumatics.h" -#include "OI.h" -#include "WPILib.h" - -class CommandBase: public Command{ - public: - CommandBase(char const *name); - CommandBase(); - static void init(); - static Drivetrain *drivetrain; - static Collector *collector; - static Elevator *elevator; - static BinElevator *binElevator; - static Pneumatics *pneumatics; - static OI *oi; -}; -#endif -// vim: ts=2:sw=2:et diff --git a/Commands/Autonomous/AutoDrive.h b/Commands/Autonomous/AutoDrive.h index 1572c09..96fa8a4 100644 --- a/Commands/Autonomous/AutoDrive.h +++ b/Commands/Autonomous/AutoDrive.h @@ -2,7 +2,7 @@ #define AUTODRIVE_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Autonomous/Autonomous.h b/Commands/Autonomous/Autonomous.h index cfa3d24..10b3227 100644 --- a/Commands/Autonomous/Autonomous.h +++ b/Commands/Autonomous/Autonomous.h @@ -2,7 +2,7 @@ #define AUTONOMOUS_H #include "Commands/CommandGroup.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Autonomous/CollectTote.h b/Commands/Autonomous/CollectTote.h index 0d7c013..aba8974 100644 --- a/Commands/Autonomous/CollectTote.h +++ b/Commands/Autonomous/CollectTote.h @@ -2,7 +2,7 @@ #define COLLECTTOTE_H #include "Commands/CommandGroup.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Autonomous/ReleaseTote.h b/Commands/Autonomous/ReleaseTote.h index f91dc65..0dbf066 100644 --- a/Commands/Autonomous/ReleaseTote.h +++ b/Commands/Autonomous/ReleaseTote.h @@ -2,7 +2,7 @@ #define RELEASETOTE_H #include "Commands/CommandGroup.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Autonomous/Turn.h b/Commands/Autonomous/Turn.h index bd8078c..09d0913 100644 --- a/Commands/Autonomous/Turn.h +++ b/Commands/Autonomous/Turn.h @@ -2,7 +2,7 @@ #define TURN_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Collector/RollIn.h b/Commands/Collector/RollIn.h index 0a8dc20..e5bbf37 100644 --- a/Commands/Collector/RollIn.h +++ b/Commands/Collector/RollIn.h @@ -2,7 +2,7 @@ #define ROLLIN_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Collector/RollOut.h b/Commands/Collector/RollOut.h index 2d2990f..bfa7b70 100644 --- a/Commands/Collector/RollOut.h +++ b/Commands/Collector/RollOut.h @@ -2,7 +2,7 @@ #define ROLLOUT_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Drivetrain/Drive.h b/Commands/Drivetrain/Drive.h index cd45188..ec9031f 100644 --- a/Commands/Drivetrain/Drive.h +++ b/Commands/Drivetrain/Drive.h @@ -2,7 +2,7 @@ #define DRIVE_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Test/CheckDrive.h b/Commands/Test/CheckDrive.h index 11fdc6f..2501755 100644 --- a/Commands/Test/CheckDrive.h +++ b/Commands/Test/CheckDrive.h @@ -2,7 +2,7 @@ #define CHECKDRIVE_H #include "Commands/Command.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h" diff --git a/Commands/Test/CheckRobot.h b/Commands/Test/CheckRobot.h index c12d6f6..eb14a2b 100644 --- a/Commands/Test/CheckRobot.h +++ b/Commands/Test/CheckRobot.h @@ -2,7 +2,7 @@ #define CHECKROBOT_H #include "Commands/CommandGroup.h" -#include "../../CommandBase.h" +#include "../../DentRobot.h" #include "../../DentRobot.h" #include "WPILib.h"