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

Minor fixes

Browse Source
This commit is contained in:
Austen Adler 2015-02-07 12:50:36 -05:00
parent e68dc00c21
commit b26a63bcc1
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@ -2,7 +2,7 @@ function mb(){
vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null;make" vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null;make"
} }
function mc(){ function mc(){
vagrant ssh -c "cd /vagrant/src;make clean" vagrant ssh -c "cd /vagrant/src;make clean 2>&1 >/dev/null"
} }
function mk(){ function mk(){
vagrant ssh -c "cd /vagrant/src;make" vagrant ssh -c "cd /vagrant/src;make"
@ -11,5 +11,5 @@ function md(){
vagrant ssh -c "cd /vagrant/src;make deploy" vagrant ssh -c "cd /vagrant/src;make deploy"
} }
function ma(){ 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"
} }

1
Commands/Autonomous/Autonomous.cpp
View File

@ -1,6 +1,7 @@
#include "Autonomous.h" #include "Autonomous.h"
#include "AutoDrive.h" #include "AutoDrive.h"
#include "../../DentRobot.h" #include "../../DentRobot.h"
#include "../Elevator/Raise.h"
Autonomous::Autonomous(){ Autonomous::Autonomous(){
AddSequential(new AutoDrive()); AddSequential(new AutoDrive());
} }

2
DentRobot.cpp
View File

@ -6,7 +6,7 @@ Drivetrain* DentRobot::drivetrain=NULL;
Elevator* DentRobot::elevator=NULL; Elevator* DentRobot::elevator=NULL;
DIO* DentRobot::dio = NULL; DIO* DentRobot::dio = NULL;
AirCompressor* DentRobot::airCompressor=NULL; AirCompressor* DentRobot::airCompressor=NULL;
Autonomous* DentRobot::aut=NULL; CommandGroup* DentRobot::aut=NULL;
DentRobot::DentRobot(){ DentRobot::DentRobot(){
oi=new OI(); oi=new OI();
collector=new Collector(); collector=new Collector();

2
DentRobot.h
View File

@ -19,7 +19,7 @@ class DentRobot: public IterativeRobot {
static Elevator* elevator; static Elevator* elevator;
static DIO* dio; static DIO* dio;
static AirCompressor* airCompressor; static AirCompressor* airCompressor;
static Autonomous* aut; static CommandGroup* aut;
void RobotInit(); void RobotInit();
void DisabledPeriodic(); void DisabledPeriodic();
void AutonomousInit(); void AutonomousInit();