Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MarlinKimbra/base.h

@@ -4,11 +4,6 @@
 #include "Arduino.h"
 #include "pins_arduino.h"
 
-// Arduino < 1.0.0 does not define this, so we need to do it ourselves
-#ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) ((p) + 0xA0)
-#endif
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,6 +12,10 @@
 #ifdef __SAM3X8E__
   #include "HAL.h"
 #else
+  // Arduino < 1.0.0 does not define this, so we need to do it ourselves
+  #ifndef analogInputToDigitalPin
+    #define analogInputToDigitalPin(p) ((p) + 0xA0)
+  #endif
   #include <util/delay.h>
   #include <avr/eeprom.h>
   #include "fastio.h"

MarlinKimbra/pins.h

@@ -75,22 +75,6 @@
 #ifndef PINS_H
 #define PINS_H
 
-// Preset optional pins
-#define X_MS1_PIN     -1
-#define X_MS2_PIN     -1
-#define Y_MS1_PIN     -1
-#define Y_MS2_PIN     -1
-#define Z_MS1_PIN     -1
-#define Z_MS2_PIN     -1
-#define E0_MS1_PIN    -1
-#define E0_MS2_PIN    -1
-#define E1_MS1_PIN    -1
-#define E1_MS2_PIN    -1
-#define DIGIPOTSS_PIN -1
-#define LCD_CONTRAST  -1
-#define Z2_MIN_PIN    -1
-#define Z2_MAX_PIN    -1
-
 
 /******************************************************************************
 * 10
@@ -5433,6 +5417,48 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
   #endif
 #endif
 
+#ifndef X_MS1_PIN
+  #define X_MS1_PIN     -1
+#endif
+#ifndef X_MS2_PIN
+  #define X_MS2_PIN     -1
+#endif
+#ifndef Y_MS1_PIN
+  #define Y_MS1_PIN     -1
+#endif
+#ifndef Y_MS2_PIN
+  #define Y_MS2_PIN     -1
+#endif
+#ifndef Z_MS1_PIN
+  #define Z_MS1_PIN     -1
+#endif
+#ifndef Z_MS2_PIN
+  #define Z_MS2_PIN     -1
+#endif
+#ifndef E0_MS1_PIN
+  #define E0_MS1_PIN    -1
+#endif
+#ifndef E0_MS2_PIN
+  #define E0_MS2_PIN    -1
+#endif
+#ifndef E1_MS1_PIN
+  #define E1_MS1_PIN    -1
+#endif
+#ifndef E1_MS2_PIN
+  #define E1_MS2_PIN    -1
+#endif
+#ifndef DIGIPOTSS_PIN
+  #define DIGIPOTSS_PIN -1
+#endif
+#ifndef LCD_CONTRAST
+  #define LCD_CONTRAST  -1
+#endif
+#ifndef Z2_MIN_PIN
+  #define Z2_MIN_PIN    -1
+#endif
+#ifndef Z2_MAX_PIN
+  #define Z2_MAX_PIN    -1
+#endif
 
 /****************************************************************************************/
 #include "Configuration_Pins.h"