Dammenisvoorcasuals / Mbed 2 deprecated chessRobot

control for robotic arm that can play chess using a granular gripper

Dependencies:   Encoder mbed HIDScope Servo MODSERIAL

Fork of chessRobot by a steenbeek

Diff: config.h

Revision:
95:94f02d01ebdf
Parent:
94:28e274481b60
--- a/config.h	Wed Oct 21 12:03:43 2015 +0000
+++ b/config.h	Wed Oct 21 12:09:45 2015 +0000
@@ -1,11 +1,8 @@
 // All the definitions and variables
-<<<<<<< local
 // #define TUNEPID  // set to switch between normal opperation or tuning PID
 // #define TUNEEMG // set hdiscope for EMG
 #define TUNEPWM // set hidscope for rest
-=======
 
->>>>>>> other
 // Analog inputs for EMG
 #define EMG1in          A0
 #define EMG2in          A1
@@ -20,10 +17,6 @@
 
 #define button1Pin      D0
 #define button2Pin      D1
-<<<<<<< local
-=======
-#define button3Pin      PTC6
->>>>>>> other
 
 // Servo
 #define servoPin        D9