bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Remote streamer improvements (#12982)

Browse Source
This commit is contained in:
InsanityAutomation
2019-01-27 23:43:13 -05:00
committed by Scott Lahteine
parent 621fbe99de
commit 48a3502656
78 changed files with 1135 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ void GcodeSuite::dwell(millis_t time) {
while (G29()) { // G29 should return true for failed probes ONLY
if (retries--) {
#ifdef G29_ACTION_ON_RECOVER
SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_RECOVER);
host_action(PSTR(G29_ACTION_ON_RECOVER));
#endif
#ifdef G29_RECOVER_COMMANDS
process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
@ -141,7 +141,7 @@ void GcodeSuite::dwell(millis_t time) {
process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
#endif
#ifdef G29_ACTION_ON_FAILURE
SERIAL_ECHOLNPGM("//action:" G29_ACTION_ON_FAILURE);
host_action(PSTR(G29_ACTION_ON_FAILURE));
#endif
#if ENABLED(G29_HALT_ON_FAILURE)
kill(PSTR(MSG_ERR_PROBING_FAILED));

4
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
View File

@ -104,7 +104,7 @@ void GcodeSuite::M24() {
}
#ifdef ACTION_ON_RESUME
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
host_action_resume();
#endif
ui.reset_status();
@ -127,7 +127,7 @@ void GcodeSuite::M25() {
ui.reset_status();
#ifdef ACTION_ON_PAUSE
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
host_action_pause();
#endif
#endif
}