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

44
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -38,6 +38,10 @@
#include "../../feature/power_loss_recovery.h"
#endif
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#endif
void lcd_pause() {
#if ENABLED(POWER_LOSS_RECOVERY)
if (recovery.enabled) recovery.save(true, false);
@ -49,7 +53,7 @@ void lcd_pause() {
#elif ENABLED(SDSUPPORT)
enqueue_and_echo_commands_P(PSTR("M25"));
#elif defined(ACTION_ON_PAUSE)
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
host_action_pause();
#endif
planner.synchronize();
}
@ -58,29 +62,28 @@ void lcd_resume() {
#if ENABLED(SDSUPPORT)
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
#elif defined(ACTION_ON_RESUME)
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
host_action_resume();
#endif
}
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
void lcd_sdcard_stop() {
void lcd_stop() {
#if ENABLED(SDSUPPORT)
wait_for_heatup = wait_for_user = false;
card.flag.abort_sd_printing = true;
ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
ui.return_to_status();
}
#endif
#ifdef ACTION_ON_CANCEL
host_action_cancel();
#endif
ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
ui.return_to_status();
}
void menu_sdcard_abort_confirm() {
START_MENU();
MENU_BACK(MSG_MAIN);
MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
END_MENU();
}
#endif // SDSUPPORT
void menu_abort_confirm() {
START_MENU();
MENU_BACK(MSG_MAIN);
MENU_ITEM(function, MSG_STOP_PRINT, lcd_stop);
END_MENU();
}
void menu_tune();
void menu_motion();
@ -100,9 +103,8 @@ void menu_main() {
if (busy) {
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
#if ENABLED(SDSUPPORT)
if (card.isFileOpen())
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm);
#if ENABLED(SDSUPPORT) || defined(ACTION_ON_CANCEL)
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm);
#endif
#if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT)
if (card.isFileOpen())