From 5832f4b8481a36292e589ad38bb9f67d1c588050 Mon Sep 17 00:00:00 2001
From: esenapaj <creation0004@gmail.com>
Date: Sun, 10 Jul 2016 14:24:57 +0900
Subject: [PATCH 1/2] Follow-up the PR #4253 (Runout Sensor without SD Card,
Print Timer support in M104)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ã»Update forgotten example configuration files
---
Marlin/example_configurations/Felix/DUAL/Configuration.h | 5 ++++-
.../example_configurations/K8400/Dual Heads/Configuration.h | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 731d8ce5ec..ee80a1a12d 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -771,7 +771,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Print job timer
//
// Enable this option to automatically start and stop the
-// print job timer when M104 and M109 commands are received.
+// print job timer when M104/M109/M190 commands are received.
+// M104 (extruder without wait) - high temp = none, low temp = stop timer
+// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
+// M190 (bed with wait) - high temp = start timer, low temp = none
//
// In all cases the timer can be started and stopped using
// the following commands:
diff --git a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
index c244ea0432..8eb1c40a32 100644
--- a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
@@ -790,7 +790,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Print job timer
//
// Enable this option to automatically start and stop the
-// print job timer when M104 and M109 commands are received.
+// print job timer when M104/M109/M190 commands are received.
+// M104 (extruder without wait) - high temp = none, low temp = stop timer
+// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
+// M190 (bed with wait) - high temp = start timer, low temp = none
//
// In all cases the timer can be started and stopped using
// the following commands:
From 9e56d5825e1bab21bacf3280daa4d37c3e926407 Mon Sep 17 00:00:00 2001
From: esenapaj <creation0004@gmail.com>
Date: Sun, 10 Jul 2016 14:25:29 +0900
Subject: [PATCH 2/2] Adjust spacing
---
Marlin/Conditionals.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 844d2a4e54..4108014509 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -846,16 +846,16 @@
/**
* MIN_Z_HEIGHT_FOR_HOMING / Z_RAISE_BETWEEN_PROBINGS
*/
- #ifndef MIN_Z_HEIGHT_FOR_HOMING
- #ifndef Z_RAISE_BETWEEN_PROBINGS
- #define MIN_Z_HEIGHT_FOR_HOMING 0
- #else
- #define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
- #endif
- #endif
- #ifndef Z_RAISE_BETWEEN_PROBINGS
- #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
- #endif
+ #ifndef MIN_Z_HEIGHT_FOR_HOMING
+ #ifndef Z_RAISE_BETWEEN_PROBINGS
+ #define MIN_Z_HEIGHT_FOR_HOMING 0
+ #else
+ #define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
+ #endif
+ #endif
+ #ifndef Z_RAISE_BETWEEN_PROBINGS
+ #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
+ #endif
#endif //CONFIGURATION_LCD
#endif //CONDITIONALS_H