From aa455e1daed7032befd635f4f6e38168e41b48a9 Mon Sep 17 00:00:00 2001 From: j-laird Date: Thu, 23 Jul 2015 01:03:14 -0700 Subject: [PATCH 1/2] Proposed changes to probe points for M212 values > 10 or < -10 Adjustment of probe points (+/- 10 mm from min and max points on edge of bed) to support M212 values > 10 or < -10. Specifically, the need to have M212 X25 for the Metal Plus. --- Marlin/Configuration.h | 8 ++++---- Marlin/language.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5505a655f119..7040d5a5fc2c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -325,10 +325,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #ifdef ENABLE_AUTO_BED_LEVELING // these are the positions on the bed to do the probing - #define LEFT_PROBE_BED_POSITION 10 - #define RIGHT_PROBE_BED_POSITION X_MAX_LENGTH-10 - #define BACK_PROBE_BED_POSITION Y_MAX_LENGTH-10 - #define FRONT_PROBE_BED_POSITION 10 + #define LEFT_PROBE_BED_POSITION (bed_level_probe_offset[0] <= 10 ? 10 : bed_level_probe_offset[0]) + #define RIGHT_PROBE_BED_POSITION (bed_level_probe_offset[0] >= -10 ? X_MAX_LENGTH - 10 : X_MAX_LENGTH + bed_level_probe_offset[0]) + #define BACK_PROBE_BED_POSITION (bed_level_probe_offset[1] >= -10 ? Y_MAX_LENGTH - 10 : Y_MAX_LENGTH + bed_level_probe_offset[1]) + #define FRONT_PROBE_BED_POSITION (bed_level_probe_offset[1] <= 10 ? 10 : bed_level_probe_offset[1]) // these are the offsets to the prob relative to the extruder tip (Hotend - Probe) #define X_PROBE_OFFSET_FROM_EXTRUDER_DEFAULT 5 diff --git a/Marlin/language.h b/Marlin/language.h index 33b97efc6b27..82ca1f5601d0 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -22,7 +22,7 @@ #endif #define PROTOCOL_VERSION "1.0" -#define FIRMWARE_NAME "PB Marlin Rev F v3" +#define FIRMWARE_NAME "PB Marlin Rev F v4" #if MOTHERBOARD == 7 || MOTHERBOARD == 71 || MOTHERBOARD == 72 #define MACHINE_NAME "Ultimaker" From cb6b367d9e417806ed388625931ee1f0e5e0520d Mon Sep 17 00:00:00 2001 From: j-laird Date: Fri, 24 Jul 2015 01:02:26 -0700 Subject: [PATCH 2/2] Set default probe offset to allow safe default on Metal Plus Per request from Nick @ PBHQ, setting default X offset to prevent off-bed probing during G29 and subsequent nozzle gouging of the bed. --- Marlin/Configuration.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7040d5a5fc2c..0febbecc724c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -324,14 +324,15 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #ifdef ENABLE_AUTO_BED_LEVELING - // these are the positions on the bed to do the probing + // these are the positions on the bed to do the probing. + // NOTE: if the absolute value of the probe offset (x,y directions) is > 10, we have to move probe points inboard on that axis. #define LEFT_PROBE_BED_POSITION (bed_level_probe_offset[0] <= 10 ? 10 : bed_level_probe_offset[0]) #define RIGHT_PROBE_BED_POSITION (bed_level_probe_offset[0] >= -10 ? X_MAX_LENGTH - 10 : X_MAX_LENGTH + bed_level_probe_offset[0]) #define BACK_PROBE_BED_POSITION (bed_level_probe_offset[1] >= -10 ? Y_MAX_LENGTH - 10 : Y_MAX_LENGTH + bed_level_probe_offset[1]) #define FRONT_PROBE_BED_POSITION (bed_level_probe_offset[1] <= 10 ? 10 : bed_level_probe_offset[1]) - // these are the offsets to the prob relative to the extruder tip (Hotend - Probe) - #define X_PROBE_OFFSET_FROM_EXTRUDER_DEFAULT 5 + // these are the offsets to the prob relative to the extruder tip (Hotend - Probe). Default below prevents Metal Plus from probing off-bed. + #define X_PROBE_OFFSET_FROM_EXTRUDER_DEFAULT 20 #define Y_PROBE_OFFSET_FROM_EXTRUDER_DEFAULT 0 #define Z_PROBE_OFFSET_FROM_EXTRUDER_DEFAULT 0