From ac7f634956254f87b45cdb75be782b23b8865a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Tue, 10 May 2016 14:03:34 +0100 Subject: [PATCH 1/2] Removed the DISABLE from HOST_KEEPALIVE_FEATURE option --- Marlin/Conditionals.h | 6 +++--- Marlin/Configuration.h | 8 +++----- Marlin/Marlin_main.cpp | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 41dcec76c..34c58ca21 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 HOST_KEEPALIVE_INTERVAL + #define HOST_KEEPALIVE_INTERVAL 2 #endif /** diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3b164a4f6..157f7a5ac 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 HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. // // M100 Free Memory Watcher diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 45907f355..6ce0ce6b6 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -488,7 +488,7 @@ static bool send_ok[BUFSIZE]; static MarlinBusyState busy_state = NOT_BUSY; static millis_t next_busy_signal_ms = 0; - uint8_t host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; + uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; #define KEEPALIVE_STATE(n) do{ busy_state = n; }while(0) #else #define host_keepalive() ; From 85b2c80838c08076c84707af2c1216316aafd0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Tue, 10 May 2016 14:05:33 +0100 Subject: [PATCH 2/2] Updated example configurations --- Marlin/Conditionals.h | 4 ++-- Marlin/Configuration.h | 4 ++-- Marlin/Marlin_main.cpp | 2 +- Marlin/example_configurations/Felix/Configuration.h | 8 +++----- Marlin/example_configurations/Hephestos/Configuration.h | 8 +++----- Marlin/example_configurations/Hephestos_2/Configuration.h | 8 +++----- Marlin/example_configurations/K8200/Configuration.h | 8 +++----- .../RepRapWorld/Megatronics/Configuration.h | 8 +++----- Marlin/example_configurations/RigidBot/Configuration.h | 8 +++----- Marlin/example_configurations/SCARA/Configuration.h | 8 +++----- Marlin/example_configurations/TAZ4/Configuration.h | 8 +++----- Marlin/example_configurations/WITBOX/Configuration.h | 8 +++----- .../adafruit/ST7565/Configuration.h | 8 +++----- .../example_configurations/delta/biv2.5/Configuration.h | 8 +++----- .../example_configurations/delta/generic/Configuration.h | 8 +++----- .../delta/kossel_mini/Configuration.h | 8 +++----- .../delta/kossel_pro/Configuration.h | 8 +++----- .../delta/kossel_xl/Configuration.h | 8 +++----- Marlin/example_configurations/makibox/Configuration.h | 8 +++----- .../example_configurations/tvrrug/Round2/Configuration.h | 8 +++----- 20 files changed, 56 insertions(+), 90 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 34c58ca21..c70c84ca7 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -397,8 +397,8 @@ /** * Host keep alive */ - #ifndef HOST_KEEPALIVE_INTERVAL - #define HOST_KEEPALIVE_INTERVAL 2 + #ifndef DEFAULT_KEEPALIVE_INTERVAL + #define DEFAULT_KEEPALIVE_INTERVAL 2 #endif /** diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 157f7a5ac..c45f6fcf3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -736,8 +736,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages -#define HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. +#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/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6ce0ce6b6..45907f355 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -488,7 +488,7 @@ static bool send_ok[BUFSIZE]; static MarlinBusyState busy_state = NOT_BUSY; static millis_t next_busy_signal_ms = 0; - uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; + uint8_t host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; #define KEEPALIVE_STATE(n) do{ busy_state = n; }while(0) #else #define host_keepalive() ; diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 57292b218..a705f6531 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 4bf40859f..de0375c3b 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 285ffb536..24a61f962 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 17290bc87..81a01062d 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 22d776619..95c14b1ce 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 42a086495..60eb579e2 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 4bc60ac2a..460479fcf 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 7b52693b9..f8d760cc7 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 aecbdc75d..7b67831d5 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 5eb8301be..0a0d9f21f 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 6cbb21ae5..c827fb0c1 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 e6f049528..75e8d0434 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 e55d2941e..2d2585e95 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 61c6eee00..6a548b65e 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 37240d136..cf8aefe8e 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 3d21ed402..4e1ea0e64 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 32bfc9cd0..2e4969c6e 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