From 41c4f060d584ab6452db5010b34a917e2a214437 Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Thu, 26 Aug 2021 13:51:13 -0500 Subject: [PATCH] adding filament runout and working on offsets --- Marlin/Configuration.h | 117 ++++++++--------------- Marlin/Configuration_adv.h | 22 +---- Marlin/src/pins/rambo/pins_EINSY_RETRO.h | 6 ++ 3 files changed, 52 insertions(+), 93 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f3d0a9185..add2a57d6 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1555,7 +1555,15 @@ #if defined (LULZBOT_BLTouch) #define PROBING_MARGIN 10 #else - #define PROBING_MARGIN -3 + #if ENABLED(MiniV2) + #define PROBING_MARGIN -10 + #elif ENABLED(TAZ6) + #define PROBING_MARGIN -10 + #elif ENABLED(Workhorse) + #define PROBING_MARGIN -10 + #else + #define PROBING_MARGIN -3 + #endif #endif // X and Y axis travel speed (mm/min) between probes #define XY_PROBE_FEEDRATE (200*60) @@ -1774,97 +1782,54 @@ #define X_BED_SIZE 154 #define Y_BED_SIZE 154 // Travel limits (mm) after homing, corresponding to endstop positions. - #if defined (TOOLHEAD_M175) - #define LULZBOT_X_MIN_POS -12 - #define LULZBOT_Y_MIN_POS -15 - #define LULZBOT_Z_MIN_POS 0 - #define LULZBOT_X_MAX_POS 166 - #define LULZBOT_Y_MAX_POS 182 - #define LULZBOT_Z_MAX_POS 184 - #else - #define LULZBOT_X_MIN_POS -7 - #define LULZBOT_Y_MIN_POS -5 - #define LULZBOT_Z_MIN_POS 0 - #define LULZBOT_X_MAX_POS 168 - #define LULZBOT_Y_MAX_POS 192 - #define LULZBOT_Z_MAX_POS 183 - #endif + #define LULZBOT_X_MIN_POS -7 + #define LULZBOT_Y_MIN_POS -5 + #define LULZBOT_Z_MIN_POS 0 + #define LULZBOT_X_MAX_POS 168 + #define LULZBOT_Y_MAX_POS 192 + #define LULZBOT_Z_MAX_POS 183 #elif ENABLED(TAZ6) - #define X_BED_SIZE 280.4 - #define Y_BED_SIZE 281.4 + #define X_BED_SIZE 280 + #define Y_BED_SIZE 280 // Travel limits (mm) after homing, corresponding to endstop positions. - #if defined (TOOLHEAD_M175) - #define LULZBOT_X_MIN_POS -28.1 - #define LULZBOT_Y_MIN_POS -32.1 - #define LULZBOT_Z_MIN_POS 0 - #define LULZBOT_X_MAX_POS 293.5 - #define LULZBOT_Y_MAX_POS 292.5 - #define LULZBOT_Z_MAX_POS 271 - #else - #define LULZBOT_X_MIN_POS -22.1 - #define LULZBOT_Y_MIN_POS -22.1 - #define LULZBOT_Z_MIN_POS 0 - #define LULZBOT_X_MAX_POS 299.5 - #define LULZBOT_Y_MAX_POS 302.5 - #define LULZBOT_Z_MAX_POS 270 - #endif + #define LULZBOT_X_MIN_POS -21.6 + #define LULZBOT_Y_MIN_POS -15.6 + #define LULZBOT_Z_MIN_POS 0 + #define LULZBOT_X_MAX_POS 299.5 + #define LULZBOT_Y_MAX_POS 302.5 + #define LULZBOT_Z_MAX_POS 270 #elif ENABLED(Workhorse) #define X_BED_SIZE 280 #define Y_BED_SIZE 280 // Travel limits (mm) after homing, corresponding to endstop positions. - #if defined (TOOLHEAD_M175) - #define LULZBOT_X_MIN_POS -57 - #define LULZBOT_Y_MIN_POS -29 - #define LULZBOT_Z_MIN_POS -2 - #define LULZBOT_X_MAX_POS 290 - #define LULZBOT_Y_MAX_POS 298 - #define LULZBOT_Z_MAX_POS 298 - #else - #define LULZBOT_X_MIN_POS -50 - #define LULZBOT_Y_MIN_POS -17 - #define LULZBOT_Z_MIN_POS -2 - #define LULZBOT_X_MAX_POS 295 - #define LULZBOT_Y_MAX_POS 308 - #define LULZBOT_Z_MAX_POS 299 - #endif + #define LULZBOT_X_MIN_POS -50 + #define LULZBOT_Y_MIN_POS -17 + #define LULZBOT_Z_MIN_POS -2 + #define LULZBOT_X_MAX_POS 295 + #define LULZBOT_Y_MAX_POS 308 + #define LULZBOT_Z_MAX_POS 299 #elif ENABLED(TAZPro) #define X_BED_SIZE 281 #define Y_BED_SIZE 283 // Travel limits (mm) after homing, corresponding to endstop positions. - #if defined (TOOLHEAD_M175) - #define LULZBOT_X_MIN_POS -9-13 - #define LULZBOT_Y_MIN_POS -23 - #define LULZBOT_X_MAX_POS 308 - #define LULZBOT_Y_MAX_POS 303 307 - #define LULZBOT_Z_MIN_POS -9 - #define LULZBOT_Z_MAX_POS 298 - #else - #define LULZBOT_X_MIN_POS -1 - #define LULZBOT_Y_MIN_POS -13 - #define LULZBOT_X_MAX_POS 313 - #define LULZBOT_Y_MAX_POS 315 - #define LULZBOT_Z_MIN_POS -9 - #define LULZBOT_Z_MAX_POS 299 - #endif + #define LULZBOT_X_MIN_POS -1 + #define LULZBOT_Y_MIN_POS -13 + #define LULZBOT_X_MAX_POS 313 + #define LULZBOT_Y_MAX_POS 315 + #define LULZBOT_Z_MIN_POS -9 + #define LULZBOT_Z_MAX_POS 299 #elif ENABLED(TAZProXT) #define X_BED_SIZE 281 #define Y_BED_SIZE 283 // Travel limits (mm) after homing, corresponding to endstop positions. - #if defined (TOOLHEAD_M175) - #define LULZBOT_X_MIN_POS -9 - #define LULZBOT_Y_MIN_POS -18 - #define LULZBOT_X_MAX_POS 308 - #define LULZBOT_Y_MAX_POS 298 - #else - #define LULZBOT_X_MIN_POS -1 - #define LULZBOT_Y_MIN_POS -13 - #define LULZBOT_X_MAX_POS 313 - #define LULZBOT_Y_MAX_POS 315 - #endif + #define LULZBOT_X_MIN_POS -1 + #define LULZBOT_Y_MIN_POS -13 + #define LULZBOT_X_MAX_POS 313 + #define LULZBOT_Y_MAX_POS 315 #define LULZBOT_Z_MIN_POS -1 #define LULZBOT_Z_MAX_POS 600 @@ -2284,8 +2249,8 @@ #if ENABLED(Z_SAFE_HOMING) #if ENABLED(TAZ6) - #define Z_SAFE_HOMING_X_POINT -22 // X point for Z homing - #define Z_SAFE_HOMING_Y_POINT 259 // Y point for Z homing + #define Z_SAFE_HOMING_X_POINT -21.6 // X point for Z homing + #define Z_SAFE_HOMING_Y_POINT 263.5 // Y point for Z homing #elif ANY(Sidekick_289, Sisdekick_747) #define Z_SAFE_HOMING_X_POINT (X_CENTER) // X point for Z homing #define Z_SAFE_HOMING_Y_POINT (Y_BED_SIZE/2) // Y point for Z homing diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f177d6f1a..1ee2a0ee2 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1988,22 +1988,10 @@ * the probe to be unable to reach any points. */ #if PROBE_SELECTED && !IS_KINEMATIC - #if ENABLED(MiniV2) - #define PROBING_MARGIN_LEFT -5.0 - #define PROBING_MARGIN_RIGHT -10.0 - #define PROBING_MARGIN_FRONT -5.0 - #define PROBING_MARGIN_BACK -10.0 - #elif ENABLED(TAZ6) - #define PROBING_MARGIN_LEFT -10.0 - #define PROBING_MARGIN_RIGHT -8.0 - #define PROBING_MARGIN_FRONT -9.0 - #define PROBING_MARGIN_BACK -11.1 - #elif ANY(Workhorse, TAZPro, TAZProXT) - #define PROBING_MARGIN_LEFT -8 - #define PROBING_MARGIN_RIGHT -9 - #define PROBING_MARGIN_FRONT -10 - #define PROBING_MARGIN_BACK -9 - #endif + //#define PROBING_MARGIN_LEFT -5.0 + //#define PROBING_MARGIN_RIGHT -10.0 + //#define PROBING_MARGIN_FRONT -5.0 + //#define PROBING_MARGIN_BACK -10.0 #endif #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) @@ -3889,7 +3877,7 @@ #endif // Custom Menu: Configuration Menu -#define CUSTOM_MENU_CONFIG +//#define CUSTOM_MENU_CONFIG #if ENABLED(CUSTOM_MENU_CONFIG) //#define CUSTOM_MENU_CONFIG_TITLE "Custom Commands" #define CUSTOM_MENU_CONFIG_SCRIPT_DONE "M117 Wireless Script Done" diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h index 0c072745d..cdce979a0 100644 --- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h +++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h @@ -84,6 +84,12 @@ #define Z_MIN_PIN 10 #endif + // + // Filament runnout sensor + // + #if ENABLED(FILAMENT_RUNOUT_SENSOR) + #define FIL_RUNOUT_PIN 12 //X- + #endif #endif #define Z_MAX_PIN 7