diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index c3a9c424b..e4d645219 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -109,7 +109,7 @@ #define LULZBOT_USE_AUTOLEVELING #define LULZBOT_USE_MIN_ENDSTOPS #define LULZBOT_USE_MAX_ENDSTOPS - #define LULZBOT_USE_NORMALLY_OPEN_ENDSTOPS + #define LULZBOT_USE_NORMALLY_CLOSED_ENDSTOPS #define LULZBOT_BAUDRATE 250000 #define LULZBOT_PRINTCOUNTER #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f" @@ -127,7 +127,7 @@ #define LULZBOT_USE_AUTOLEVELING #define LULZBOT_USE_MIN_ENDSTOPS #define LULZBOT_USE_MAX_ENDSTOPS - #define LULZBOT_USE_NORMALLY_OPEN_ENDSTOPS + #define LULZBOT_USE_NORMALLY_CLOSED_ENDSTOPS #define LULZBOT_BAUDRATE 250000 #define LULZBOT_PRINTCOUNTER #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f" @@ -252,6 +252,10 @@ #undef LULZBOT_USE_HOME_BUTTON #endif +// Whether endstops are inverting +#define LULZBOT_NORMALLY_CLOSED_ENDSTOP false +#define LULZBOT_NORMALLY_OPEN_ENDSTOP true + #if defined(LULZBOT_IS_MINI) && defined(LULZBOT_USE_EINSYRAMBO) // Experimental Mini retrofitted with EinsyRambo from UltiMachine #define LULZBOT_MOTHERBOARD BOARD_EINSYRAMBO @@ -523,7 +527,7 @@ #define LULZBOT_LCD_TOOLHEAD_NAME "Single Extruder" // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "SingleExtruder" - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_AO_Hexagon #define LULZBOT_E_STEPS 833 #endif /* TOOLHEAD_Gladiola_SingleExtruder */ @@ -532,7 +536,7 @@ #define LULZBOT_LCD_TOOLHEAD_NAME "Flexystruder" // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "Flexystruder" - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_AO_Hexagon #define LULZBOT_E_STEPS 833 #endif /* TOOLHEAD_Albatross_Flexystruder */ @@ -542,7 +546,7 @@ #define LULZBOT_LCD_TOOLHEAD_NAME "Aerostruder" // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "Aerostruder" - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_E3D_Titan_Aero #define LULZBOT_E_STEPS 420 #endif /* TOOLHEAD_Finch_Aerostruder */ @@ -568,7 +572,7 @@ // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "SingleExtruder" #define LULZBOT_MOTOR_CURRENT_E 750 // mA - #define LULZBOT_X_MAX_ENDSTOP_INVERTING false + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP #define LULZBOT_AO_Hexagon #define LULZBOT_E_STEPS 830 #endif /* TOOLHEAD_Tilapia_SingleExtruder */ @@ -579,7 +583,7 @@ // 16 chars max ^^^^^^^^^^^^^^^ #define LULZBOT_M115_EXTRUDER_TYPE "Aerostruder" #define LULZBOT_MOTOR_CURRENT_E 875 // mA - #define LULZBOT_X_MAX_ENDSTOP_INVERTING false + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP #define LULZBOT_E3D_Titan_Aero #define LULZBOT_E_STEPS 420 #endif /* TOOLHEAD_Angelfish_Aerostruder */ @@ -590,7 +594,7 @@ #define LULZBOT_M115_EXTRUDER_TYPE "Flexystruder" #define LULZBOT_MOTOR_CURRENT_E 410 // mA #define LULZBOT_EXTRUDERS 1 - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_TOOLHEAD_X_MAX_ADJ 12 #define LULZBOT_TOOLHEAD_X_MIN_ADJ 7 #define LULZBOT_TOOLHEAD_Y_MAX_ADJ 1 @@ -613,7 +617,7 @@ #define LULZBOT_DEFAULT_TRAVEL_ACCELERATION 250 #define LULZBOT_MOTOR_CURRENT_E 750 // mA #define LULZBOT_EXTRUDERS 1 - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_TOOLHEAD_X_MAX_ADJ 10 #define LULZBOT_TOOLHEAD_X_MIN_ADJ 0 #define LULZBOT_TOOLHEAD_Y_MAX_ADJ 0 @@ -656,7 +660,7 @@ #define LULZBOT_TOOLHEAD_WIPE_X2_ADJ 0 #define LULZBOT_TOOLHEAD_WIPE_Y1_ADJ 0 #define LULZBOT_TOOLHEAD_WIPE_Y2_ADJ 48 - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_E_STEPS 830 #define LULZBOT_AO_Hexagon #endif /* TOOLHEAD_Javelin_DualExtruderV2 */ @@ -669,7 +673,7 @@ #define LULZBOT_TOOLHEAD_WIPE_X2_ADJ 0 #define LULZBOT_TOOLHEAD_WIPE_Y1_ADJ 0 #define LULZBOT_TOOLHEAD_WIPE_Y2_ADJ 48 - #define LULZBOT_X_MAX_ENDSTOP_INVERTING true + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_E_STEPS 830 #define LULZBOT_AO_Hexagon #endif /* TOOLHEAD_Longfin_FlexyDually */ @@ -703,7 +707,7 @@ #endif /* LULZBOT_USE_HOME_BUTTON */ #undef LULZBOT_TOOLHEAD_X_MAX_ADJ #define LULZBOT_TOOLHEAD_X_MAX_ADJ 10 - #define LULZBOT_X_MAX_ENDSTOP_INVERTING false + #define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP #define LULZBOT_SWAP_EXTRUDERS #undef LULZBOT_INVERT_E1_DIR #define LULZBOT_INVERT_E1_DIR false @@ -976,26 +980,26 @@ // TAZ 6+ and Huerfano Mini onwards use normally closed endstops. // This is safer, as a loose connector or broken wire will halt // the axis - #define LULZBOT_X_MIN_ENDSTOP_INVERTING false - #define LULZBOT_Y_MIN_ENDSTOP_INVERTING false - #define LULZBOT_Z_MIN_ENDSTOP_INVERTING true - #define LULZBOT_Z_MIN_PROBE_ENDSTOP_INVERTING true + #define LULZBOT_X_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP + #define LULZBOT_Y_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP // LULZBOT_X_MAX_ENDSTOP_INVERTING varies by toolhead - #define LULZBOT_Y_MAX_ENDSTOP_INVERTING false - #define LULZBOT_Z_MAX_ENDSTOP_INVERTING false + #define LULZBOT_Y_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP + #define LULZBOT_Z_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_CLOSED_ENDSTOP #elif defined(LULZBOT_USE_NORMALLY_OPEN_ENDSTOPS) - #define LULZBOT_X_MIN_ENDSTOP_INVERTING true - #define LULZBOT_Y_MIN_ENDSTOP_INVERTING true - #define LULZBOT_Z_MIN_ENDSTOP_INVERTING true - #define LULZBOT_Z_MIN_PROBE_ENDSTOP_INVERTING true + #define LULZBOT_X_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + #define LULZBOT_Y_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP // LULZBOT_X_MAX_ENDSTOP_INVERTING varies by toolhead - #define LULZBOT_Y_MAX_ENDSTOP_INVERTING true - #define LULZBOT_Z_MAX_ENDSTOP_INVERTING true + #define LULZBOT_Y_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + #define LULZBOT_Z_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #endif +// Electrical probing pins are always open until contact is made +#define LULZBOT_Z_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP +#define LULZBOT_Z_MIN_PROBE_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + /******************************* SENSORLESS HOMING ******************************/ #if defined(LULZBOT_USE_EINSYRAMBO) @@ -1168,14 +1172,12 @@ #define LULZBOT_USE_ZMIN_PLUG #define LULZBOT_USE_ZMAX_PLUG - #define LULZBOT_X_MIN_ENDSTOP_INVERTING true - //#define LULZBOT_X_MAX_ENDSTOP_INVERTING true - #define LULZBOT_Y_MAX_ENDSTOP_INVERTING true - //#define LULZBOT_Y_MIN_ENDSTOP_INVERTING true + #define LULZBOT_X_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + //#define LULZBOT_X_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + #define LULZBOT_Y_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP + //#define LULZBOT_Y_MIN_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP - #define LULZBOT_Z_MAX_ENDSTOP_INVERTING true - #define LULZBOT_Z_MIN_ENDSTOP_INVERTING true - #define LULZBOT_Z_MIN_PROBE_ENDSTOP_INVERTING true + #define LULZBOT_Z_MAX_ENDSTOP_INVERTING LULZBOT_NORMALLY_OPEN_ENDSTOP #define LULZBOT_X_HOME_BUMP_MM 0 #define LULZBOT_Y_HOME_BUMP_MM 0