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

Merge branch 'develop' into feature/doxygen

Browse Source
This commit is contained in:
Austen Adler 2015-03-01 16:49:16 -05:00
commit 4f82b3304c
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/Autonomous/Turn.cpp
View File

@ -1,7 +1,7 @@
#include "Turn.h" #include "Turn.h"
#include "../../DentRobot.h" #include "../../DentRobot.h"
// Drive for a short while then stop. Just for testing // Drive for a short while then stop. Just for testing
Turn::Turn(int k) : Command("Turn"){ Turn::Turn(double k) : Command("Turn"){
Requires(DentRobot::drivetrain); Requires(DentRobot::drivetrain);
SetTimeout(k); SetTimeout(k);
} }

2
Commands/Autonomous/Turn.h
View File

@ -10,7 +10,7 @@ class Turn: public Command{
private: private:
int degrees; int degrees;
public: public:
Turn(int); Turn(double);
void Initialize(); void Initialize();
void Execute(); void Execute();
bool IsFinished(); bool IsFinished();

3
Commands/BinElevator/BinCloseArms.cpp
View File

@ -4,11 +4,10 @@
BinCloseArms::BinCloseArms() : Command("BinCloseArms"){ BinCloseArms::BinCloseArms() : Command("BinCloseArms"){
} }
void BinCloseArms::Initialize(){ void BinCloseArms::Initialize(){
//Should never need to use this
SetTimeout(0.5); SetTimeout(0.5);
} }
void BinCloseArms::Execute(){ void BinCloseArms::Execute(){
DentRobot::pneumatics->SetOpen(true); DentRobot::pneumatics->SetOpen(false);
} }
bool BinCloseArms::IsFinished(){ bool BinCloseArms::IsFinished(){
return true; return true;

1
Commands/BinElevator/BinOpenArms.cpp
View File

@ -4,7 +4,6 @@
BinOpenArms::BinOpenArms() : Command("BinOpenArms"){ BinOpenArms::BinOpenArms() : Command("BinOpenArms"){
} }
void BinOpenArms::Initialize(){ void BinOpenArms::Initialize(){
//Should never need to use this
SetTimeout(0.5); SetTimeout(0.5);
} }
void BinOpenArms::Execute(){ void BinOpenArms::Execute(){