From d7d4378481e980186004bbbdd1f451376aa44792 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 29 Apr 2017 04:23:58 -0500 Subject: [PATCH 1/3] Remove inaccurate version description --- Marlin/Configuration.h | 12 ------------ Marlin/Configuration_adv.h | 12 ------------ .../example_configurations/Cartesio/Configuration.h | 12 ------------ .../Cartesio/Configuration_adv.h | 12 ------------ Marlin/example_configurations/Felix/Configuration.h | 12 ------------ .../example_configurations/Felix/Configuration_adv.h | 12 ------------ .../Felix/DUAL/Configuration.h | 12 ------------ .../FolgerTech-i3-2020/Configuration.h | 12 ------------ .../FolgerTech-i3-2020/Configuration_adv.h | 12 ------------ .../example_configurations/Hephestos/Configuration.h | 12 ------------ .../Hephestos/Configuration_adv.h | 12 ------------ .../Hephestos_2/Configuration.h | 12 ------------ .../Hephestos_2/Configuration_adv.h | 12 ------------ Marlin/example_configurations/K8200/Configuration.h | 12 ------------ .../example_configurations/K8200/Configuration_adv.h | 12 ------------ Marlin/example_configurations/K8400/Configuration.h | 12 ------------ .../example_configurations/K8400/Configuration_adv.h | 12 ------------ .../K8400/Dual-head/Configuration.h | 12 ------------ .../RepRapWorld/Megatronics/Configuration.h | 12 ------------ .../example_configurations/RigidBot/Configuration.h | 12 ------------ .../RigidBot/Configuration_adv.h | 12 ------------ Marlin/example_configurations/SCARA/Configuration.h | 12 ------------ .../example_configurations/SCARA/Configuration_adv.h | 12 ------------ Marlin/example_configurations/TAZ4/Configuration.h | 12 ------------ .../example_configurations/TAZ4/Configuration_adv.h | 12 ------------ .../example_configurations/TinyBoy2/Configuration.h | 12 ------------ .../TinyBoy2/Configuration_adv.h | 12 ------------ Marlin/example_configurations/WITBOX/Configuration.h | 12 ------------ .../WITBOX/Configuration_adv.h | 12 ------------ .../adafruit/ST7565/Configuration.h | 12 ------------ .../delta/FLSUN/auto_calibrate/Configuration.h | 12 ------------ .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 12 ------------ .../delta/FLSUN/kossel_mini/Configuration.h | 12 ------------ .../delta/FLSUN/kossel_mini/Configuration_adv.h | 12 ------------ .../delta/generic/Configuration.h | 12 ------------ .../delta/generic/Configuration_adv.h | 12 ------------ .../delta/kossel_mini/Configuration.h | 12 ------------ .../delta/kossel_mini/Configuration_adv.h | 12 ------------ .../delta/kossel_pro/Configuration.h | 12 ------------ .../delta/kossel_pro/Configuration_adv.h | 12 ------------ .../delta/kossel_xl/Configuration.h | 12 ------------ .../delta/kossel_xl/Configuration_adv.h | 12 ------------ .../gCreate_gMax1.5+/Configuration.h | 12 ------------ .../gCreate_gMax1.5+/Configuration_adv.h | 12 ------------ .../example_configurations/makibox/Configuration.h | 12 ------------ .../makibox/Configuration_adv.h | 12 ------------ .../tvrrug/Round2/Configuration.h | 12 ------------ .../tvrrug/Round2/Configuration_adv.h | 12 ------------ Marlin/example_configurations/wt150/Configuration.h | 12 ------------ .../example_configurations/wt150/Configuration_adv.h | 12 ------------ 50 files changed, 600 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 603627fc0..3ee77bb27 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index afad3eaa8..8ec840985 100755 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 54bc667cc..0b169fce8 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index 86826d36e..0980413c6 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index e9eb6c884..92179c6cc 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index c7b37ce91..8ddb5dde1 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index b64969d5f..ec661e9e6 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h index fcca1e01b..8d0b83d4a 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index 2225b761a..7f803b2bd 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 43b66aa16..8faaec46a 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 45206ef5f..13af7304a 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 76db2d1dc..dd2d1dfe3 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 19ef14cb5..c123e4526 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index e52e7509c..c30946b23 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 /** diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index d87896b02..ad96b02b9 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -41,18 +41,6 @@ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index c015a797d..37ea17026 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index 509ee750d..a435d0663 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index b8333c67b..f32e25cb7 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 54371f08f..83973dcfd 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 06bd76904..4efacf0e7 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 05d5c3750..97aafb9dd 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index feababc9c..3e751e4e8 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 220f0d79e..0ea0b21f8 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 297a6e456..2f97a4375 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 5134ff6b4..ce40edba6 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index ebc597474..c314449bc 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 /** diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index 9ed994361..54f76d3b5 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 1ffa26723..c2c22a06e 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 45206ef5f..13af7304a 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index faa4f367b..86d6c4fac 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index 5e1f3facc..c1732a0d9 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index 220bfa471..7a83ecc03 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 1c468198d..560618f61 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index eed1171b9..70cf63ac9 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 3cdda9002..e6c0cf11b 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 7de00f080..1d72030bd 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index c5f5c5c07..d713bbfd9 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 7de00f080..1d72030bd 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 256f3a9dd..2a960ed12 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -41,18 +41,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 40e7259ed..ca691bcf6 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index fd09b2209..cbb9a5a2d 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 8268e4293..c19e6dfb2 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h index ca1a4f7a7..b4fd6eb37 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index e1677111a..1f157fa3e 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index fae782350..575ad0f07 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 7f752213d..b84cb8a69 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 093cb37ff..0250990ad 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index cfb3fc2b4..4ca3375ae 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 324f3678e..92c60e59b 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -37,18 +37,6 @@ */ #ifndef CONFIGURATION_H #define CONFIGURATION_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_H_VERSION 010100 //=========================================================================== diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index 73c43f17f..af1059304 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -32,18 +32,6 @@ */ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H - -/** - * - * *********************************** - * ** ATTENTION TO ALL DEVELOPERS ** - * *********************************** - * - * You must increment this version number for every significant change such as, - * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option. - * - * Note: Update also Version.h ! - */ #define CONFIGURATION_ADV_H_VERSION 010100 // @section temperature From 0dbe4b3e546b8ec034f953c6646e945b1a196241 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 29 Apr 2017 04:26:53 -0500 Subject: [PATCH 2/3] Edit configurations to reduce verbosity, arrange logically --- Marlin/Configuration.h | 165 ++++++----------- .../Cartesio/Configuration.h | 165 ++++++----------- .../Felix/Configuration.h | 165 ++++++----------- .../Felix/DUAL/Configuration.h | 165 ++++++----------- .../FolgerTech-i3-2020/Configuration.h | 168 ++++++------------ .../Hephestos/Configuration.h | 165 ++++++----------- .../Hephestos_2/Configuration.h | 165 ++++++----------- .../K8200/Configuration.h | 165 ++++++----------- .../K8400/Configuration.h | 165 ++++++----------- .../K8400/Dual-head/Configuration.h | 165 ++++++----------- .../RepRapWorld/Megatronics/Configuration.h | 165 ++++++----------- .../RigidBot/Configuration.h | 165 ++++++----------- .../SCARA/Configuration.h | 165 ++++++----------- .../TAZ4/Configuration.h | 165 ++++++----------- .../TinyBoy2/Configuration.h | 165 ++++++----------- .../WITBOX/Configuration.h | 165 ++++++----------- .../adafruit/ST7565/Configuration.h | 165 ++++++----------- .../FLSUN/auto_calibrate/Configuration.h | 162 ++++++----------- .../delta/FLSUN/kossel_mini/Configuration.h | 162 ++++++----------- .../delta/generic/Configuration.h | 163 ++++++----------- .../delta/kossel_mini/Configuration.h | 157 ++++++---------- .../delta/kossel_pro/Configuration.h | 163 ++++++----------- .../delta/kossel_xl/Configuration.h | 108 +++++------ .../gCreate_gMax1.5+/Configuration.h | 112 ++---------- .../makibox/Configuration.h | 165 ++++++----------- .../tvrrug/Round2/Configuration.h | 165 ++++++----------- .../wt150/Configuration.h | 165 ++++++----------- 27 files changed, 1525 insertions(+), 2805 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3ee77bb27..84a70d16a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -518,77 +518,90 @@ #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// + /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * You must activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -624,69 +637,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -708,6 +658,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -726,7 +679,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 0b169fce8..aecc2a398 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -516,78 +516,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -623,70 +635,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -708,6 +656,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 1 @@ -726,7 +677,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 92179c6cc..bfa34f7bc 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -500,78 +500,90 @@ #define DEFAULT_ZJERK 0.3 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -607,70 +619,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -692,6 +640,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -710,7 +661,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index ec661e9e6..caf7f3ca7 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -500,78 +500,90 @@ #define DEFAULT_ZJERK 0.3 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -607,70 +619,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -692,6 +640,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -710,7 +661,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h index 8d0b83d4a..f837d9d8d 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h @@ -524,78 +524,90 @@ #define DEFAULT_EJERK 4.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ #define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. #define Z_SERVO_ANGLES {40,85} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -630,69 +642,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Enable Z Probe Repeatability test to see how accurate your probe is -#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -710,11 +659,12 @@ #define Z_CLEARANCE_DEPLOY_PROBE 3 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points - -// For M851 give a range for adjusting the Z probe offset -#define Z_PROBE_OFFSET_RANGE_MIN -20 +// For M851 give a range for adjusting the Z probe offset#define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -733,7 +683,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 8faaec46a..af6681f09 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -508,78 +508,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -615,70 +627,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -#define Z_MIN_PROBE_ENDSTOP -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -700,6 +648,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -718,7 +669,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index dd2d1dfe3..d840e27ee 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -511,78 +511,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 1.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -618,70 +630,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -703,6 +651,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -2 #define Z_PROBE_OFFSET_RANGE_MAX 0 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -721,7 +672,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index c30946b23..76ae0c3a4 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -546,78 +546,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -653,70 +665,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -738,6 +686,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -756,7 +707,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index 37ea17026..c791b2852 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -517,78 +517,90 @@ #define DEFAULT_ZJERK 0.5 #define DEFAULT_EJERK 20.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -624,70 +636,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -709,6 +657,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -727,7 +678,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index f32e25cb7..1c57307f1 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -517,78 +517,90 @@ #define DEFAULT_ZJERK 0.5 #define DEFAULT_EJERK 20.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -624,70 +636,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -709,6 +657,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -727,7 +678,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 83973dcfd..e1c986dcb 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -517,78 +517,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -624,70 +636,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -709,6 +657,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -727,7 +678,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 4efacf0e7..39241543f 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -516,78 +516,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -623,70 +635,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -708,6 +656,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -726,7 +677,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 3e751e4e8..5737440d4 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -532,78 +532,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 3.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -639,70 +651,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -724,6 +672,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -742,7 +693,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 2f97a4375..5098132cf 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -537,78 +537,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 10.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -644,70 +656,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -729,6 +677,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -747,7 +698,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index c314449bc..5a9e64c9d 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -568,78 +568,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -675,70 +687,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -760,6 +708,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -778,7 +729,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index c2c22a06e..5dd732e60 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -508,78 +508,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -615,70 +627,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -700,6 +648,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -718,7 +669,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 86d6c4fac..7c1ac8453 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -517,78 +517,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -624,70 +636,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -709,6 +657,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -727,7 +678,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index c1732a0d9..f50909fd9 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -591,78 +591,90 @@ #define DEFAULT_ZJERK DEFAULT_YJERK // Must be same as XY for delta #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -748,67 +760,6 @@ #endif // Z_PROBE_ALLEN_KEY -/** - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -830,6 +781,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -848,7 +802,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 560618f61..12ba3f4e4 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -592,78 +592,90 @@ #define DEFAULT_ZJERK DEFAULT_YJERK // Must be same as XY for delta #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -749,67 +761,6 @@ #endif // Z_PROBE_ALLEN_KEY -/** - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP // A3K leave disabled! -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Enable Z Probe Repeatability test to see how accurate your probe is -#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -831,6 +782,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -849,7 +803,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index e6c0cf11b..1c26ad262 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -581,78 +581,90 @@ #define DEFAULT_ZJERK 20.0 // Must be same as XY for delta #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -735,68 +747,6 @@ #endif // Z_PROBE_ALLEN_KEY -/** - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -#define Z_MIN_PROBE_ENDSTOP -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -818,6 +768,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -836,7 +789,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index d713bbfd9..5638ad54e 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -581,71 +581,85 @@ #define DEFAULT_ZJERK 20.0 // Must be same as XY for delta #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -731,68 +745,6 @@ #endif // Z_PROBE_ALLEN_KEY -/** - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -814,6 +766,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -832,7 +787,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 2a960ed12..8177c0c16 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -575,78 +575,90 @@ #define DEFAULT_ZJERK 20.0 // Must be same as XY for delta #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -738,68 +750,6 @@ #endif // Z_PROBE_ALLEN_KEY -/** - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -822,6 +772,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -15 #define Z_PROBE_OFFSET_RANGE_MAX 5 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -840,7 +793,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index cbb9a5a2d..d2ab0fe5a 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -594,78 +594,90 @@ #define DEFAULT_ZJERK 20.0 #define DEFAULT_EJERK 20.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -802,13 +814,6 @@ * ignored by Marlin */ -#define Z_MIN_PROBE_ENDSTOP -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -830,6 +835,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -848,7 +856,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h index b4fd6eb37..5d21df002 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h @@ -549,60 +549,42 @@ */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ #define BLTOUCH #define BLTOUCH_DELAY 500 // (ms) Enable and increase if needed #define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ - // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -638,69 +620,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Enable Z Probe Repeatability test to see how accurate your probe is -#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -722,6 +641,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -740,7 +662,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 575ad0f07..839524018 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -520,78 +520,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -627,70 +639,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -712,6 +660,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -730,7 +681,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 0250990ad..7176a3bc6 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -513,78 +513,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -620,70 +632,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -705,6 +653,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 1 @@ -723,7 +674,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 92c60e59b..64b14c6c7 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -522,78 +522,90 @@ #define DEFAULT_ZJERK 0.4 #define DEFAULT_EJERK 5.0 +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// /** - * =========================================================================== - * ============================= Z Probe Options ============================= - * =========================================================================== - * @section probes + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP * - * Probe Type - * Probes are sensors/switches that are activated / deactivated before/after use. + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. * - * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. - * You must activate one of these to use Auto Bed Leveling below. + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. * - * Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. */ /** - * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. - * Use G29 repeatedly, adjusting the Z height at each point with movement commands - * or (with LCD_BED_LEVELING) the LCD controller. + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY /** - * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. - * For example an inductive probe, or a setup that uses the nozzle to probe. - * An inductive probe must be deactivated to go below - * its trigger-point if hardware endstops are active. + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE /** - * Z Servo Probe, such as an endstop switch on a rotating arm. - * NUM_SERVOS also needs to be set. This is found later in this file. Set it to - * 1 + the number of other servos in your system. + * Z Servo Probe, such as an endstop switch on a rotating arm. */ //#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles - /** - * The BLTouch probe emulates a servo probe. - * If using a BLTouch then NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES - * are setup for you in the background and you shouldn't need to set/modify/enable them - * with the possible exception of Z_ENDSTOP_SERVO_NR. +/** + * The BLTouch probe is a Hall effect sensor that emulates a servo. */ //#define BLTOUCH -//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed -//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event - -/** - * BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017 - * Unless using interrupt endstops, there is a MINIMUM feedrate for Marlin to reliably - * sense the BLTouch. If the feedrate is too slow then G28 & G29 can sometimes result - * in the print head being driven into the bed until manual intervention. - * The minimum feedrate calculation is: - * - * feedrate minimum = 24000 / DEFAULT_AXIS_STEPS_PER_UNIT - * where feedrate is in "mm/minute" or "inches/minute" depending on the units used - * in DEFAULT_AXIS_STEPS_PER_UNIT - * - * This applies to the HOMING_FEEDRATE_Z and Z_PROBE_SPEED_FAST. If PROBE_DOUBLE_TOUCH - * is enabled then it also applies to Z_PROBE_SPEED_SLOW. - */ +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed + //#define BLTOUCH_HEATERS_OFF // Enable if the probe seems unreliable. Heaters will be disabled for each probe. +#endif // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) //#define SOLENOID_PROBE -// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. +// A sled-mounted probe like those designed by Charles Bell. //#define Z_PROBE_SLED //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + /** * Z Probe to nozzle (X,Y) offset, relative to (0, 0). * X and Y offsets must be integers. @@ -629,70 +641,6 @@ // Use double touch for probing //#define PROBE_DOUBLE_TOUCH -/** - * Allen Key Probe is defined in the Delta example configurations. - * - * - * *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! *** - * - * - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. - * - Use 5V for powered (usu. inductive) sensors. - * - Otherwise connect: - * - normally-closed switches to GND and D32. - * - normally-open switches to 5V and D32. - * - * Normally-closed switches are advised and are the default. - * - * - * PIN OPTIONS\SETUP FOR Z PROBES - * - * - * WARNING: - * Setting the wrong pin may have unexpected and potentially disastrous consequences. - * Use with caution and do your homework. - * - * - * All Z PROBE pin options are configured by defining (or not defining) - * the following five items: - * Z_MIN_PROBE_ENDSTOP – defined below - * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below - * Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file - * Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file - * - * If you're using a probe then you need to tell Marlin which pin to use as - * the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the - * Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used. - * - * The pin selected for the probe is ONLY checked during probing operations. - * If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE - * then you’ll need to use the Z_MIN_PROBE_PIN option. - * - * Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN. - * - * The settings needed to use the Z_MIN_PROBE_PIN are: - * 1. select the type of probe you're using - * 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file - * 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. enable Z_MIN_PROBE_ENDSTOP - * NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the - * negative Z direction. - * - * The settings needed to use the Z_MIN_PIN are: - * 1. select the type of probe you're using - * 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file - * 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - * 4. disable Z_MIN_PROBE_ENDSTOP - * NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be - * ignored by Marlin - */ - -//#define Z_MIN_PROBE_ENDSTOP -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - - -// Enable Z Probe Repeatability test to see how accurate your probe is -//#define Z_MIN_PROBE_REPEATABILITY_TEST - /** * Z probes require clearance when deploying, stowing, and moving between * probe points to avoid hitting the bed and other hardware. @@ -714,6 +662,9 @@ #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -732,7 +683,7 @@ // @section extruder #define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. // @section machine From 54751e855738f8ddb42a871f0b62a22820074075 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 29 Apr 2017 05:37:46 -0500 Subject: [PATCH 3/3] Put DISTINCT_E_FACTORS adjacent to the affected settings --- Marlin/Configuration.h | 13 +++++++------ .../example_configurations/Cartesio/Configuration.h | 13 +++++++------ Marlin/example_configurations/Felix/Configuration.h | 13 +++++++------ .../Felix/DUAL/Configuration.h | 13 +++++++------ .../FolgerTech-i3-2020/Configuration.h | 13 +++++++------ .../Hephestos/Configuration.h | 13 +++++++------ .../Hephestos_2/Configuration.h | 13 +++++++------ Marlin/example_configurations/K8200/Configuration.h | 13 +++++++------ Marlin/example_configurations/K8400/Configuration.h | 13 +++++++------ .../K8400/Dual-head/Configuration.h | 13 +++++++------ .../RepRapWorld/Megatronics/Configuration.h | 13 +++++++------ .../example_configurations/RigidBot/Configuration.h | 13 +++++++------ Marlin/example_configurations/SCARA/Configuration.h | 13 +++++++------ Marlin/example_configurations/TAZ4/Configuration.h | 13 +++++++------ .../example_configurations/TinyBoy2/Configuration.h | 13 +++++++------ .../example_configurations/WITBOX/Configuration.h | 13 +++++++------ .../adafruit/ST7565/Configuration.h | 13 +++++++------ .../delta/FLSUN/auto_calibrate/Configuration.h | 13 +++++++------ .../delta/FLSUN/kossel_mini/Configuration.h | 13 +++++++------ .../delta/generic/Configuration.h | 13 +++++++------ .../delta/kossel_mini/Configuration.h | 13 +++++++------ .../delta/kossel_pro/Configuration.h | 13 +++++++------ .../delta/kossel_xl/Configuration.h | 13 +++++++------ .../gCreate_gMax1.5+/Configuration.h | 13 +++++++------ .../example_configurations/makibox/Configuration.h | 13 +++++++------ .../tvrrug/Round2/Configuration.h | 13 +++++++------ Marlin/example_configurations/wt150/Configuration.h | 13 +++++++------ 27 files changed, 189 insertions(+), 162 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 84a70d16a..0bd552262 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -464,12 +461,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index aecc2a398..15d9db90f 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -134,9 +134,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 3 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -463,12 +460,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index bfa34f7bc..d65dfb078 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -447,12 +444,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index caf7f3ca7..a0721fe19 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 2 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -447,12 +444,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h index f837d9d8d..7eb0f214c 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -470,12 +467,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index af6681f09..3f503db69 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -136,9 +136,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -455,12 +452,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index d840e27ee..4ac164b0c 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -458,12 +455,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 76ae0c3a4..8bc6e04da 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -153,9 +153,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -494,12 +491,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index c791b2852..0b07f8d27 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -464,12 +461,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 1c57307f1..4d8df13fa 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 2 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -464,12 +461,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index e1c986dcb..783508ec5 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -464,12 +461,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 39241543f..f4b73b1c8 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -136,9 +136,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 // Single extruder. Set to 2 for dual extruders -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -461,12 +458,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 5737440d4..79c2670ec 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -165,9 +165,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -479,12 +476,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 5098132cf..ea4d534fb 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -484,12 +481,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index 5a9e64c9d..57e038c03 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -155,9 +155,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -515,12 +512,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 5dd732e60..1ebd9ecbc 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -136,9 +136,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -455,12 +452,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 7c1ac8453..2188ffe85 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -464,12 +461,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index f50909fd9..43a608597 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -538,12 +535,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 12ba3f4e4..afa16fb85 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -539,12 +536,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 1c26ad262..25efc6fa1 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -528,12 +525,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 5638ad54e..75f6d21e1 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -528,12 +525,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 8177c0c16..91f876eaf 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -137,9 +137,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -522,12 +519,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index d2ab0fe5a..27f4d3b61 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -541,12 +538,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h index 5d21df002..bb97cdaad 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h @@ -138,9 +138,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -478,12 +475,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 839524018..8d023dacb 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -467,12 +464,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 7176a3bc6..ad1aadaf2 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -454,12 +451,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92 diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 64b14c6c7..bfb749719 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -133,9 +133,6 @@ // :[1, 2, 3, 4, 5] #define EXTRUDERS 1 -// Enable if your E steppers or extruder gear ratios are not identical -//#define DISTINCT_E_FACTORS - // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -469,12 +466,16 @@ * * These settings can be reset by M502 * - * You can set distinct factors for each E stepper, if needed. - * If fewer factors are given, the last will apply to the rest. - * * Note that if EEPROM is enabled, saved values will override these. */ +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + /** * Default Axis Steps Per Unit (steps/mm) * Override with M92