melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed the DISABLE from HOST_KEEPALIVE_FEATURE option

Browse Source
This commit is contained in:
João Brázio 2016-05-10 14:03:34 +01:00
parent a454a88f9c
commit ac7f634956
No known key found for this signature in database
GPG Key ID: F62CFD37DFFDB540
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Conditionals.h
View File

@ -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
/**

8
Marlin/Configuration.h
View File

@ -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

2
Marlin/Marlin_main.cpp
View File

@ -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() ;