diff --git a/.env b/.env index f4bc334..7bcd405 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ function mb(){ vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null;make" } function mc(){ - vagrant ssh -c "cd /vagrant/src;make clean" + vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null" } function mk(){ vagrant ssh -c "cd /vagrant/src;make" @@ -11,5 +11,5 @@ function md(){ vagrant ssh -c "cd /vagrant/src;make deploy" } function ma(){ - vagrant ssh -c "cd /vagrant/src;make clean;make;make deploy" + vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null;make;make deploy" } diff --git a/Commands/Autonomous/Autonomous.cpp b/Commands/Autonomous/Autonomous.cpp index 57848c5..12be62e 100644 --- a/Commands/Autonomous/Autonomous.cpp +++ b/Commands/Autonomous/Autonomous.cpp @@ -1,6 +1,7 @@ #include "Autonomous.h" #include "AutoDrive.h" #include "../../DentRobot.h" +#include "../Elevator/Raise.h" Autonomous::Autonomous(){ AddSequential(new AutoDrive()); } diff --git a/Commands/Elevator/Lower.cpp b/Commands/Elevator/Lower.cpp index 8d75a74..1e4e658 100644 --- a/Commands/Elevator/Lower.cpp +++ b/Commands/Elevator/Lower.cpp @@ -4,16 +4,16 @@ Lower::Lower() : Command("Lower"){ } void Lower::Initialize(){ - SetTimeout(2.0); + SetTimeout(2.0); } void Lower::Execute(){ DentRobot::elevator->Run((-DentRobot::oi->GetLeftStick()->GetRawAxis(3)+1.0)/2); } bool Lower::IsFinished(){ if (!DentRobot::dio->Get(DentRobot::dio->ELEVATORBOTTOM) || IsTimedOut()){ - return true; + return true; }else{ - return false; + return false; } } void Lower::End(){ diff --git a/Commands/Elevator/Raise.cpp b/Commands/Elevator/Raise.cpp index 35372ea..385ec52 100644 --- a/Commands/Elevator/Raise.cpp +++ b/Commands/Elevator/Raise.cpp @@ -4,16 +4,16 @@ Raise::Raise() : Command("Raise"){ } void Raise::Initialize(){ - SetTimeout(2.0); + SetTimeout(2.0); } void Raise::Execute(){ DentRobot::elevator->Run(-(-DentRobot::oi->GetLeftStick()->GetRawAxis(3)+1.0)/2); } bool Raise::IsFinished(){ if (!DentRobot::dio->Get(DentRobot::dio->ELEVATORBOTTOM) || IsTimedOut()){ - return true; + return true; }else{ - return false; + return false; } } void Raise::End(){ diff --git a/DentRobot.cpp b/DentRobot.cpp index 0489d39..26365f7 100644 --- a/DentRobot.cpp +++ b/DentRobot.cpp @@ -6,7 +6,7 @@ Drivetrain* DentRobot::drivetrain=NULL; Elevator* DentRobot::elevator=NULL; DIO* DentRobot::dio = NULL; AirCompressor* DentRobot::airCompressor=NULL; -Autonomous* DentRobot::aut=NULL; +CommandGroup* DentRobot::aut=NULL; DentRobot::DentRobot(){ oi=new OI(); collector=new Collector(); diff --git a/DentRobot.h b/DentRobot.h index eb23f1a..1f72a33 100644 --- a/DentRobot.h +++ b/DentRobot.h @@ -19,7 +19,7 @@ class DentRobot: public IterativeRobot { static Elevator* elevator; static DIO* dio; static AirCompressor* airCompressor; - static Autonomous* aut; + static CommandGroup* aut; void RobotInit(); void DisabledPeriodic(); void AutonomousInit();