MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also suspend keepalive messages with suspend_auto_report

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-21 00:26:00 -05:00
parent bc01200495
commit 4eddcf9142
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.h
View File

@ -227,7 +227,7 @@ extern volatile bool wait_for_heatup;
extern volatile bool wait_for_user; extern volatile bool wait_for_user;
#endif #endif
#if HAS_AUTO_REPORTING #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
extern bool suspend_auto_report; extern bool suspend_auto_report;
#endif #endif

4
Marlin/Marlin_main.cpp
View File

@ -512,7 +512,7 @@ volatile bool wait_for_heatup = true;
volatile bool wait_for_user = false; volatile bool wait_for_user = false;
#endif #endif
#if HAS_AUTO_REPORTING #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
bool suspend_auto_report; // = false bool suspend_auto_report; // = false
#endif #endif
@ -3193,7 +3193,7 @@ void gcode_get_destination() {
*/ */
void host_keepalive() { void host_keepalive() {
const millis_t ms = millis(); const millis_t ms = millis();
if (host_keepalive_interval && busy_state != NOT_BUSY) { if (!suspend_auto_report && host_keepalive_interval && busy_state != NOT_BUSY) {
if (PENDING(ms, next_busy_signal_ms)) return; if (PENDING(ms, next_busy_signal_ms)) return;
switch (busy_state) { switch (busy_state) {
case IN_HANDLER: case IN_HANDLER:

4
Marlin/ubl.cpp
View File

@ -175,7 +175,7 @@
// 2 : disply of the map data on a RepRap Graphical LCD Panel // 2 : disply of the map data on a RepRap Graphical LCD Panel
void unified_bed_leveling::display_map(const int map_type) { void unified_bed_leveling::display_map(const int map_type) {
#if HAS_AUTO_REPORTING #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
suspend_auto_report = true; suspend_auto_report = true;
#endif #endif
@ -247,7 +247,7 @@
SERIAL_EOL(); SERIAL_EOL();
} }
#if HAS_AUTO_REPORTING #if HAS_AUTO_REPORTING || ENABLED(HOST_KEEPALIVE_FEATURE)
suspend_auto_report = false; suspend_auto_report = false;
#endif #endif
} }