SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adjust timeout code in host_keepalive

Browse source
This commit is contained in:
Scott Lahteine 2016-04-09 16:58:17 -07:00
parent 50c3140040
commit 6d465321b5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View file

@ -456,7 +456,7 @@ static bool send_ok[BUFSIZE];
}; };
static MarlinBusyState busy_state = NOT_BUSY; static MarlinBusyState busy_state = NOT_BUSY;
static millis_t next_busy_signal_ms = -1; static millis_t prev_busy_signal_ms = -1;
uint8_t host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; uint8_t host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL;
#define KEEPALIVE_STATE(n) do{ busy_state = n; }while(0) #define KEEPALIVE_STATE(n) do{ busy_state = n; }while(0)
#else #else
@ -2279,8 +2279,8 @@ void unknown_command_error() {
*/ */
void host_keepalive() { void host_keepalive() {
millis_t ms = millis(); millis_t ms = millis();
if (busy_state != NOT_BUSY) { if (host_keepalive_interval && busy_state != NOT_BUSY) {
if (ms < next_busy_signal_ms) return; if (ms - prev_busy_signal_ms < 1000UL * host_keepalive_interval) return;
switch (busy_state) { switch (busy_state) {
case IN_HANDLER: case IN_HANDLER:
case IN_PROCESS: case IN_PROCESS:
@ -2299,7 +2299,7 @@ void unknown_command_error() {
break; break;
} }
} }
next_busy_signal_ms = host_keepalive_interval ? ms + 1000UL * host_keepalive_interval : -1; prev_busy_signal_ms = ms;
} }
#endif //HOST_KEEPALIVE_FEATURE #endif //HOST_KEEPALIVE_FEATURE