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

Also suppress keepalive with suspend_auto_report

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-21 00:29:09 -05:00
parent 8dfaf1539e
commit ae39fbd646
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@ -187,7 +187,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

2
Marlin/src/Marlin.h
View File

@ -179,7 +179,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/src/feature/bedlevel/ubl/ubl.cpp
View File

@ -195,7 +195,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
@ -264,7 +264,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
} }

4
Marlin/src/gcode/gcode.cpp
View File

@ -40,7 +40,7 @@ GcodeSuite gcode;
#include "../feature/mixing.h" #include "../feature/mixing.h"
#endif #endif
#include "../Marlin.h" // for idle() #include "../Marlin.h" // for idle() and suspend_auto_report
uint8_t GcodeSuite::target_extruder; uint8_t GcodeSuite::target_extruder;
millis_t GcodeSuite::previous_cmd_ms; millis_t GcodeSuite::previous_cmd_ms;
@ -749,7 +749,7 @@ void GcodeSuite::process_next_command() {
void GcodeSuite::host_keepalive() { void GcodeSuite::host_keepalive() {
const millis_t ms = millis(); const millis_t ms = millis();
static millis_t next_busy_signal_ms = 0; static millis_t next_busy_signal_ms = 0;
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: