diff --git a/Commands/Calibrate.cpp b/Commands/Calibrate.cpp index 250ebab..4c86822 100644 --- a/Commands/Calibrate.cpp +++ b/Commands/Calibrate.cpp @@ -10,7 +10,7 @@ void Calibrate::Execute(){ DentRobot::elevator->Run(-0.4f); } bool Calibrate::IsFinished(){ - if(DentRobot::DIO->Get()){ + if(DentRobot::dio->Get(DIO::ELEVATORBOTTOM)){ // 0.99 is a placeholder for the height of the limit switches DentRobot::elevator->SetHeight(0.99); return true; diff --git a/Commands/Compressor/StartCompressing.h b/Commands/Compressor/StartCompressing.h index 8e503ee..a681bd0 100644 --- a/Commands/Compressor/StartCompressing.h +++ b/Commands/Compressor/StartCompressing.h @@ -3,7 +3,7 @@ #include "../../CommandBase.h" #include "../../DentRobot.h" -#include "../../Commands/Command.h" +#include "Commands/Command.h" #include "WPILib.h" class StartCompressing: public Command{ diff --git a/Commands/Compressor/StopCompressing.h b/Commands/Compressor/StopCompressing.h index 7d5c27c..c723098 100644 --- a/Commands/Compressor/StopCompressing.h +++ b/Commands/Compressor/StopCompressing.h @@ -3,7 +3,7 @@ #include "../../CommandBase.h" #include "../../DentRobot.h" -#include "../../Commands/Command.h" +#include "Commands/Command.h" #include "WPILib.h" class StopCompressing: public Command{ diff --git a/Subsystems/DIO.h b/Subsystems/DIO.h index c9e533b..8862850 100644 --- a/Subsystems/DIO.h +++ b/Subsystems/DIO.h @@ -2,7 +2,6 @@ #define DIO_H #include "WPILib.h" -#include "Commands/PIDSubsystem.h" class DIO{ private: DigitalInput *elevatorTop, *elevatorBottom;