aboutsummaryrefslogtreecommitdiffstats
path: root/marlinfw
diff options
context:
space:
mode:
authorEddie Ehlin <eddiex@eddiex.se>2021-05-20 14:14:26 +0200
committerEddie Ehlin <eddiex@eddiex.se>2021-05-20 14:14:26 +0200
commitb36c3814375c528738d2c59d742f9bc95859b4ca (patch)
tree692f53597a1dcc1da9b4d999f33cd91c85297d9e /marlinfw
parentaa2690e2f15dee7e35ed1eb962c9dee656c8ac2f (diff)
download3DPrinter-CR10S-b36c3814375c528738d2c59d742f9bc95859b4ca.tar.gz
3DPrinter-CR10S-b36c3814375c528738d2c59d742f9bc95859b4ca.zip
Re-added necessary changes for enabling BLTouch (merged from config made in 2.0.8
Diffstat (limited to 'marlinfw')
-rw-r--r--marlinfw/config-2.0.8.1/Configuration.h14
-rw-r--r--marlinfw/config-2.0.8.1/Configuration_adv.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/marlinfw/config-2.0.8.1/Configuration.h b/marlinfw/config-2.0.8.1/Configuration.h
index 22aabe3..7ce1dd8 100644
--- a/marlinfw/config-2.0.8.1/Configuration.h
+++ b/marlinfw/config-2.0.8.1/Configuration.h
@@ -942,7 +942,7 @@
* 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
/**
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
@@ -965,7 +965,7 @@
/**
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
-//#define BLTOUCH
+#define BLTOUCH
/**
* Touch-MI Probe by hotends.fr
@@ -1057,11 +1057,11 @@
* | [-] |
* O-- FRONT --+
*/
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#define NOZZLE_TO_PROBE_OFFSET { -45, -9, 0} // Z usually -2.58
// 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.
-#define PROBING_MARGIN 10
+#define PROBING_MARGIN 20
// X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_FEEDRATE (133*60)
@@ -1108,7 +1108,7 @@
* A total of 2 does fast/slow probes with a weighted average.
* A total of 3 or more adds more slow probes, taking the average.
*/
-//#define MULTIPLE_PROBING 2
+#define MULTIPLE_PROBING 2
//#define EXTRA_PROBING 1
/**
@@ -1130,7 +1130,7 @@
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done
-#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
+#define Z_PROBE_LOW_POINT -3 // Farthest distance below the trigger-point to go before stopping
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
@@ -1590,7 +1590,7 @@
// - Move the Z probe (or nozzle) to a defined XY point before Z Homing.
// - Prevent Z homing when the Z probe is outside bed area.
//
-//#define Z_SAFE_HOMING
+#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT 150 // X point for Z homing
diff --git a/marlinfw/config-2.0.8.1/Configuration_adv.h b/marlinfw/config-2.0.8.1/Configuration_adv.h
index 92ab057..8ae44d6 100644
--- a/marlinfw/config-2.0.8.1/Configuration_adv.h
+++ b/marlinfw/config-2.0.8.1/Configuration_adv.h
@@ -1162,7 +1162,7 @@
// Add Probe Z Offset calibration to the Z Probe Offsets menu
#if HAS_BED_PROBE
- //#define PROBE_OFFSET_WIZARD
+ #define PROBE_OFFSET_WIZARD
#if ENABLED(PROBE_OFFSET_WIZARD)
//
// Enable to init the Probe Z-Offset when starting the Wizard.
@@ -1815,10 +1815,10 @@
//#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
- //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
+ #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
- //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
+ #define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#endif
#endif