From 7c8f60743e3c8a52000785685070c87257c97f70 Mon Sep 17 00:00:00 2001
From: Adam Long <macadam.long@gmail.com>
Date: Fri, 9 Oct 2015 16:27:34 +0000
Subject: [PATCH] changed buttons to more logical placement

---
 OI.cpp     | 4 ++--
 RobotMap.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OI.cpp b/OI.cpp
index 19f3e1c..291c468 100644
--- a/OI.cpp
+++ b/OI.cpp
@@ -37,15 +37,15 @@ OI::OI() {
   JoystickButton *right6 = new JoystickButton(rightStick, 6);
   JoystickButton *right7 = new JoystickButton(rightStick, 7);
   JoystickButton *right10 = new JoystickButton(rightStick, 10);
-  JoystickButton *right11 = new JoystickButton(rightStick, 11);
+  JoystickButton *right9 = new JoystickButton(rightStick, 9);
   JoystickButton *right12 = new JoystickButton(rightStick, 12);
   left11->WhenPressed(new OpenArm(2));
   left12->WhenPressed(new CloseArm(2));
   right4->WhileHeld(lower);
   right6->WhileHeld(raise);
   right7->WhenPressed(cycle);
+  right9->WhenPressed(new BinOpenArms(2));
   right10->WhenPressed(new BinCloseArms(2));
-  right11->WhenPressed(new BinOpenArms(2));
   right4->CancelWhenPressed(raise);
   right6->CancelWhenPressed(lower);
   right4->CancelWhenPressed(cycle);
diff --git a/RobotMap.h b/RobotMap.h
index 545c073..92687f0 100644
--- a/RobotMap.h
+++ b/RobotMap.h
@@ -23,14 +23,14 @@
 
 // Drivetrain
 #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_BACK_RIGHT_CAN 3
 #define DRIVE_GYRO_ANALOG 0
 
 // Collector
 #define COLLECTOR_RAMP_CAN 7
-#define COLLECTOR_LEFT_CAN 8
+#define COLLECTOR_LEFT_CAN 2
 #define COLLECTOR_BOTTOM_CAN 20
 #define COLLECTOR_RIGHT_CAN 10
 #define COLLECTOR_SONAR_ANALOG 3