diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 41dcec76c..c70c84ca7 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -395,10 +395,10 @@ #endif /** - * Avoid double-negatives for enabling features + * Host keep alive */ - #if DISABLED(DISABLE_HOST_KEEPALIVE) - #define HOST_KEEPALIVE_FEATURE + #ifndef DEFAULT_KEEPALIVE_INTERVAL + #define DEFAULT_KEEPALIVE_INTERVAL 2 #endif /** diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d9ceed5d5..18fe5c864 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -733,13 +733,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 1449c56c2..778ca60cb 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -716,13 +716,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 1cd0b5476..b8ea32ced 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -725,13 +725,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 4f4063322..eaf556f3e 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -727,13 +727,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index ffba8b6d1..822287717 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -750,13 +750,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 19743c81a..341097e0d 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -733,13 +733,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 36a0b73b4..ee68c80ad 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -728,13 +728,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 71c17328d..4394e5eab 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -741,13 +741,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 303168d5b..39c71527e 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -754,13 +754,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index ee42247d3..1c48ddd18 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -725,13 +725,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index c41e92a8a..a115f3c13 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -733,13 +733,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index cb6a89a6c..adc1b0d73 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -862,13 +862,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 2456e95cd..954854eb4 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -862,13 +862,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 3493d7cef..c4f3ffcd9 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -866,13 +866,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 95e872d3a..c977b47c3 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -859,13 +859,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index fb65e71d2..e2d277fa4 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -867,13 +867,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index f647f125a..7da67eb86 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -736,13 +736,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index bf192eea8..83b64f70d 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -727,13 +727,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Host Keepalive // -// By default Marlin will send a busy status message to the host +// When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages. -#if DISABLED(DISABLE_HOST_KEEPALIVE) - #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. -#endif +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher