team2059/dent
2
0
Fork 0
mirror of https://github.com/team2059/Dent synced 2024-12-18 20:52:29 -05:00
Code Issues Releases Wiki Activity

Removed compressor

Browse Source
This commit is contained in:
Austen Adler 2015-02-07 13:17:22 -05:00
parent aed1db3981
commit 1f6f1cf239
14 changed files with 1 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CommandBase.cpp
View File

@ -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();
}

2
CommandBase.h
View File

@ -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

1
Commands/Autonomous/Autonomous.cpp
View File

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

18
Commands/Compressor/StartCompressing.cpp
View File

@ -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();
}

18
Commands/Compressor/StartCompressing.h
View File

@ -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

18
Commands/Compressor/StopCompressing.cpp
View File

@ -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();
}

18
Commands/Compressor/StopCompressing.h
View File

@ -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

2
DentRobot.cpp
View File

@ -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");
}

2
DentRobot.h
View File

@ -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();

1
OI.cpp
View File

@ -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);

3
RobotMap.h
View File

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

20
Subsystems/AirCompressor.cpp
View File

@ -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();
}
}

15
Subsystems/AirCompressor.h
View File

@ -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

2
TODO.txt
View File

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