From 2a21a9a062636f5aa06c1920be345d67b3f808b8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 12 Jun 2019 19:35:08 -0500
Subject: [PATCH] Update some configs
---
.../Dagoma/Disco Ultimate/Configuration.h | 66 ----------------
.../Dagoma/Disco Ultimate/Configuration_adv.h | 9 ++-
config/examples/Geeetech/A10/Configuration.h | 66 ----------------
.../examples/Geeetech/A10/Configuration_adv.h | 77 ++++++++++++++++++-
4 files changed, 83 insertions(+), 135 deletions(-)
diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration.h b/config/examples/Dagoma/Disco Ultimate/Configuration.h
index ff23f9713a..0116a5b955 100644
--- a/config/examples/Dagoma/Disco Ultimate/Configuration.h
+++ b/config/examples/Dagoma/Disco Ultimate/Configuration.h
@@ -828,72 +828,6 @@
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
-#if ENABLED(BLTOUCH)
- /**
- * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
- * Do not activate settings that the probe might not understand. Clones might misunderstand
- * advanced commands.
- *
- * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
- * check the wiring of the BROWN, RED and ORANGE wires.
- *
- * Note: If the trigger signal of your probe is not being recognized, it has been very often
- * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
- * like they would be with a real switch. So please check the wiring first.
- *
- * Settings for all BLTouch and clone probes:
- */
-
- // Safety: The probe needs time to recognize the command.
- // Minimum command delay (ms). Enable and increase if needed.
- //#define BLTOUCH_DELAY 500
-
- /**
- * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
- */
-
- // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
- // in special cases, like noisy or filtered input configurations.
- //#define BLTOUCH_FORCE_SW_MODE
-
- /**
- * Settings for BLTouch Smart 3.0 and 3.1
- * Summary:
- * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
- * - High-Speed mode
- * - Disable LCD voltage options
- */
-
- /**
- * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
- * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
- * If disabled, OD mode is the hard-coded default on 3.0
- * On startup, Marlin will compare its eeprom to this vale. If the selected mode
- * differs, a mode set eeprom write will be completed at initialization.
- * Use the option below to force an eeprom write to a V3.1 probe regardless.
- */
- //#define BLTOUCH_SET_5V_MODE
-
- /**
- * Safety: Activate if connecting a probe with an unknown voltage mode.
- * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
- * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
- * To preserve the life of the probe, use this once then turn it off and re-flash.
- */
- //#define BLTOUCH_FORCE_MODE_SET
-
- /**
- * Use "HIGH SPEED" mode for probing.
- * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
- * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
- * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
- */
- //#define BLTOUCH_HS_MODE
-
- // Safety: Enable voltage mode settings in the LCD menu.
- //#define BLTOUCH_LCD_VOLTAGE_MENU
-
-#endif // BLTOUCH
// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
//#define SOLENOID_PROBE
diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
index f0a0e9226d..7f105968d6 100644
--- a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
+++ b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
@@ -375,7 +375,8 @@
#define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
- //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
+ //#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
+ //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
//#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED.
#if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
#define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
@@ -1830,6 +1831,12 @@
//#define Z_STALL_SENSITIVITY 8
#endif
+ /**
+ * Beta feature!
+ * Create a 50/50 square wave step pulse optimal for stepper drivers.
+ */
+ //#define SQUARE_WAVE_STEPPING
+
/**
* Enable M122 debugging command for TMC stepper drivers.
* M122 S0/1 will enable continous reporting.
diff --git a/config/examples/Geeetech/A10/Configuration.h b/config/examples/Geeetech/A10/Configuration.h
index c2c0dc2583..14743ea17e 100644
--- a/config/examples/Geeetech/A10/Configuration.h
+++ b/config/examples/Geeetech/A10/Configuration.h
@@ -811,72 +811,6 @@
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
-#if ENABLED(BLTOUCH)
- /**
- * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
- * Do not activate settings that the probe might not understand. Clones might misunderstand
- * advanced commands.
- *
- * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
- * check the wiring of the BROWN, RED and ORANGE wires.
- *
- * Note: If the trigger signal of your probe is not being recognized, it has been very often
- * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
- * like they would be with a real switch. So please check the wiring first.
- *
- * Settings for all BLTouch and clone probes:
- */
-
- // Safety: The probe needs time to recognize the command.
- // Minimum command delay (ms). Enable and increase if needed.
- #define BLTOUCH_DELAY 200
-
- /**
- * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
- */
-
- // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
- // in special cases, like noisy or filtered input configurations.
- //#define BLTOUCH_FORCE_SW_MODE
-
- /**
- * Settings for BLTouch Smart 3.0 and 3.1
- * Summary:
- * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
- * - High-Speed mode
- * - Disable LCD voltage options
- */
-
- /**
- * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
- * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
- * If disabled, OD mode is the hard-coded default on 3.0
- * On startup, Marlin will compare its eeprom to this vale. If the selected mode
- * differs, a mode set eeprom write will be completed at initialization.
- * Use the option below to force an eeprom write to a V3.1 probe regardless.
- */
- //#define BLTOUCH_SET_5V_MODE
-
- /**
- * Safety: Activate if connecting a probe with an unknown voltage mode.
- * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
- * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
- * To preserve the life of the probe, use this once then turn it off and re-flash.
- */
- //#define BLTOUCH_FORCE_MODE_SET
-
- /**
- * Use "HIGH SPEED" mode for probing.
- * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
- * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
- * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
- */
- #define BLTOUCH_HS_MODE
-
- // Safety: Enable voltage mode settings in the LCD menu.
- //#define BLTOUCH_LCD_VOLTAGE_MENU
-
-#endif // BLTOUCH
// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
//#define SOLENOID_PROBE
diff --git a/config/examples/Geeetech/A10/Configuration_adv.h b/config/examples/Geeetech/A10/Configuration_adv.h
index e6dc638ca8..a5e4f7f2d6 100644
--- a/config/examples/Geeetech/A10/Configuration_adv.h
+++ b/config/examples/Geeetech/A10/Configuration_adv.h
@@ -524,6 +524,73 @@
// Enable this if X or Y can't home without homing the other axis first.
//#define CODEPENDENT_XY_HOMING
+#if ENABLED(BLTOUCH)
+ /**
+ * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
+ * Do not activate settings that the probe might not understand. Clones might misunderstand
+ * advanced commands.
+ *
+ * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
+ * check the wiring of the BROWN, RED and ORANGE wires.
+ *
+ * Note: If the trigger signal of your probe is not being recognized, it has been very often
+ * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
+ * like they would be with a real switch. So please check the wiring first.
+ *
+ * Settings for all BLTouch and clone probes:
+ */
+
+ // Safety: The probe needs time to recognize the command.
+ // Minimum command delay (ms). Enable and increase if needed.
+ //#define BLTOUCH_DELAY 500
+
+ /**
+ * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
+ */
+
+ // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
+ // in special cases, like noisy or filtered input configurations.
+ //#define BLTOUCH_FORCE_SW_MODE
+
+ /**
+ * Settings for BLTouch Smart 3.0 and 3.1
+ * Summary:
+ * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
+ * - High-Speed mode
+ * - Disable LCD voltage options
+ */
+
+ /**
+ * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
+ * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
+ * If disabled, OD mode is the hard-coded default on 3.0
+ * On startup, Marlin will compare its eeprom to this vale. If the selected mode
+ * differs, a mode set eeprom write will be completed at initialization.
+ * Use the option below to force an eeprom write to a V3.1 probe regardless.
+ */
+ //#define BLTOUCH_SET_5V_MODE
+
+ /**
+ * Safety: Activate if connecting a probe with an unknown voltage mode.
+ * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
+ * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
+ * To preserve the life of the probe, use this once then turn it off and re-flash.
+ */
+ //#define BLTOUCH_FORCE_MODE_SET
+
+ /**
+ * Use "HIGH SPEED" mode for probing.
+ * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
+ * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
+ * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
+ */
+ //#define BLTOUCH_HS_MODE
+
+ // Safety: Enable voltage mode settings in the LCD menu.
+ //#define BLTOUCH_LCD_VOLTAGE_MENU
+
+#endif // BLTOUCH
+
/**
* Z Steppers Auto-Alignment
* Add the G34 command to align multiple Z steppers using a bed probe.
@@ -851,7 +918,7 @@
*/
//#define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)
- //#define POWER_LOSS_PIN 44 // Pin to detect power loss
+ //#define POWER_LOSS_PIN 44 // Pin to detect power loss (optional)
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
//#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
//#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
@@ -913,7 +980,7 @@
* This feature must be enabled with "M540 S1" or from the LCD menu.
* To have any effect, endstops must be enabled during SD printing.
*/
- //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
+ //#define SD_ABORT_ON_ENDSTOP_HIT
/**
* This option makes it easier to print the same SD Card file again.
@@ -1764,6 +1831,12 @@
//#define Z_STALL_SENSITIVITY 8
#endif
+ /**
+ * Beta feature!
+ * Create a 50/50 square wave step pulse optimal for stepper drivers.
+ */
+ //#define SQUARE_WAVE_STEPPING
+
/**
* Enable M122 debugging command for TMC stepper drivers.
* M122 S0/1 will enable continous reporting.
--
GitLab