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/ps3

Browse Source
This commit is contained in:
Austen Adler 2015-03-22 14:08:21 -04:00
commit 987cba8bc1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Commands/Collector/RollVar.cpp
View File

@ -8,9 +8,8 @@ void RollVar::Initialize(){
Requires(DentRobot::drivetrain);
}
void RollVar::Execute(){
DentRobot::collector->MoveRollers(DentRobot::oi->GetLeftThrottle() * 1.0);
DentRobot::collector->MoveLeftRoller(speed*DentRobot::oi->GetLeftStick()->GetRawAxis(2));
DentRobot::collector->MoveRightRoller(speed*-DentRobot::oi->GetLeftStick()->GetRawAxis(2));
DentRobot::collector->MoveLeftRoller(1-(speed*(DentRobot::oi->GetLeftStick()->GetRawAxis(2)+1)/2));
DentRobot::collector->MoveRightRoller(-(speed*(DentRobot::oi->GetLeftStick()->GetRawAxis(2)+1)/2));
DentRobot::collector->MoveBottomRollers(speed*1.0);
}
bool RollVar::IsFinished(){

6
Commands/Drivetrain/Drive.cpp
View File

@ -22,7 +22,11 @@ void Drive::Execute(){
x = -x;
y = -y;
}
DentRobot::drivetrain->DriveMecanum(x, y, z, 0.9);
if(DentRobot::oi->GetLeftStick()->GetRawButton(7)){
DentRobot::drivetrain->DriveMecanum(0.0, 0.0, 0.0, 0.9);
}else{
DentRobot::drivetrain->DriveMecanum(x, y, z, 0.9);
}
}
bool Drive::IsFinished(){
return IsTimedOut();