From ad8eb5b947c9586e4c2e21196ee13ebfb94478a9 Mon Sep 17 00:00:00 2001 From: Eddie Ehlin Date: Fri, 1 Apr 2022 19:38:14 +0200 Subject: Revered order of diff --- .../Configuration.h.diff | 34 +++++++++++----------- .../Configuration_adv.h.diff | 10 +++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration.h.diff b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration.h.diff index c856f09..0d60c7d 100644 --- a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration.h.diff +++ b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration.h.diff @@ -1,13 +1,13 @@ diff --git a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration.h b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration.h -index 96a82a9..44c9f11 100644 +index 44c9f11..96a82a9 100644 --- a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration.h +++ b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration.h @@ -1033,7 +1033,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ --//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN -+#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN ++//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -15,38 +15,38 @@ index 96a82a9..44c9f11 100644 * Use G29 repeatedly, adjusting the Z height at each point with movement commands * or (with LCD_BED_LEVELING) the LCD controller. */ --#define PROBE_MANUALLY -+//#define PROBE_MANUALLY +-//#define PROBE_MANUALLY ++#define PROBE_MANUALLY /** * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. -@@ -1182,8 +1182,7 @@ +@@ -1182,7 +1182,8 @@ * | [-] | * O-- FRONT --+ */ --//#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } Only of interest with BLTouch --#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 } -+#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } +-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } ++//#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } Only of interest with BLTouch ++#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 } // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -@@ -1558,7 +1557,7 @@ +@@ -1557,7 +1558,7 @@ * these options to restore the prior leveling state or to always enable * leveling immediately after G28. */ --#define RESTORE_LEVELING_AFTER_G28 -+//#define RESTORE_LEVELING_AFTER_G28 +-//#define RESTORE_LEVELING_AFTER_G28 ++#define RESTORE_LEVELING_AFTER_G28 //#define ENABLE_LEVELING_AFTER_G28 /** -@@ -1668,8 +1667,8 @@ +@@ -1667,8 +1668,8 @@ //=================================== Mesh ================================== //=========================================================================== -- #define MESH_INSET 35 // Set Mesh bounds as an inset region of the bed -- #define GRID_MAX_POINTS_X 4 // Don't use more than 7 points per axis, implementation limited. -+ #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed -+ #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. +- #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed +- #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. ++ #define MESH_INSET 35 // Set Mesh bounds as an inset region of the bed ++ #define GRID_MAX_POINTS_X 4 // Don't use more than 7 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS diff --git a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration_adv.h.diff b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration_adv.h.diff index 6f444c9..a5f88de 100644 --- a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration_adv.h.diff +++ b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/manual-probe-with-mesh-leveling/Configuration_adv.h.diff @@ -1,13 +1,13 @@ diff --git a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration_adv.h b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration_adv.h -index 09db032..172088a 100644 +index 172088a..09db032 100644 --- a/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration_adv.h +++ b/marlinfw-skr-e3-mini-v2/config-2.0.9.3/Configuration_adv.h @@ -508,7 +508,7 @@ * The fan turns on automatically whenever any driver is enabled and turns * off (or reduces to idle speed) shortly after drivers are turned off. */ --//#define USE_CONTROLLER_FAN Disabled since we are using FAN1 pin for extruder fan. -+#define USE_CONTROLLER_FAN +-#define USE_CONTROLLER_FAN ++//#define USE_CONTROLLER_FAN Disabled since we are using FAN1 pin for extruder fan. #if ENABLED(USE_CONTROLLER_FAN) //#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan //#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered @@ -15,8 +15,8 @@ index 09db032..172088a 100644 * Multiple extruders can be assigned to the same pin in which case * the fan will turn on when any selected extruder is above the threshold. */ --#define E0_AUTO_FAN_PIN FAN1_PIN //Extruder fan on FAN1 pin -+#define E0_AUTO_FAN_PIN -1 +-#define E0_AUTO_FAN_PIN -1 ++#define E0_AUTO_FAN_PIN FAN1_PIN //Extruder fan on FAN1 pin #define E1_AUTO_FAN_PIN -1 #define E2_AUTO_FAN_PIN -1 #define E3_AUTO_FAN_PIN -1 -- cgit v1.2.3