Same fix

MarlinKimbra/Configuration.h

@@ -72,7 +72,7 @@
 // This defines the number of extruder real or virtual
 #define EXTRUDERS 1
 
-// This is used for singlenozzled multiple extrusion configuration
+// This is used for single nozzle and multiple extrusion configuration
 // Uncomment below to enable (One Hotend)
 //#define SINGLENOZZLE
 
@@ -80,16 +80,15 @@
  *********************** Multiextruder MKR4  ***************************
  ***********************************************************************
  *                                                                     *
- * Setting for more extruder width rele system                         *
+ * Setting for more extruder width relay system                         *
  *                                                                     *
  * Firmware by MagoKimbra magokimbra@hotmail.com                       *
  *                                                                     *
- * See pins.h for pin command rele                                     *
+ * See pins.h for pin command relay                                     *
  *                                                                     *
  ***********************************************************************/
 //#define MKR4
 #ifdef MKR4
-  #define DELAY_R 500          // Delay for switch rele
   #define DRIVER_EXTRUDERS 2   // This defines the number of Driver extruder
 #endif // END MKR4
 

MarlinKimbra/Configuration_Cartesian.h

@@ -29,7 +29,7 @@
 #define ENDSTOPPULLUP_EMIN
 #endif
 
-// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
+// The pullups are needed if you directly connect a mechanical end switch between the signal and ground pins.
 const bool X_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Y_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Z_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
@@ -37,21 +37,29 @@ const bool E_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 const bool X_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Y_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
-//#define DISABLE_MAX_ENDSTOPS
-//#define DISABLE_MIN_ENDSTOPS
+
+// ENDSTOP SETTINGS:
+// Sets direction of endstop when homing; 1=MAX, -1=MIN
+#define X_HOME_DIR -1
+#define Y_HOME_DIR -1
+#define Z_HOME_DIR -1
+#define E_HOME_DIR -1
+
+#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
+#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
 
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
 #define X_ENABLE_ON 0
 #define Y_ENABLE_ON 0
 #define Z_ENABLE_ON 0
-#define E_ENABLE_ON 0      // For all extruders
+#define E_ENABLE_ON 0      // For all extruder
 
 // Disables axis when it's not being used.
 #define DISABLE_X false
 #define DISABLE_Y false
 #define DISABLE_Z false
-#define DISABLE_E false      // For all extruders
-#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruders and keep active extruder enabled
+#define DISABLE_E false      // For all extruder
+#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruder and keep active extruder enabled
 
 #define INVERT_X_DIR false      // for Mendel set to false, for Orca set to true
 #define INVERT_Y_DIR false      // for Mendel set to true, for Orca set to false
@@ -61,16 +69,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define INVERT_E2_DIR false     // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E3_DIR false     // for direct drive extruder v9 set to true, for geared extruder set to false
 
-// ENDSTOP SETTINGS:
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
-#define X_HOME_DIR -1
-#define Y_HOME_DIR -1
-#define Z_HOME_DIR -1
-#define E_HOME_DIR -1
-
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
-
 // Travel limits after homing
 #define X_MAX_POS 200
 #define X_MIN_POS 0
@@ -145,11 +143,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define Z_RAISE_BEFORE_HOMING 10      // (in mm) Raise Z before homing (G28) for Probe Clearance.
 // Be sure you have this distance over your Z_MAX_POS in case
 
-#define Z_RAISE_BEFORE_PROBING 10    //How much the extruder will be raised before traveling to the first probing point.
-#define Z_RAISE_BETWEEN_PROBINGS 5   //How much the extruder will be raised when traveling from between next probing points
+#define Z_RAISE_BEFORE_PROBING 10    //How much the extruder will be raised before travelling to the first probing point.
+#define Z_RAISE_BETWEEN_PROBINGS 5   //How much the extruder will be raised when travelling from between next probing points
 
 //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
-//#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
+//#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pick up the sled. 0 should be fine but you can push it further if you'd like.
 
 //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
 //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
@@ -158,13 +156,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define PROBE_SERVO_DEACTIVATION_DELAY 300
 
 
-//If you have enabled the Auto Bed Leveling and are using the same Z Probe for Z Homing,
+//If you have enabled the Auto Bed Levelling and are using the same Z Probe for Z Homing,
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
 
 #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with probe outside the bed area.
                         // When defined, it will:
                         // - Allow Z homing only after X and Y homing AND stepper drivers still enabled
-                        // - If stepper drivers timeout, it will need X and Y homing again before Z homing
+                        // - If stepper drivers time out, it will need X and Y homing again before Z homing
                         // - Position the probe in a defined XY point before Z Homing when homing all axis (G28)
                         // - Block Z homing only when the probe is outside bed area.
 
@@ -228,8 +226,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
 #define DEFAULT_XYJERK 10.0    // (mm/sec)
-#define DEFAULT_ZJERK 0.4      // (mm/sec)
-#define DEFAULT_EJERK 5.0      // (mm/sec)
+#define DEFAULT_ZJERK   0.4    // (mm/sec)
+#define DEFAULT_EJERK   5.0    // (mm/sec)
 
 //===========================================================================
 //=============================Additional Features===========================

MarlinKimbra/Configuration_Corexy.h

@@ -29,7 +29,7 @@
 #define ENDSTOPPULLUP_EMIN
 #endif
 
-// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
+// The pullups are needed if you directly connect a mechanical end switch between the signal and ground pins.
 const bool X_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Y_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Z_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
@@ -37,26 +37,29 @@ const bool E_MIN_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 const bool X_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Y_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
 const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the logic of the endstop.
-#define DISABLE_MAX_ENDSTOPS
-//#define DISABLE_MIN_ENDSTOPS
 
-// Disable max endstops for compatibility with endstop checking routine
-#if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS)
-#define DISABLE_MAX_ENDSTOPS
-#endif
+// ENDSTOP SETTINGS:
+// Sets direction of endstop when homing; 1=MAX, -1=MIN
+#define X_HOME_DIR -1
+#define Y_HOME_DIR -1
+#define Z_HOME_DIR -1
+#define E_HOME_DIR -1
+
+#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
+#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
 
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
 #define X_ENABLE_ON 0
 #define Y_ENABLE_ON 0
 #define Z_ENABLE_ON 0
-#define E_ENABLE_ON 0      // For all extruders
+#define E_ENABLE_ON 0      // For all extruder
 
 // Disables axis when it's not being used.
 #define DISABLE_X false
 #define DISABLE_Y false
 #define DISABLE_Z false
-#define DISABLE_E false      // For all extruders
-#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruders and keep active extruder enabled
+#define DISABLE_E false      // For all extruder
+#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruder and keep active extruder enabled
 
 #define INVERT_X_DIR false      // for Mendel set to false, for Orca set to true
 #define INVERT_Y_DIR false      // for Mendel set to true, for Orca set to false
@@ -66,16 +69,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 #define INVERT_E2_DIR false     // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E3_DIR false     // for direct drive extruder v9 set to true, for geared extruder set to false
 
-// ENDSTOP SETTINGS:
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
-#define X_HOME_DIR -1
-#define Y_HOME_DIR -1
-#define Z_HOME_DIR -1
-#define E_HOME_DIR -1
-
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
-
 // Travel limits after homing
 #define X_MAX_POS 200
 #define X_MIN_POS 0

MarlinKimbra/Configuration_Delta.h

@@ -68,6 +68,15 @@ const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
 const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
 
+// ENDSTOP SETTINGS:
+// Sets direction of endstop when homing; 1=MAX, -1=MIN
+#define X_HOME_DIR 1 //DELTA MUST HAVE MAX ENDSTOP
+#define Y_HOME_DIR 1 //DELTA MUST HAVE MAX ENDSTOP
+#define Z_HOME_DIR 1 //DELTA MUST HAVE MAX ENDSTOP
+
+#define min_software_endstops true  // If true, axis won't move to coordinates less than HOME_POS.
+#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
+
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
 #define X_ENABLE_ON 0
 #define Y_ENABLE_ON 0
@@ -79,7 +88,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define DISABLE_Y false
 #define DISABLE_Z false
 #define DISABLE_E false      // For all extruder
-#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruder and keep active extruder enabled
+#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruder and keep active extruder enabled
 
 
 #define INVERT_X_DIR false
@@ -89,15 +98,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define INVERT_E1_DIR false      // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E2_DIR false      // for direct drive extruder v9 set to true, for geared extruder set to false
 
-// ENDSTOP SETTINGS:
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
-#define X_HOME_DIR 1
-#define Y_HOME_DIR 1
-#define Z_HOME_DIR 1
-
-#define min_software_endstops true  // If true, axis won't move to coordinates less than HOME_POS.
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
-
 // The position of the homing switches
 #define MANUAL_HOME_POSITIONS  // If defined, MANUAL_*_HOME_POS below will be used
 #define BED_CENTER_AT_0_0      // If defined, the center of the bed is at (X=0, Y=0)
@@ -130,10 +130,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define DEFAULT_RETRACTION_MAX_FEEDRATE {150,150,150,150}             // E0, E1, E2, E3 (mm/sec)
 #define DEFAULT_MAX_ACCELERATION {2000,2000,2000,1000,1000,1000,1000} // X, Y, Z, E0, E1, E2, E3 maximum start speed for accelerated moves.
 
-#define DEFAULT_ACCELERATION 1000          // X, Y, Z and E max acceleration in mm/s^2 for printing moves
+#define DEFAULT_ACCELERATION         1000  // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION 2500  // X, Y, Z and E max acceleration in mm/s^2 for retracts
 
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
 #define DEFAULT_XYJERK 20  // (mm/sec)
-#define DEFAULT_ZJERK 20   // (mm/sec)
-#define DEFAULT_EJERK 5    // (mm/sec)
+#define DEFAULT_ZJERK  20  // (mm/sec)
+#define DEFAULT_EJERK   5  // (mm/sec)

MarlinKimbra/Configuration_Scara.h

@@ -53,7 +53,7 @@
 #define ENDSTOPPULLUP_EMIN
 #endif
 
-// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
+// The pullups are needed if you directly connect a mechanical end switch between the signal and ground pins.
 const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
@@ -61,21 +61,29 @@ const bool E_MIN_ENDSTOP_INVERTING = false;// set to true to invert the logic of
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
-//#define DISABLE_MAX_ENDSTOPS
-//#define DISABLE_MIN_ENDSTOPS
+
+// ENDSTOP SETTINGS:
+// Sets direction of endstop when homing; 1=MAX, -1=MIN
+#define X_HOME_DIR 1
+#define Y_HOME_DIR 1
+#define Z_HOME_DIR -1
+#define E_HOME_DIR -1
+
+#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
+#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
 
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
 #define X_ENABLE_ON 0
 #define Y_ENABLE_ON 0
 #define Z_ENABLE_ON 0
-#define E_ENABLE_ON 0      // For all extruders
+#define E_ENABLE_ON 0      // For all extruder
 
 // Disables axis when it's not being used.
 #define DISABLE_X false
 #define DISABLE_Y false
 #define DISABLE_Z false
-#define DISABLE_E false      // For all extruders
-#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruders and keep active extruder enabled
+#define DISABLE_E false      // For all extruder
+#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruder and keep active extruder enabled
 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
@@ -84,16 +92,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 
-// ENDSTOP SETTINGS:
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
-#define X_HOME_DIR 1
-#define Y_HOME_DIR 1
-#define Z_HOME_DIR -1
-#define E_HOME_DIR -1
-
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
-
 // Travel limits after homing
 #define X_MAX_POS 200
 #define X_MIN_POS 0

MarlinKimbra/Marlin_main.cpp

@@ -440,7 +440,7 @@ static uint8_t tmp_extruder;
 
 bool Stopped = false;
 #if defined(PAUSE_PIN) && PAUSE_PIN > -1
-  bool paused = false;
+  bool paused = true;
 #endif
 
 #if NUM_SERVOS > 0
@@ -6224,10 +6224,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
   #endif
 
   #if defined(PAUSE_PIN) && PAUSE_PIN > -1
-    if (READ(PAUSE_PIN) == 0 && !paused)
-    {
-      pause();
-    }
+    pause();
   #endif //defined(PAUSE_PIN) && PAUSE_PIN > -1
 
   #if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1
@@ -6299,11 +6296,18 @@ void kill()
 void pause()
 {
   #if defined(PAUSE_PIN) && PAUSE_PIN > -1
-    paused=true;
-    enquecommand("M600");
-    enquecommand("G4 P0");
-    enquecommand("G4 P0");
-    enquecommand("G4 P0");
+    if (READ(PAUSE_PIN) == 0 && !paused)
+    {
+      paused = true;
+      enquecommand("M600");
+      enquecommand("G4 P0");
+      enquecommand("G4 P0");
+      enquecommand("G4 P0");
+    }
+    else if (READ(PAUSE_PIN) == 1 && paused)
+    {
+      paused = false;
+    }
   #endif // defined(PAUSE_PIN) && PAUSE_PIN > -1
 }
 

MarlinKimbra/dogm_lcd_implementation.h

@@ -199,7 +199,7 @@ static void lcd_implementation_status_screen() {
 
     u8g.setPrintPos(80,47);
     if (starttime != 0) {
-      uint16_t time = millis()/60000 - starttime/60000;
+      uint16_t time = (millis() - starttime) / 60000;
       u8g.print(itostr2(time/60));
       u8g.print(':');
       u8g.print(itostr2(time%60));
@@ -210,26 +210,25 @@ static void lcd_implementation_status_screen() {
   #endif
  
   // Extruders
-  _draw_heater_status(6, 0);
-  #if EXTRUDERS > 1
-    _draw_heater_status(31, 1);
-    #if EXTRUDERS > 2
-      _draw_heater_status(55, 2);
-    #endif
-  #endif
+  for (int i=0; i<EXTRUDERS; i++) _draw_heater_status(6 + i * 25, i);
 
   // Heatbed
-  _draw_heater_status(81, -1);
+  if (EXTRUDERS < 4) _draw_heater_status(81, -1);
  
   // Fan
   u8g.setFont(FONT_STATUSMENU);
   u8g.setPrintPos(104,27);
   #if defined(FAN_PIN) && FAN_PIN > -1
-    u8g.print(itostr3(int((fanSpeed*100)/256 + 1)));
-    u8g.print("%");
-  #else
-    u8g.print("---");
+    int per = ((fanSpeed + 1) * 100) / 256;
+    if (per) {
+      u8g.print(itostr3(per));
+      u8g.print("%");
+    }
+    else
   #endif
+    {
+      u8g.print("---");
+    }
 
   // X, Y, Z-Coordinates
   u8g.setFont(FONT_STATUSMENU);

MarlinKimbra/firmware_test.h

@@ -87,10 +87,10 @@ void FirmwareTest(){
       return;
     }
 #elif X_HOME_DIR == -1
-    SERIAL_ECHOLN("ATTENZIONE! X_HOME_DIR = -1, ma e' definito DISABLE_MIN_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! X_MIN_PIN not defined");
     return;
 #elif X_HOME_DIR == 1
-    SERIAL_ECHOLN("ATTENZIONE! X_HOME_DIR = 1, ma e' definito DISABLE_MAX_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! X_MAX_PIN not defined");
     return;
 #endif
 
@@ -155,10 +155,10 @@ void FirmwareTest(){
       return;
     }
 #elif Y_HOME_DIR == -1
-    SERIAL_ECHOLN("ATTENZIONE! Y_HOME_DIR = -1, ma e' definito DISABLE_MIN_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! Y_MIN_PIN not defined");
     return;
 #elif Y_HOME_DIR == 1
-    SERIAL_ECHOLN("ATTENZIONE! Y_HOME_DIR = 1, ma e' definito DISABLE_MAX_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! Y_MAX_PIN not defined");
     return;
 #endif
 
@@ -223,10 +223,10 @@ void FirmwareTest(){
       return;
     }
 #elif Z_HOME_DIR == -1
-    SERIAL_ECHOLN("ATTENZIONE! Z_HOME_DIR = -1, ma e' definito DISABLE_MIN_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! Z_MIN_PIN not defined");
     return;
 #elif Z_HOME_DIR == 1
-    SERIAL_ECHOLN("ATTENZIONE! Z_HOME_DIR = 1, ma e' definito DISABLE_MAX_ENDSTOPS");
+    SERIAL_ECHOLN("ERROR!!! Z_MAX_PIN not defined");
     return;
 #endif
 

MarlinKimbra/pins.h

@@ -918,7 +918,7 @@
     // FMM added for Filament Extruder
     //define analog pin for the filament width sensor input
     //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-    #define FILWIDTH_PIN           5
+    #define FILWIDTH_PIN           5   // ANALOG NUMBERING
   #endif
   
   #if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
@@ -1113,7 +1113,7 @@
     // FMM added for Filament Extruder
     //define analog pin for the filament width sensor input
     //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-    #define FILWIDTH_PIN           5
+    #define FILWIDTH_PIN           5   // ANALOG NUMBERING
   #endif
   
   #if NUM_SERVOS > 0
@@ -1302,7 +1302,7 @@
     // FMM added for Filament Extruder
     //define analog pin for the filament width sensor input
     //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-    #define FILWIDTH_PIN           5
+    #define FILWIDTH_PIN           5   // ANALOG NUMBERING
   #endif
   
   #if NUM_SERVOS > 0
@@ -1491,7 +1491,7 @@
     // FMM added for Filament Extruder
     //define analog pin for the filament width sensor input
     //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-    #define FILWIDTH_PIN           5
+    #define FILWIDTH_PIN           5   // ANALOG NUMBERING
   #endif
   
   #if NUM_SERVOS > 0
@@ -4390,12 +4390,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #endif //MKR4
 
 #ifdef NPR2
-  #ifdef DELTA
-    #define E_MIN_PIN          3  // Use pin ORIG_X_MIN_PIN
-  #else  // NO DELTA
-    #define ORIG_Z_MAX_PIN          -1 // Use pin ORIG_Z_MAX_PIN
-    #define E_MIN_PIN          19
-  #endif //DELTA
+  #define E_MIN_PIN           19
 #endif //NPR2
 
 #ifdef LASERBEAM
@@ -4404,7 +4399,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #endif
 
 #ifdef FILAMENT_END_SWITCH
-  #define PAUSE_PIN          5
+  #define PAUSE_PIN           19
 #endif
 /****************************************************************************************/
 
@@ -4464,26 +4459,27 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
   #endif
 #endif
 
-#ifdef DISABLE_MAX_ENDSTOPS
-  #define ORIG_X_MAX_PIN          -1
-  #define ORIG_Y_MAX_PIN          -1
-  #define ORIG_Z_MAX_PIN          -1
-#endif
-
-#ifdef DISABLE_MIN_ENDSTOPS
+#if X_HOME_DIR > 0        //Home X to MAX
   #define ORIG_X_MIN_PIN          -1
-  #define ORIG_Y_MIN_PIN          -1
-  #define ORIG_Z_MIN_PIN          -1
-#endif
+#else                     //Home X to MIN
+  #define ORIG_X_MAX_PIN          -1
+#endif //X_HOME_DIR > 0
 
-#ifdef DELTA
-  #define ORIG_X_MIN_PIN          -1
+#if Y_HOME_DIR > 0        //Home Y to MAX
   #define ORIG_Y_MIN_PIN          -1
-#endif
-
+#else                     //Home Y to MIN
+  #define ORIG_Y_MAX_PIN          -1
+#endif //Y_HOME_DIR > 0
 
+#ifndef DELTA
+  #if Z_HOME_DIR > 0      //Home Z to MAX
+    #define ORIG_Z_MIN_PIN        -1
+  #else                   //Home Z to MIN
+    #define ORIG_Z_MAX_PIN        -1
+  #endif //Z_HOME_DIR > 0
+#endif //!DELTA
 
-// Original pin assignmats to be used in configuration tool
+// Original pin assignation to be used in configuration tool
 #define X_STEP_PIN ORIG_X_STEP_PIN
 #define X_DIR_PIN ORIG_X_DIR_PIN
 #define X_ENABLE_PIN ORIG_X_ENABLE_PIN

MarlinKimbra/stepper.h

@@ -98,12 +98,10 @@ void microstep_readings();
 
 #ifdef BABYSTEPPING
   void babystep(const uint8_t axis,const bool direction); // perform a short step with a single stepper motor, outside of any convention
-#endif
+#endif //BABYSTEPPING
 
-// Add for MagoKimbra
-#ifdef NPR2
+#ifdef NPR2 //Multiextruder
   void colorstep(long csteps,const bool direction);
-#endif
-
+#endif //NPR2
 
-#endif
+#endif //stepper_h
\ No newline at end of file