diff --git a/DentRobot.cpp b/DentRobot.cpp index fa8b171..030e049 100644 --- a/DentRobot.cpp +++ b/DentRobot.cpp @@ -50,6 +50,7 @@ void DentRobot::RobotInit() { SmartDashboard::PutNumber("Gyro kP", -0.02); printf("Starting compressor\n"); pneumatics->SetCompressorEnabled(true); + pneumatics->SetElevatorArmOpen(true); } void DentRobot::DisabledPeriodic() { Scheduler::GetInstance()->Run(); diff --git a/OI.cpp b/OI.cpp index 1b789e7..52e92f2 100644 --- a/OI.cpp +++ b/OI.cpp @@ -44,14 +44,15 @@ OI::OI() { JoystickButton *right6 = new JoystickButton(rightStick, 6); JoystickButton *right11 = new JoystickButton(rightStick, 11); JoystickButton *right12 = new JoystickButton(rightStick, 12); - right11->WhenPressed(new OpenArm(2)); - right12->WhenPressed(new CloseArm(2)); //Full speed lift right3->WhileHeld(new Lower(3.5,false,0.5)); right5->WhileHeld(new Lower(3.5,false,1)); right4->WhileHeld(new Raise(3.4,false,-0.5)); right6->WhileHeld(new Raise(3.5,false,-1)); + + right11->WhenPressed(new OpenArm(2)); + right12->WhenPressed(new CloseArm(2)); } Joystick* OI::GetRightStick() { return rightStick;