team2059/dent
2
0
Fork 0
mirror of https://github.com/team2059/Dent synced 2025-01-07 22:14:14 -05:00
Code Issues Releases Wiki Activity

changed buttons to more logical placement

Browse Source
This commit is contained in:
Adam Long 2015-10-09 16:27:34 +00:00
parent eb1fefef47
commit 7c8f60743e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OI.cpp
View File

@ -37,15 +37,15 @@ OI::OI() {
JoystickButton *right6 = new JoystickButton(rightStick, 6); JoystickButton *right6 = new JoystickButton(rightStick, 6);
JoystickButton *right7 = new JoystickButton(rightStick, 7); JoystickButton *right7 = new JoystickButton(rightStick, 7);
JoystickButton *right10 = new JoystickButton(rightStick, 10); JoystickButton *right10 = new JoystickButton(rightStick, 10);
JoystickButton *right11 = new JoystickButton(rightStick, 11); JoystickButton *right9 = new JoystickButton(rightStick, 9);
JoystickButton *right12 = new JoystickButton(rightStick, 12); JoystickButton *right12 = new JoystickButton(rightStick, 12);
left11->WhenPressed(new OpenArm(2)); left11->WhenPressed(new OpenArm(2));
left12->WhenPressed(new CloseArm(2)); left12->WhenPressed(new CloseArm(2));
right4->WhileHeld(lower); right4->WhileHeld(lower);
right6->WhileHeld(raise); right6->WhileHeld(raise);
right7->WhenPressed(cycle); right7->WhenPressed(cycle);
right9->WhenPressed(new BinOpenArms(2));
right10->WhenPressed(new BinCloseArms(2)); right10->WhenPressed(new BinCloseArms(2));
right11->WhenPressed(new BinOpenArms(2));
right4->CancelWhenPressed(raise); right4->CancelWhenPressed(raise);
right6->CancelWhenPressed(lower); right6->CancelWhenPressed(lower);
right4->CancelWhenPressed(cycle); right4->CancelWhenPressed(cycle);

4
RobotMap.h
View File

@ -23,14 +23,14 @@
// Drivetrain // Drivetrain
#define DRIVE_FRONT_LEFT_CAN 8 #define DRIVE_FRONT_LEFT_CAN 8
#define DRIVE_BACK_LEFT_CAN 2 #define DRIVE_BACK_LEFT_CAN 8
#define DRIVE_FRONT_RIGHT_CAN 4 #define DRIVE_FRONT_RIGHT_CAN 4
#define DRIVE_BACK_RIGHT_CAN 3 #define DRIVE_BACK_RIGHT_CAN 3
#define DRIVE_GYRO_ANALOG 0 #define DRIVE_GYRO_ANALOG 0
// Collector // Collector
#define COLLECTOR_RAMP_CAN 7 #define COLLECTOR_RAMP_CAN 7
#define COLLECTOR_LEFT_CAN 8 #define COLLECTOR_LEFT_CAN 2
#define COLLECTOR_BOTTOM_CAN 20 #define COLLECTOR_BOTTOM_CAN 20
#define COLLECTOR_RIGHT_CAN 10 #define COLLECTOR_RIGHT_CAN 10
#define COLLECTOR_SONAR_ANALOG 3 #define COLLECTOR_SONAR_ANALOG 3