Same fix

MarlinKimbra/Configuration_Pins.h

 #ifndef CONFIGURATION_PINS_H
 #define CONFIGURATION_PINS_H
 
-//=========================== BASIC ==============================
+//=================================== BASIC ==================================
 
-//X axis pins
+// X axis pins
 #define X_STEP_PIN     ORIG_X_STEP_PIN
 #define X_DIR_PIN      ORIG_X_DIR_PIN
 #define X_ENABLE_PIN   ORIG_X_ENABLE_PIN
 
-//Y axis pins
+// Y axis pins
 #define Y_STEP_PIN     ORIG_Y_STEP_PIN
 #define Y_DIR_PIN      ORIG_Y_DIR_PIN
 #define Y_ENABLE_PIN   ORIG_Y_ENABLE_PIN
 
-//Z axis pins
+// Z axis pins
 #define Z_STEP_PIN     ORIG_Z_STEP_PIN
 #define Z_DIR_PIN      ORIG_Z_DIR_PIN
 #define Z_ENABLE_PIN   ORIG_Z_ENABLE_PIN
 
-//E axis pins
+// E axis pins
 #if DRIVER_EXTRUDERS > 0
   #define E0_STEP_PIN    ORIG_E0_STEP_PIN
   #define E0_DIR_PIN     ORIG_E0_DIR_PIN
@@ -43,33 +43,41 @@
   #define E3_ENABLE_PIN  ORIG_E3_ENABLE_PIN
 #endif
 
-//HEATHER pin
+// ENDSTOP pin
+#define X_MIN_PIN        ORIG_X_MIN_PIN
+#define X_MAX_PIN        ORIG_X_MAX_PIN
+#define Y_MIN_PIN        ORIG_Y_MIN_PIN
+#define Y_MAX_PIN        ORIG_Y_MAX_PIN
+#define Z_MIN_PIN        ORIG_Z_MIN_PIN
+#define Z_MAX_PIN        ORIG_Z_MAX_PIN
+
+// HEATER pin
 #define HEATER_0_PIN     ORIG_HEATER_0_PIN
 #define HEATER_1_PIN     ORIG_HEATER_1_PIN
 #define HEATER_2_PIN     ORIG_HEATER_2_PIN
 #define HEATER_3_PIN     ORIG_HEATER_3_PIN
 #define HEATER_BED_PIN   ORIG_HEATER_BED_PIN
 
-//TEMP pin
+// TEMP pin
 #define TEMP_0_PIN       ORIG_TEMP_0_PIN
 #define TEMP_1_PIN       ORIG_TEMP_1_PIN
 #define TEMP_2_PIN       ORIG_TEMP_2_PIN
 #define TEMP_3_PIN       ORIG_TEMP_3_PIN
 #define TEMP_BED_PIN     ORIG_TEMP_BED_PIN
 
-//FAN pin
+// FAN pin
 #define FAN_PIN          ORIG_FAN_PIN
 
-//==================================================================
+//============================================================================
 
-//=========================== FEATURE ==============================
+//================================= FEATURE ==================================
 
 #if ENABLED(MKR4)
   #define E0E1_CHOICE_PIN -1
   #define E0E2_CHOICE_PIN -1
   #define E0E3_CHOICE_PIN -1
   #define E1E3_CHOICE_PIN -1
-#endif //MKR4
+#endif
 
 #if ENABLED(NPR2)
   #define E_MIN_PIN -1
@@ -85,11 +93,11 @@
 #endif
 
 #if ENABLED(FILAMENT_SENSOR)
-  #define FILWIDTH_PIN        -1     // ANALOG NUMBERING
+  #define FILWIDTH_PIN -1
 #endif
 
 #if ENABLED(POWER_CONSUMPTION)
-  #define POWER_CONSUMPTION_PIN -1   // ANALOG NUMBERING
+  #define POWER_CONSUMPTION_PIN -1
 #endif
 
 #if ENABLED(PHOTOGRAPH)
@@ -125,5 +133,6 @@
   #define Z_PROBE_PIN -1
 #endif
 
-//====================================================================
+//============================================================================
+
 #endif

MarlinKimbra/Marlin_main.cpp

@@ -697,7 +697,7 @@ bool enqueuecommand(const char *cmd) {
   }
 #endif
 
-#if HAS(SERVO)
+#if HAS(SERVOS)
   void servo_init() {
     #if HAS(SERVO_0)
       servo[0].attach(SERVO0_PIN);
@@ -717,21 +717,23 @@ bool enqueuecommand(const char *cmd) {
     #endif
 
     #if ENABLED(DONDOLO)
+      servo[DONDOLO_SERVO_INDEX].attach(0);
   		servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0);
   		delay(DONDOLO_SERVO_DELAY);
+      servo[DONDOLO_SERVO_INDEX].detach();
   	#endif
 
     // Set position of Servo Endstops that are defined
     #if HAS(SERVO_ENDSTOPS)
       #if ENABLED(DONDOLO)
         for (int i = 0; i < 3; i++) {
-          if (servo_endstops[i] >= 0 && servo_endstops[i] != DONDOLO_SERVO_INDEX)
-            servo[servo_endstops[i]].write(servo_endstop_angles[i * 2 + 1]);
+          if (servo_endstop_id[i] >= 0 && servo_endstop_id[i] != DONDOLO_SERVO_INDEX)
+            servo[servo_endstop_id[i]].write(servo_endstop_angle[i][1]);
         }
       #else
         for (int i = 0; i < 3; i++) {
-          if (servo_endstops[i] >= 0)
-          servo[servo_endstops[i]].write(servo_endstop_angles[i * 2 + 1]);
+          if (servo_endstop_id[i] >= 0)
+          servo[servo_endstop_id[i]].write(servo_endstop_angle[i][1]);
         }
       #endif
     #endif
@@ -857,7 +859,7 @@ void setup() {
   #if ENABLED(LASERBEAM)
     setup_laserbeampin();   // Initialize Laserbeam pin
   #endif
-  #if HAS(SERVO)
+  #if HAS(SERVOS)
     servo_init();
   #endif
   #if HAS(STEPPER_RESET)
@@ -5857,7 +5859,7 @@ inline void gcode_M226() {
 
 #endif // DOGLCD
 
-#if HAS(SERVO)
+#if HAS(SERVOS)
   /**
    * M280: Get or set servo position. P<index> S<angle>
    */
@@ -5880,8 +5882,10 @@ inline void gcode_M226() {
         }
         else if(servo_index == DONDOLO_SERVO_INDEX) {
           Servo *srv = &servo[servo_index];
+          srv->attach(0);
           srv->write(servo_position);
           delay (DONDOLO_SERVO_DELAY);
+          srv->detach();
         }
         else {
           ECHO_SM(ER, "Servo ");
@@ -6975,13 +6979,17 @@ inline void gcode_T(uint8_t tmp_extruder) {
             active_driver = 0;
             if (active_extruder == 0) {
               st_synchronize();
+              servo[DONDOLO_SERVO_INDEX].attach(0);
               servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E0);
               delay (DONDOLO_SERVO_DELAY);
+              servo[DONDOLO_SERVO_INDEX].detach();
             }
             else if (active_extruder == 1) {
               st_synchronize();
+              servo[DONDOLO_SERVO_INDEX].attach(0);
               servo[DONDOLO_SERVO_INDEX].write(DONDOLO_SERVOPOS_E1);
               delay(DONDOLO_SERVO_DELAY);
+              servo[DONDOLO_SERVO_INDEX].detach();
             }
             ECHO_LMV(DB, MSG_ACTIVE_DRIVER, active_driver);
             ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder);
@@ -7332,7 +7340,7 @@ void process_next_command() {
           gcode_M250(); break;
       #endif // DOGLCD
 
-      #if HAS(SERVO)
+      #if HAS(SERVOS)
         case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds
           gcode_M280(); break;
       #endif // NUM_SERVOS > 0

MarlinKimbra/conditionals.h

@@ -222,7 +222,7 @@
  */
 #if ENABLED(DONDOLO)
   #undef SINGLENOZZLE
-  #define DRIVER_EXTRUDERS 0
+  #define DRIVER_EXTRUDERS 1
 #endif
 
 /**
@@ -238,7 +238,7 @@
 /**
  * DRIVER_EXTRUDERS
  */
-#if DISABLED(MKR4) && DISABLED(NPR2)
+#if DISABLED(MKR4) && DISABLED(NPR2) && DISABLED(DONDOLO)
   #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
 #endif
 

MarlinKimbra/pins.h

@@ -207,8 +207,8 @@
   #define ORIG_Z_STEP_PIN       26
   #define ORIG_Z_DIR_PIN        25
   #define ORIG_Z_ENABLE_PIN     24
-  #define Z_MIN_PIN    1
-  #define Z_MAX_PIN    0
+  #define ORIG_Z_MIN_PIN        1
+  #define ORIG_Z_MAX_PIN        0
   
   //extruder pins
   #define ORIG_E0_STEP_PIN      28
@@ -282,8 +282,8 @@
   #define ORIG_Z_STEP_PIN       26
   #define ORIG_Z_DIR_PIN        25
   #define ORIG_Z_ENABLE_PIN     24
-  #define Z_MIN_PIN    1
-  #define Z_MAX_PIN    0
+  #define ORIG_Z_MIN_PIN    1
+  #define ORIG_Z_MAX_PIN    0
   
   //extruder pins
   #define ORIG_E0_STEP_PIN      28
@@ -413,8 +413,8 @@
   #define ORIG_X_ENABLE_PIN 24
   
   //X endstop
-  #define X_MIN_PIN 3
-  #define X_MAX_PIN -1
+  #define ORIG_X_MIN_PIN 3
+  #define ORIG_X_MAX_PIN -1
   
   //Y motor stepper
   #define ORIG_Y_STEP_PIN 35
@@ -422,8 +422,8 @@
   #define ORIG_Y_ENABLE_PIN 31
   
   //Y endstop
-  #define Y_MIN_PIN 2
-  #define Y_MAX_PIN -1
+  #define ORIG_Y_MIN_PIN 2
+  #define ORIG_Y_MAX_PIN -1
   
   //Z motor stepper
   #define ORIG_Z_STEP_PIN 40
@@ -431,8 +431,8 @@
   #define ORIG_Z_ENABLE_PIN 37
   
   //Z endstop
-  #define Z_MIN_PIN 5
-  #define Z_MAX_PIN -1
+  #define ORIG_Z_MIN_PIN 5
+  #define ORIG_Z_MAX_PIN -1
   
   //Extruder 0 stepper
   #define ORIG_E0_STEP_PIN 26
@@ -523,8 +523,8 @@
   #define ORIG_Z_STEP_PIN 26
   #define ORIG_Z_DIR_PIN 25
   #define ORIG_Z_ENABLE_PIN 24
-  #define Z_MIN_PIN 1
-  #define Z_MAX_PIN 0
+  #define ORIG_Z_MIN_PIN 1
+  #define ORIG_Z_MAX_PIN 0
   
   //extruder pins
   #define ORIG_E0_STEP_PIN 28
@@ -587,20 +587,20 @@
   #define ORIG_X_STEP_PIN       49
   #define ORIG_X_DIR_PIN        13
   #define ORIG_X_ENABLE_PIN     48
-  #define X_MIN_PIN    35
-  #define X_MAX_PIN    -1 //34
+  #define ORIG_X_MIN_PIN        35
+  #define ORIG_X_MAX_PIN        -1 // 34
   
   #define ORIG_Y_STEP_PIN       11
   #define ORIG_Y_DIR_PIN        9
   #define ORIG_Y_ENABLE_PIN     12
-  #define Y_MIN_PIN    33
-  #define Y_MAX_PIN    -1 //32
+  #define ORIG_Y_MIN_PIN        33
+  #define ORIG_Y_MAX_PIN        -1 // 32
   
   #define ORIG_Z_STEP_PIN       7
   #define ORIG_Z_DIR_PIN        6
   #define ORIG_Z_ENABLE_PIN     8
-  #define Z_MIN_PIN    31
-  #define Z_MAX_PIN    -1 //30
+  #define ORIG_Z_MIN_PIN        31
+  #define ORIG_Z_MAX_PIN        -1 // 30
   
   #define ORIG_E2_STEP_PIN      43
   #define ORIG_E2_DIR_PIN       47
@@ -615,21 +615,21 @@
   #define ORIG_E0_ENABLE_PIN    37
   
   #define SDPOWER               -1
-  #define LED_PIN           -1  //Use +12V Aux port for LED Ring
+  #define LED_PIN               -1  // Use +12V Aux port for LED Ring
   
-  #define ORIG_FAN_PIN           16 //5V PWM
+  #define ORIG_FAN_PIN          16  // 5V PWM
   
-  #define PS_ON_PIN         10 //Set to -1 if using a manual switch on the PWRSW Connector
-  #define SLEEP_WAKE_PIN    26 //This feature still needs work
+  #define PS_ON_PIN             10  // Set to -1 if using a manual switch on the PWRSW Connector
+  #define SLEEP_WAKE_PIN        26  // This feature still needs work
   
-  #define ORIG_HEATER_0_PIN      45 //12V PWM1
-  #define ORIG_HEATER_1_PIN      46 //12V PWM2
-  #define ORIG_HEATER_2_PIN      17 //12V PWM3
-  #define ORIG_HEATER_BED_PIN    44 //DOUBLE 12V PWM
-  #define ORIG_TEMP_0_PIN         3 //ANALOG NUMBERING
-  #define ORIG_TEMP_1_PIN         2 //ANALOG NUMBERING
-  #define ORIG_TEMP_2_PIN         1 //ANALOG NUMBERING
-  #define ORIG_TEMP_BED_PIN       0 //ANALOG NUMBERING
+  #define ORIG_HEATER_0_PIN     45  // 12V PWM1
+  #define ORIG_HEATER_1_PIN     46  // 12V PWM2
+  #define ORIG_HEATER_2_PIN     17  // 12V PWM3
+  #define ORIG_HEATER_BED_PIN   44  // DOUBLE 12V PWM
+  #define ORIG_TEMP_0_PIN       3   // ANALOG NUMBERING
+  #define ORIG_TEMP_1_PIN       2   // ANALOG NUMBERING
+  #define ORIG_TEMP_2_PIN       1   // ANALOG NUMBERING
+  #define ORIG_TEMP_BED_PIN     0   // ANALOG NUMBERING
   
   #define BEEPER_PIN            36
   
@@ -645,12 +645,12 @@
 
     #define BTN_EN1             14
     #define BTN_EN2             39
-    #define BTN_ENC         15  //the click
+    #define BTN_ENC             15  // the click
 
     #define BLEN_C              2
     #define BLEN_B              1
     #define BLEN_A              0
-  #endif //RA_CONTROL_PANEL
+  #endif // RA_CONTROL_PANEL
   
   #if ENABLED(RA_DISCO)
     //variables for which pins the TLC5947 is using
@@ -708,26 +708,26 @@
   // x axis
   #define ORIG_X_STEP_PIN       15
   #define ORIG_X_DIR_PIN        18
-  #define X_MIN_PIN 20
+  #define ORIG_X_MIN_PIN        20
   //Alex Checar #define X_STOP_PIN         20
-  #define ORIG_X_ENABLE_PIN 24 //actually uses ORIG_Y_DIR_PIN
-  #define X_MAX_PIN -1
+  #define ORIG_X_ENABLE_PIN     24  // actually uses ORIG_Y_DIR_PIN
+  #define ORIG_X_MAX_PIN        -1
 
   // y axes
   #define ORIG_Y_STEP_PIN       23
   #define ORIG_Y_DIR_PIN        22
-  #define Y_MIN_PIN 25
+  #define ORIG_Y_MIN_PIN        25
   //Alex Checar #define Y_STOP_PIN         25
-  #define ORIG_Y_ENABLE_PIN 24 //shared with ORIG_X_ENABLE_PIN
-  #define Y_MAX_PIN -1
+  #define ORIG_Y_ENABLE_PIN     24  // shared with ORIG_X_ENABLE_PIN
+  #define ORIG_Y_MAX_PIN        -1
 
   // z axes
   #define ORIG_Z_STEP_PIN       27
   #define ORIG_Z_DIR_PIN        28
-  #define Z_MIN_PIN 30
+  #define ORIG_Z_MIN_PIN        30
   //Alex Checar #define Z_STOP_PIN         30
   #define ORIG_Z_ENABLE_PIN     29
-  #define Z_MAX_PIN -1
+  #define ORIG_Z_MAX_PIN        -1
 
   //extruder pins
   #define ORIG_E0_STEP_PIN      12
@@ -779,20 +779,20 @@
   #define ORIG_X_STEP_PIN         26
   #define ORIG_X_DIR_PIN          28
   #define ORIG_X_ENABLE_PIN       24
-  #define X_MIN_PIN      3
-  #define X_MAX_PIN      2
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
   
   #define ORIG_Y_STEP_PIN         38
   #define ORIG_Y_DIR_PIN          40
   #define ORIG_Y_ENABLE_PIN       36
-  #define Y_MIN_PIN     16
-  #define Y_MAX_PIN     17
+  #define ORIG_Y_MIN_PIN          16
+  #define ORIG_Y_MAX_PIN          17
   
   #define ORIG_Z_STEP_PIN         44
   #define ORIG_Z_DIR_PIN          46
   #define ORIG_Z_ENABLE_PIN       42
-  #define Z_MIN_PIN     18
-  #define Z_MAX_PIN     19
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
   
   #define ORIG_E0_STEP_PIN        32
   #define ORIG_E0_DIR_PIN         34
@@ -823,9 +823,9 @@
   
   // SPI for Max6675 Thermocouple
   #if DISABLED(SDSUPPORT)
-    #define MAX6675_SS       66// Do not use pin 53 if there is even the remote possibility of using Display/SD card
+    #define MAX6675_SS            66  // Do not use pin 53 if there is even the remote possibility of using Display/SD card
   #else
-    #define MAX6675_SS       66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+    #define MAX6675_SS            66  // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
   #endif
   
   #if DISABLED(SDSUPPORT)
@@ -856,37 +856,36 @@
   
   #define LARGE_FLASH true
   
-  //X axis pins
+  // X axis pins
   #define ORIG_X_STEP_PIN         54
   #define ORIG_X_DIR_PIN          55
   #define ORIG_X_ENABLE_PIN       38
-  #define X_MIN_PIN                3
-  #define X_MAX_PIN                2
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
   
-  //Y axis pins
+  // Y axis pins
   #define ORIG_Y_STEP_PIN         60
   #define ORIG_Y_DIR_PIN          61
   #define ORIG_Y_ENABLE_PIN       56
-  #define Y_MIN_PIN               14
-  #define Y_MAX_PIN               15
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
   
   #define Y2_STEP_PIN             36
   #define Y2_DIR_PIN              34
   #define Y2_ENABLE_PIN           30
 
-  //Z axis pins
+  // Z axis pins
   #define ORIG_Z_STEP_PIN         46
   #define ORIG_Z_DIR_PIN          48
   #define ORIG_Z_ENABLE_PIN       62
-  #define Z_MIN_PIN               18
-  #define Z_MAX_PIN               19
-  #define Z_PROBE_PIN             19
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
 
   #define Z2_STEP_PIN             36
   #define Z2_DIR_PIN              34
   #define Z2_ENABLE_PIN           30
 
-  //E axis pins
+  // E axis pins
   #define ORIG_E0_STEP_PIN        26
   #define ORIG_E0_DIR_PIN         28
   #define ORIG_E0_ENABLE_PIN      24
@@ -950,7 +949,7 @@
         #define LCD_PINS_D5       25
         #define LCD_PINS_D6       27
         #define LCD_PINS_D7       29
-      #endif //PANEL_ONE
+      #endif // PANEL_ONE
   
       #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
         #define BEEPER_PIN        37
@@ -961,14 +960,14 @@
 
         #define SD_DETECT_PIN     49
       #elif ENABLED(LCD_I2C_PANELOLU2)
-        #define BTN_EN1       47  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           43
         #define BTN_ENC           32
         #define LCD_SDSS          53
         #define SD_DETECT_PIN     -1
         #define KILL_PIN          41
       #elif ENABLED(LCD_I2C_VIKI)
-        #define BTN_EN1       22  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           7
         #define BTN_ENC           -1
         #define LCD_SDSS          53
@@ -1003,7 +1002,7 @@
         #else
           #define BTN_EN1         37
           #define BTN_EN2         35
-          #define BTN_ENC     31  //the click
+          #define BTN_ENC         31  // the click
         #endif
   
         #if ENABLED(G3D_PANEL)
@@ -1014,9 +1013,9 @@
 
       #endif
   
-    #else //old style panel with shift register
-      //arduino pin witch triggers an piezzo beeper
-      #define BEEPER_PIN          33   //No Beeper added
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
 
       //buttons are attached to a shift register
       // Not wired this yet
@@ -1042,7 +1041,7 @@
     #define MOSI_PIN              51
     #define MAX6675_SS            66  // Do not use pin 53 if there is even the remote possibility of using Display/SD card
   #else
-    #define MAX6675_SS            66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+    #define MAX6675_SS            66  // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
   #endif
 
 #endif // RAMPS_13_HFB
@@ -1069,15 +1068,15 @@
   #define ORIG_X_STEP_PIN         54
   #define ORIG_X_DIR_PIN          55
   #define ORIG_X_ENABLE_PIN       38
-  #define X_MIN_PIN          3
-  #define X_MAX_PIN          2
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
 
   //Y axis pins
   #define ORIG_Y_STEP_PIN         60
   #define ORIG_Y_DIR_PIN          61
   #define ORIG_Y_ENABLE_PIN       56
-  #define Y_MIN_PIN         14
-  #define Y_MAX_PIN         15
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
 
   #define Y2_STEP_PIN             36
   #define Y2_DIR_PIN              34
@@ -1087,9 +1086,8 @@
   #define ORIG_Z_STEP_PIN         46
   #define ORIG_Z_DIR_PIN          48
   #define ORIG_Z_ENABLE_PIN       62
-  #define Z_MIN_PIN         18
-  #define Z_MAX_PIN         19
-  #define Z_PROBE_PIN       19
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
 
   #define Z2_STEP_PIN             36
   #define Z2_DIR_PIN              34
@@ -1153,7 +1151,7 @@
         #define LCD_PINS_D5       25
         #define LCD_PINS_D6       27
         #define LCD_PINS_D7       29
-      #endif //PANEL_ONE
+      #endif // PANEL_ONE
   
       #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
         #define BEEPER_PIN        37
@@ -1164,14 +1162,14 @@
 
         #define SD_DETECT_PIN     49
       #elif ENABLED(LCD_I2C_PANELOLU2)
-        #define BTN_EN1       47  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           43
         #define BTN_ENC           32
         #define LCD_SDSS          53
         #define SD_DETECT_PIN     -1
         #define KILL_PIN          41
       #elif ENABLED(LCD_I2C_VIKI)
-        #define BTN_EN1       22  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           7
         #define BTN_ENC           -1
         #define LCD_SDSS          53
@@ -1206,7 +1204,7 @@
         #else
           #define BTN_EN1         37
           #define BTN_EN2         35
-          #define BTN_ENC     31  //the click
+          #define BTN_ENC         31  // the click
         #endif
   
         #if ENABLED(G3D_PANEL)
@@ -1217,9 +1215,9 @@
 
       #endif
   
-    #else //old style panel with shift register
-      //arduino pin witch triggers an piezzo beeper
-      #define BEEPER_PIN          33   //No Beeper added
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
 
       //buttons are attached to a shift register
       // Not wired this yet
@@ -1272,15 +1270,15 @@
   #define ORIG_X_STEP_PIN         54
   #define ORIG_X_DIR_PIN          55
   #define ORIG_X_ENABLE_PIN       38
-  #define X_MIN_PIN              3
-  #define X_MAX_PIN              2
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
 
   //Y axis pins
   #define ORIG_Y_STEP_PIN         60
   #define ORIG_Y_DIR_PIN          61
   #define ORIG_Y_ENABLE_PIN       56
-  #define Y_MIN_PIN             14
-  #define Y_MAX_PIN             15
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
 
   #define Y2_STEP_PIN             36
   #define Y2_DIR_PIN              34
@@ -1290,9 +1288,8 @@
   #define ORIG_Z_STEP_PIN         46
   #define ORIG_Z_DIR_PIN          48
   #define ORIG_Z_ENABLE_PIN       62
-  #define Z_MIN_PIN             18
-  #define Z_MAX_PIN             19
-  #define Z_PROBE_PIN           19
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
 
   #define Z2_STEP_PIN             36
   #define Z2_DIR_PIN              34
@@ -1356,7 +1353,7 @@
         #define LCD_PINS_D5       25
         #define LCD_PINS_D6       27
         #define LCD_PINS_D7       29
-      #endif //PANEL_ONE
+      #endif // PANEL_ONE
   
       #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
         #define BEEPER_PIN        37
@@ -1367,14 +1364,14 @@
 
         #define SD_DETECT_PIN     49
       #elif ENABLED(LCD_I2C_PANELOLU2)
-        #define BTN_EN1         47  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           43
         #define BTN_ENC           32
         #define LCD_SDSS          53
         #define SD_DETECT_PIN     -1
         #define KILL_PIN          41
       #elif ENABLED(LCD_I2C_VIKI)
-        #define BTN_EN1         22  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           7
         #define BTN_ENC           -1
         #define LCD_SDSS          53
@@ -1409,7 +1406,7 @@
         #else
           #define BTN_EN1         37
           #define BTN_EN2         35
-          #define BTN_ENC     31  //the click
+          #define BTN_ENC         31  // the click
         #endif
   
         #if ENABLED(G3D_PANEL)
@@ -1420,9 +1417,9 @@
 
       #endif
   
-    #else //old style panel with shift register
-      //arduino pin witch triggers an piezzo beeper
-      #define BEEPER_PIN          33   //No Beeper added
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
 
       //buttons are attached to a shift register
       // Not wired this yet
@@ -1475,15 +1472,15 @@
   #define ORIG_X_STEP_PIN         54
   #define ORIG_X_DIR_PIN          55
   #define ORIG_X_ENABLE_PIN       38
-  #define X_MIN_PIN           3
-  #define X_MAX_PIN           2
+  #define ORIG_X_MIN_PIN           3
+  #define ORIG_X_MAX_PIN           2
 
   //Y axis pins
   #define ORIG_Y_STEP_PIN         60
   #define ORIG_Y_DIR_PIN          61
   #define ORIG_Y_ENABLE_PIN       56
-  #define Y_MIN_PIN          14
-  #define Y_MAX_PIN          15
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
 
   #define Y2_STEP_PIN             36
   #define Y2_DIR_PIN              34
@@ -1493,9 +1490,8 @@
   #define ORIG_Z_STEP_PIN         46
   #define ORIG_Z_DIR_PIN          48
   #define ORIG_Z_ENABLE_PIN       62
-  #define Z_MIN_PIN          18
-  #define Z_MAX_PIN          19
-  #define Z_PROBE_PIN        19
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
 
   #define Z2_STEP_PIN             36
   #define Z2_DIR_PIN              34
@@ -1559,7 +1555,7 @@
         #define LCD_PINS_D5       25
         #define LCD_PINS_D6       27
         #define LCD_PINS_D7       29
-      #endif //PANEL_ONE
+      #endif // PANEL_ONE
   
       #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
         #define BEEPER_PIN        37
@@ -1570,14 +1566,14 @@
 
         #define SD_DETECT_PIN     49
       #elif ENABLED(LCD_I2C_PANELOLU2)
-        #define BTN_EN1       47  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           43
         #define BTN_ENC           32
         #define LCD_SDSS          53
         #define SD_DETECT_PIN     -1
         #define KILL_PIN          41
       #elif ENABLED(LCD_I2C_VIKI)
-        #define BTN_EN1       22  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           7
         #define BTN_ENC           -1
         #define LCD_SDSS          53
@@ -1612,7 +1608,7 @@
         #else
           #define BTN_EN1         37
           #define BTN_EN2         35
-          #define BTN_ENC     31  //the click
+          #define BTN_ENC         31  // the click
         #endif
   
         #if ENABLED(G3D_PANEL)
@@ -1623,9 +1619,9 @@
 
       #endif
   
-    #else //old style panel with shift register
-      //arduino pin witch triggers an piezzo beeper
-      #define BEEPER_PIN          33   //No Beeper added
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
 
       //buttons are attached to a shift register
       // Not wired this yet
@@ -1678,15 +1674,15 @@
   #define ORIG_X_STEP_PIN         54
   #define ORIG_X_DIR_PIN          55
   #define ORIG_X_ENABLE_PIN       38
-  #define X_MIN_PIN           3
-  #define X_MAX_PIN           2
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
 
   //Y axis pins
   #define ORIG_Y_STEP_PIN         60
   #define ORIG_Y_DIR_PIN          61
   #define ORIG_Y_ENABLE_PIN       56
-  #define Y_MIN_PIN          14
-  #define Y_MAX_PIN          15
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
 
   #define Y2_STEP_PIN             36
   #define Y2_DIR_PIN              34
@@ -1696,9 +1692,8 @@
   #define ORIG_Z_STEP_PIN         46
   #define ORIG_Z_DIR_PIN          48
   #define ORIG_Z_ENABLE_PIN       62
-  #define Z_MIN_PIN          18
-  #define Z_MAX_PIN          19
-  #define Z_PROBE_PIN        18
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
 
   #define Z2_STEP_PIN             36
   #define Z2_DIR_PIN              34
@@ -1762,7 +1757,7 @@
         #define LCD_PINS_D5       25
         #define LCD_PINS_D6       27
         #define LCD_PINS_D7       29
-      #endif //PANEL_ONE
+      #endif // PANEL_ONE
   
       #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
         #define BEEPER_PIN        37
@@ -1773,14 +1768,14 @@
 
         #define SD_DETECT_PIN     49
       #elif ENABLED(LCD_I2C_PANELOLU2)
-        #define BTN_EN1       47  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           43
         #define BTN_ENC           32
         #define LCD_SDSS          53
         #define SD_DETECT_PIN     -1
         #define KILL_PIN          41
       #elif ENABLED(LCD_I2C_VIKI)
-        #define BTN_EN1       22  //reverse if the encoder turns the wrong way.
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
         #define BTN_EN2           7
         #define BTN_ENC           -1
         #define LCD_SDSS          53
@@ -1815,7 +1810,7 @@
         #else
           #define BTN_EN1         37
           #define BTN_EN2         35
-          #define BTN_ENC     31  //the click
+          #define BTN_ENC         31  // the click
         #endif
   
         #if ENABLED(G3D_PANEL)
@@ -1826,9 +1821,9 @@
 
       #endif
   
-    #else //old style panel with shift register
-      //arduino pin witch triggers an piezzo beeper
-      #define BEEPER_PIN          33   //No Beeper added
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
 
       //buttons are attached to a shift register
       // Not wired this yet
@@ -1878,24 +1873,24 @@
 
 #define ORIG_X_STEP_PIN 37
 #define ORIG_X_DIR_PIN 48
-#define X_MIN_PIN 12
-#define X_MAX_PIN 24
+#define ORIG_X_MIN_PIN 12
+#define ORIG_X_MAX_PIN 24
 #define ORIG_X_ENABLE_PIN 29
 #define X_MS1_PIN 40
 #define X_MS2_PIN 41
 
 #define ORIG_Y_STEP_PIN 36
 #define ORIG_Y_DIR_PIN 49
-#define Y_MIN_PIN 11
-#define Y_MAX_PIN 23
+#define ORIG_Y_MIN_PIN 11
+#define ORIG_Y_MAX_PIN 23
 #define ORIG_Y_ENABLE_PIN 28
 #define Y_MS1_PIN 69
 #define Y_MS2_PIN 39
 
 #define ORIG_Z_STEP_PIN 35
 #define ORIG_Z_DIR_PIN 47
-#define Z_MIN_PIN 10
-#define Z_MAX_PIN 30
+#define ORIG_Z_MIN_PIN 10
+#define ORIG_Z_MAX_PIN 30
 #define ORIG_Z_ENABLE_PIN 27
 #define Z_MS1_PIN 68
 #define Z_MS2_PIN 67
@@ -2075,12 +2070,12 @@
 #define ORIG_Z_DIR_PIN          3
 #define ORIG_Z_ENABLE_PIN       15
 
-#define X_MIN_PIN          28
-#define X_MAX_PIN          -1  // 34   //Max endstops default to disabled "-1", set to commented value to enable.
-#define Y_MIN_PIN          30
-#define Y_MAX_PIN          -1  // 36
-#define Z_MIN_PIN          32
-#define Z_MAX_PIN          -1  // 38
+#define ORIG_X_MIN_PIN          28
+#define ORIG_X_MAX_PIN          -1  // 34   //Max endstops default to disabled "-1", set to commented value to enable.
+#define ORIG_Y_MIN_PIN          30
+#define ORIG_Y_MAX_PIN          -1  // 36
+#define ORIG_Z_MIN_PIN          32
+#define ORIG_Z_MAX_PIN          -1  // 38
 
 #define ORIG_E0_STEP_PIN        61
 #define ORIG_E0_DIR_PIN         60
@@ -2201,20 +2196,20 @@
 #define ORIG_X_STEP_PIN         63
 #define ORIG_X_DIR_PIN          62
 #define ORIG_X_ENABLE_PIN       48
-#define X_MIN_PIN               22
-#define X_MAX_PIN               30
+#define ORIG_X_MIN_PIN               22
+#define ORIG_X_MAX_PIN               30
 
 #define ORIG_Y_STEP_PIN         65
 #define ORIG_Y_DIR_PIN          64
 #define ORIG_Y_ENABLE_PIN       46
-#define Y_MIN_PIN               24
-#define Y_MAX_PIN               38
+#define ORIG_Y_MIN_PIN               24
+#define ORIG_Y_MAX_PIN               38
 
 #define ORIG_Z_STEP_PIN         67
 #define ORIG_Z_DIR_PIN          66
 #define ORIG_Z_ENABLE_PIN       44
-#define Z_MIN_PIN               26
-#define Z_MAX_PIN               34
+#define ORIG_Z_MIN_PIN               26
+#define ORIG_Z_MAX_PIN               34
 
 #define ORIG_E0_STEP_PIN        36
 #define ORIG_E0_DIR_PIN         28
@@ -2325,22 +2320,22 @@
 #define ORIG_X_STEP_PIN     54
 #define ORIG_X_DIR_PIN      55
 #define ORIG_X_ENABLE_PIN   38
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
+#define ORIG_X_MIN_PIN           3
+#define ORIG_X_MAX_PIN           2
 
 
 #define ORIG_Y_STEP_PIN     60  
 #define ORIG_Y_DIR_PIN      61
 #define ORIG_Y_ENABLE_PIN   56
-#define Y_MIN_PIN           14
-#define Y_MAX_PIN           15
+#define ORIG_Y_MIN_PIN           14
+#define ORIG_Y_MAX_PIN           15
 
 
 #define ORIG_Z_STEP_PIN     46
 #define ORIG_Z_DIR_PIN      48
 #define ORIG_Z_ENABLE_PIN   62
-#define Z_MIN_PIN           18
-#define Z_MAX_PIN           19
+#define ORIG_Z_MIN_PIN           18
+#define ORIG_Z_MAX_PIN           19
 
 
 // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
@@ -2386,20 +2381,20 @@
 #define ORIG_X_STEP_PIN         54
 #define ORIG_X_DIR_PIN          55
 #define ORIG_X_ENABLE_PIN       38
-#define X_MIN_PIN               3
-#define X_MAX_PIN               2
+#define ORIG_X_MIN_PIN               3
+#define ORIG_X_MAX_PIN               2
 
 #define ORIG_Y_STEP_PIN         60
 #define ORIG_Y_DIR_PIN          61
 #define ORIG_Y_ENABLE_PIN       56
-#define Y_MIN_PIN               14
-#define Y_MAX_PIN               15
+#define ORIG_Y_MIN_PIN               14
+#define ORIG_Y_MAX_PIN               15
 
 #define ORIG_Z_STEP_PIN         46
 #define ORIG_Z_DIR_PIN          48
 #define ORIG_Z_ENABLE_PIN       62
-#define Z_MIN_PIN               18
-#define Z_MAX_PIN               19
+#define ORIG_Z_MIN_PIN               18
+#define ORIG_Z_MAX_PIN               19
 
 #define Y2_STEP_PIN             36
 #define Y2_DIR_PIN              34
@@ -2514,24 +2509,24 @@
 #define ORIG_X_STEP_PIN       96  // PB24
 #define ORIG_X_DIR_PIN         2  // PB25
 #define ORIG_X_ENABLE_PIN     24  // PA15, motor RESET pin
-#define X_MIN_PIN             33  // PC1
-#define X_MAX_PIN             34  // PC2
+#define ORIG_X_MIN_PIN             33  // PC1
+#define ORIG_X_MAX_PIN             34  // PC2
 #define X_MS1_PIN             99  // PC10
 
 // Y AXIS
 #define ORIG_Y_STEP_PIN       94  // PB22
 #define ORIG_Y_DIR_PIN        95  // PB23
 #define ORIG_Y_ENABLE_PIN     24  // PA15, motor RESET pin
-#define Y_MIN_PIN             35  // PC3
-#define Y_MAX_PIN             37  // PC5
+#define ORIG_Y_MIN_PIN             35  // PC3
+#define ORIG_Y_MAX_PIN             37  // PC5
 #define Y_MS1_PIN             10  // PC29
 
 // Z AXIS
 #define ORIG_Z_STEP_PIN       98  // PC27
 #define ORIG_Z_DIR_PIN         3  // PC28
 #define ORIG_Z_ENABLE_PIN     24  // PA15, motor RESET pin
-#define Z_MIN_PIN             38  // PC6
-#define Z_MAX_PIN             39  // PC7
+#define ORIG_Z_MIN_PIN             38  // PC6
+#define ORIG_Z_MAX_PIN             39  // PC7
 #define Z_MS1_PIN             44  // PC19
 
 // E0 AXIS
@@ -2846,20 +2841,20 @@
 #define ORIG_X_STEP_PIN         54
 #define ORIG_X_DIR_PIN          55
 #define ORIG_X_ENABLE_PIN       38
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
+#define ORIG_X_MIN_PIN           3
+#define ORIG_X_MAX_PIN           2
 
 #define ORIG_Y_STEP_PIN         60
 #define ORIG_Y_DIR_PIN          61
 #define ORIG_Y_ENABLE_PIN       56
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
+#define ORIG_Y_MIN_PIN          14
+#define ORIG_Y_MAX_PIN          15
 
 #define ORIG_Z_STEP_PIN         46
 #define ORIG_Z_DIR_PIN          48
 #define ORIG_Z_ENABLE_PIN       62
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define ORIG_Z_MIN_PIN          18
+#define ORIG_Z_MAX_PIN          19
 
 #define Y2_STEP_PIN             36
 #define Y2_DIR_PIN              34
@@ -3039,20 +3034,20 @@
 #define ORIG_X_STEP_PIN         54
 #define ORIG_X_DIR_PIN          55
 #define ORIG_X_ENABLE_PIN       38
-#define X_MIN_PIN               3
-#define X_MAX_PIN               2
+#define ORIG_X_MIN_PIN               3
+#define ORIG_X_MAX_PIN               2
 
 #define ORIG_Y_STEP_PIN         60
 #define ORIG_Y_DIR_PIN          61
 #define ORIG_Y_ENABLE_PIN       56
-#define Y_MIN_PIN               14
-#define Y_MAX_PIN               15
+#define ORIG_Y_MIN_PIN               14
+#define ORIG_Y_MAX_PIN               15
 
 #define ORIG_Z_STEP_PIN         46
 #define ORIG_Z_DIR_PIN          48
 #define ORIG_Z_ENABLE_PIN       62
-#define Z_MIN_PIN               18
-#define Z_MAX_PIN               19
+#define ORIG_Z_MIN_PIN               18
+#define ORIG_Z_MAX_PIN               19
 
 #define Y2_STEP_PIN             36
 #define Y2_DIR_PIN              34
@@ -3256,20 +3251,20 @@
 
 #define ORIG_X_STEP_PIN 25
 #define ORIG_X_DIR_PIN 23
-#define X_MIN_PIN 22
-#define X_MAX_PIN 24
+#define ORIG_X_MIN_PIN 22
+#define ORIG_X_MAX_PIN 24
 #define ORIG_X_ENABLE_PIN 27
 
 #define ORIG_Y_STEP_PIN 31
 #define ORIG_Y_DIR_PIN 33
-#define Y_MIN_PIN 26
-#define Y_MAX_PIN 28
+#define ORIG_Y_MIN_PIN 26
+#define ORIG_Y_MAX_PIN 28
 #define ORIG_Y_ENABLE_PIN 29
 
 #define ORIG_Z_STEP_PIN 37
 #define ORIG_Z_DIR_PIN 39
-#define Z_MIN_PIN 30
-#define Z_MAX_PIN 32
+#define ORIG_Z_MIN_PIN 30
+#define ORIG_Z_MAX_PIN 32
 #define ORIG_Z_ENABLE_PIN 35
 
 #define ORIG_HEATER_BED_PIN 4
@@ -3363,20 +3358,20 @@
 #define ORIG_X_STEP_PIN         26
 #define ORIG_X_DIR_PIN          28
 #define ORIG_X_ENABLE_PIN       24
-#define X_MIN_PIN          41
-#define X_MAX_PIN          37
+#define ORIG_X_MIN_PIN          41
+#define ORIG_X_MAX_PIN          37
 
 #define ORIG_Y_STEP_PIN         60 // A6
 #define ORIG_Y_DIR_PIN          61 // A7
 #define ORIG_Y_ENABLE_PIN       22
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
+#define ORIG_Y_MIN_PIN          14
+#define ORIG_Y_MAX_PIN          15
 
 #define ORIG_Z_STEP_PIN         54 // A0
 #define ORIG_Z_DIR_PIN          55 // A1
 #define ORIG_Z_ENABLE_PIN       56 // A2
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define ORIG_Z_MIN_PIN          18
+#define ORIG_Z_MAX_PIN          19
 
 #define ORIG_E0_STEP_PIN        31
 #define ORIG_E0_DIR_PIN         32
@@ -3462,20 +3457,20 @@
 #define ORIG_X_STEP_PIN 26
 #define ORIG_X_DIR_PIN 27
 #define ORIG_X_ENABLE_PIN 25
-#define X_MIN_PIN 37
-#define X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable.
+#define ORIG_X_MIN_PIN 37
+#define ORIG_X_MAX_PIN 40 //2 //Max endstops default to disabled "-1", set to commented value to enable.
 
 #define ORIG_Y_STEP_PIN 4 // A6
 #define ORIG_Y_DIR_PIN 54 // A0
 #define ORIG_Y_ENABLE_PIN 5
-#define Y_MIN_PIN 41
-#define Y_MAX_PIN 38 //15
+#define ORIG_Y_MIN_PIN 41
+#define ORIG_Y_MAX_PIN 38 //15
 
 #define ORIG_Z_STEP_PIN 56 // A2
 #define ORIG_Z_DIR_PIN 60 // A6
 #define ORIG_Z_ENABLE_PIN 55 // A1
-#define Z_MIN_PIN 18
-#define Z_MAX_PIN 19
+#define ORIG_Z_MIN_PIN 18
+#define ORIG_Z_MAX_PIN 19
 
 #define ORIG_E0_STEP_PIN 35
 #define ORIG_E0_DIR_PIN 36
@@ -3575,20 +3570,20 @@
   #define ORIG_X_STEP_PIN 48
   #define ORIG_X_DIR_PIN 47
   #define ORIG_X_ENABLE_PIN 49
-  #define X_MIN_PIN 5
-  #define X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable.
+  #define ORIG_X_MIN_PIN 5
+  #define ORIG_X_MAX_PIN -1 //2 //Max endstops default to disabled "-1", set to commented value to enable.
 
   #define ORIG_Y_STEP_PIN 39 // A6
   #define ORIG_Y_DIR_PIN 40 // A0
   #define ORIG_Y_ENABLE_PIN 38
-  #define Y_MIN_PIN 2
-  #define Y_MAX_PIN -1 //15
+  #define ORIG_Y_MIN_PIN 2
+  #define ORIG_Y_MAX_PIN -1 //15
 
   #define ORIG_Z_STEP_PIN 42 // A2
   #define ORIG_Z_DIR_PIN 43 // A6
   #define ORIG_Z_ENABLE_PIN 41 // A1
-  #define Z_MIN_PIN 6
-  #define Z_MAX_PIN -1
+  #define ORIG_Z_MIN_PIN 6
+  #define ORIG_Z_MAX_PIN -1
 
   #define ORIG_E0_STEP_PIN 45
   #define ORIG_E0_DIR_PIN 44
@@ -3669,20 +3664,20 @@
   #define ORIG_X_STEP_PIN         58
   #define ORIG_X_DIR_PIN          57
   #define ORIG_X_ENABLE_PIN       59
-  #define X_MIN_PIN               37
-  #define X_MAX_PIN               40   //2 //Max endstops default to disabled "-1", set to commented value to enable.
+  #define ORIG_X_MIN_PIN               37
+  #define ORIG_X_MAX_PIN               40   //2 //Max endstops default to disabled "-1", set to commented value to enable.
 
   #define ORIG_Y_STEP_PIN          5 // A6
   #define ORIG_Y_DIR_PIN          17 // A0
   #define ORIG_Y_ENABLE_PIN        4
-  #define Y_MIN_PIN               41
-  #define Y_MAX_PIN               38   //15
+  #define ORIG_Y_MIN_PIN               41
+  #define ORIG_Y_MAX_PIN               38   //15
 
   #define ORIG_Z_STEP_PIN         16 // A2
   #define ORIG_Z_DIR_PIN          11 // A6
   #define ORIG_Z_ENABLE_PIN       3 // A1
-  #define Z_MIN_PIN               18
-  #define Z_MAX_PIN               19
+  #define ORIG_Z_MIN_PIN               18
+  #define ORIG_Z_MAX_PIN               19
 
   #define ORIG_E0_STEP_PIN        28
   #define ORIG_E0_DIR_PIN         27
@@ -3799,20 +3794,20 @@
 
 #define ORIG_X_STEP_PIN 25
 #define ORIG_X_DIR_PIN 23
-#define X_MIN_PIN 15
-#define X_MAX_PIN 14
+#define ORIG_X_MIN_PIN 15
+#define ORIG_X_MAX_PIN 14
 #define ORIG_X_ENABLE_PIN 27
 
 #define ORIG_Y_STEP_PIN 31
 #define ORIG_Y_DIR_PIN 33
-#define Y_MIN_PIN 17
-#define Y_MAX_PIN 16
+#define ORIG_Y_MIN_PIN 17
+#define ORIG_Y_MAX_PIN 16
 #define ORIG_Y_ENABLE_PIN 29
 
 #define ORIG_Z_STEP_PIN 37
 #define ORIG_Z_DIR_PIN 39
-#define Z_MIN_PIN 19
-#define Z_MAX_PIN 18
+#define ORIG_Z_MIN_PIN 19
+#define ORIG_Z_MAX_PIN 18
 #define ORIG_Z_ENABLE_PIN 35
 
 #define ORIG_HEATER_BED_PIN -1
@@ -3962,20 +3957,20 @@
 #define ORIG_X_STEP_PIN         54
 #define ORIG_X_DIR_PIN          55
 #define ORIG_X_ENABLE_PIN       38
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
+#define ORIG_X_MIN_PIN           3
+#define ORIG_X_MAX_PIN           2
 
 #define ORIG_Y_STEP_PIN         60
 #define ORIG_Y_DIR_PIN          61
 #define ORIG_Y_ENABLE_PIN       56
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
+#define ORIG_Y_MIN_PIN          14
+#define ORIG_Y_MAX_PIN          15
 
 #define ORIG_Z_STEP_PIN         46
 #define ORIG_Z_DIR_PIN          48
 #define ORIG_Z_ENABLE_PIN       63
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          -1
+#define ORIG_Z_MIN_PIN          18
+#define ORIG_Z_MAX_PIN          -1
 
 #define Y2_STEP_PIN             36
 #define Y2_DIR_PIN              34
@@ -4085,20 +4080,20 @@
 #define ORIG_X_STEP_PIN         54
 #define ORIG_X_DIR_PIN          55
 #define ORIG_X_ENABLE_PIN       38
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
+#define ORIG_X_MIN_PIN           3
+#define ORIG_X_MAX_PIN           2
 
 #define ORIG_Y_STEP_PIN         60
 #define ORIG_Y_DIR_PIN          61
 #define ORIG_Y_ENABLE_PIN       56
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
+#define ORIG_Y_MIN_PIN          14
+#define ORIG_Y_MAX_PIN          15
 
 #define ORIG_Z_STEP_PIN         46
 #define ORIG_Z_DIR_PIN          48
 #define ORIG_Z_ENABLE_PIN       62
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          -1
+#define ORIG_Z_MIN_PIN          18
+#define ORIG_Z_MAX_PIN          -1
 
 #define Y2_STEP_PIN             36
 #define Y2_DIR_PIN              34
@@ -4289,14 +4284,14 @@
 #define ORIG_X_STEP_PIN         17
 #define ORIG_X_DIR_PIN          16
 #define ORIG_X_ENABLE_PIN       48
-#define X_MIN_PIN               37
-#define X_MAX_PIN               36
+#define ORIG_X_MIN_PIN               37
+#define ORIG_X_MAX_PIN               36
 
 #define ORIG_Y_STEP_PIN         54
 #define ORIG_Y_DIR_PIN          47
 #define ORIG_Y_ENABLE_PIN       55
-#define Y_MIN_PIN               35
-#define Y_MAX_PIN               34
+#define ORIG_Y_MIN_PIN               35
+#define ORIG_Y_MAX_PIN               34
 
 #define Y2_STEP_PIN             26
 #define Y2_DIR_PIN              25
@@ -4305,8 +4300,8 @@
 #define ORIG_Z_STEP_PIN         57
 #define ORIG_Z_DIR_PIN          56
 #define ORIG_Z_ENABLE_PIN       62
-#define Z_MIN_PIN               33
-#define Z_MAX_PIN               32
+#define ORIG_Z_MIN_PIN               33
+#define ORIG_Z_MAX_PIN               32
 
 #define Z2_STEP_PIN             26
 #define Z2_DIR_PIN              25
@@ -5006,20 +5001,20 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #define ORIG_X_STEP_PIN         28
 #define ORIG_X_DIR_PIN          63
 #define ORIG_X_ENABLE_PIN       29
-#define X_MIN_PIN          47
-#define X_MAX_PIN          -1   //2 //Max endstops default to disabled "-1", set to commented value to enable.
+#define ORIG_X_MIN_PIN          47
+#define ORIG_X_MAX_PIN          -1   //2 //Max endstops default to disabled "-1", set to commented value to enable.
 
 #define ORIG_Y_STEP_PIN         14 // A6
 #define ORIG_Y_DIR_PIN          15 // A0
 #define ORIG_Y_ENABLE_PIN       39
-#define Y_MIN_PIN          48
-#define Y_MAX_PIN          -1   //15
+#define ORIG_Y_MIN_PIN          48
+#define ORIG_Y_MAX_PIN          -1   //15
 
 #define ORIG_Z_STEP_PIN         31 // A2
 #define ORIG_Z_DIR_PIN          32 // A6
 #define ORIG_Z_ENABLE_PIN       30 // A1
-#define Z_MIN_PIN          49
-#define Z_MAX_PIN          -1
+#define ORIG_Z_MIN_PIN          49
+#define ORIG_Z_MAX_PIN          -1
 
 #define ORIG_E0_STEP_PIN        34  //34
 #define ORIG_E0_DIR_PIN         35 //35
@@ -5146,7 +5141,6 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 ********************************* END MOTHERBOARD ***************************************
 /****************************************************************************************/
 
-
 #ifndef ORIG_HEATER_1_PIN
   #define ORIG_HEATER_1_PIN -1
 #endif
@@ -5168,49 +5162,55 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 
 #if ENABLED(X_STOP_PIN)
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN X_STOP_PIN
-    #define X_MAX_PIN -1
+    #define ORIG_X_MIN_PIN X_STOP_PIN
+    #define ORIG_X_MAX_PIN -1
   #else
-    #define X_MIN_PIN -1
-    #define X_MAX_PIN X_STOP_PIN
+    #define ORIG_X_MIN_PIN -1
+    #define ORIG_X_MAX_PIN X_STOP_PIN
   #endif
 #endif
 
 #if ENABLED(Y_STOP_PIN)
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN Y_STOP_PIN
-    #define Y_MAX_PIN -1
+    #define ORIG_Y_MIN_PIN Y_STOP_PIN
+    #define ORIG_Y_MAX_PIN -1
   #else
-    #define Y_MIN_PIN -1
-    #define Y_MAX_PIN Y_STOP_PIN
+    #define ORIG_Y_MIN_PIN -1
+    #define ORIG_Y_MAX_PIN Y_STOP_PIN
   #endif
 #endif
 
 #if ENABLED(Z_STOP_PIN)
   #if Z_HOME_DIR < 0
-    #define Z_MIN_PIN Z_STOP_PIN
-    #define Z_MAX_PIN -1
+    #define ORIG_Z_MIN_PIN Z_STOP_PIN
+    #define ORIG_Z_MAX_PIN -1
   #else
-    #define Z_MIN_PIN -1
-    #define Z_MAX_PIN Z_STOP_PIN
+    #define ORIG_Z_MIN_PIN -1
+    #define ORIG_Z_MAX_PIN Z_STOP_PIN
   #endif
 #endif
 
-#if X_HOME_DIR > 0        //Home X to MAX
+
+/****************************************************************************************/
+#include "Configuration_Pins.h"
+/****************************************************************************************/
+
+
+#if X_HOME_DIR > 0    // Home X to MAX
   #define X_MIN_PIN -1
-#elif X_HOME_DIR < 0      //Home X to MIN
+#elif X_HOME_DIR < 0  // Home X to MIN
   #define X_MAX_PIN -1
 #endif //X_HOME_DIR > 0
 
-#if Y_HOME_DIR > 0        //Home Y to MAX
+#if Y_HOME_DIR > 0    // Home Y to MAX
   #define Y_MIN_PIN -1
-#elif Y_HOME_DIR < 0      //Home Y to MIN
+#elif Y_HOME_DIR < 0  // Home Y to MIN
   #define Y_MAX_PIN -1
 #endif //Y_HOME_DIR > 0
 
-#if Z_HOME_DIR > 0      //Home Z to MAX
+#if Z_HOME_DIR > 0    // Home Z to MAX
   #define Z_MIN_PIN -1
-#elif Z_HOME_DIR < 0    //Home Z to MIN
+#elif Z_HOME_DIR < 0  // Home Z to MIN
   #define Z_MAX_PIN -1
 #endif //Z_HOME_DIR > 0
 
@@ -5248,40 +5248,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #endif
 /****************************************************************************************/
 
-#if HOTENDS == 1
-  #undef ORIG_HEATER_1_PIN
-  #undef ORIG_HEATER_2_PIN
-  #undef ORIG_HEATER_3_PIN
-  #define ORIG_HEATER_1_PIN  -1
-  #define ORIG_HEATER_2_PIN  -1
-  #define ORIG_HEATER_3_PIN  -1
-  #undef ORIG_TEMP_1_PIN
-  #undef ORIG_TEMP_2_PIN
-  #undef ORIG_TEMP_3_PIN
-  #define ORIG_TEMP_1_PIN    -1
-  #define ORIG_TEMP_2_PIN    -1
-  #define ORIG_TEMP_3_PIN    -1
-#elif HOTENDS == 2
-  #undef ORIG_HEATER_2_PIN
-  #undef ORIG_HEATER_3_PIN
-  #define ORIG_HEATER_2_PIN  -1
-  #define ORIG_HEATER_3_PIN  -1
-  #undef ORIG_TEMP_2_PIN
-  #undef ORIG_TEMP_3_PIN
-  #define ORIG_TEMP_2_PIN    -1
-  #define ORIG_TEMP_3_PIN    -1
-#elif HOTENDS == 3
-  #undef ORIG_HEATER_3_PIN
-  #define ORIG_HEATER_3_PIN  -1
-  #undef ORIG_TEMP_3_PIN
-  #define ORIG_TEMP_3_PIN    -1
-#endif
-
-/****************************************************************************************/
-#include "Configuration_Pins.h"
-/****************************************************************************************/
-
-//List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
+// List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
 #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, HEATER_0_PIN, analogInputToDigitalPin(TEMP_0_PIN),
 
 #if DRIVER_EXTRUDERS > 1

MarlinKimbra/stepper.cpp

@@ -570,18 +570,25 @@ void set_stepper_direction() {
   
   #if DISABLED(ADVANCE) && ENABLED(DONDOLO)
     if (TEST(out_bits, E_AXIS)) {
-      if (active_extruder == 0)
+      if (active_extruder == 0) {
         REV_E_DIR();
-      else
+        count_direction[E_AXIS] = -1;
+      }
+      else {
         NORM_E_DIR();
         count_direction[E_AXIS] = -1;
+      }
+    }
     else {
-      if (active_extruder == 0)
+      if (active_extruder == 0) {
         NORM_E_DIR();
-      else
+        count_direction[E_AXIS] = 1;
+      }
+      else {
         REV_E_DIR();
         count_direction[E_AXIS] = 1;
       }
+    }
   #elif DISABLED(ADVANCE)
     if (TEST(out_bits, E_AXIS)) {
       REV_E_DIR();