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

12
Marlin/src/feature/pause.cpp
View File

@ -323,8 +323,10 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
if (did_pause_print) return false; // already paused
#ifdef ACTION_ON_PAUSE
SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
#ifdef ACTION_ON_PAUSED
host_action_paused();
#elif defined(ACTION_ON_PAUSE)
host_action_pause();
#endif
#if HAS_LCD_MENU
@ -570,8 +572,10 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
#endif
#ifdef ACTION_ON_RESUME
SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
#ifdef ACTION_ON_RESUMED
host_action_resumed();
#elif defined(ACTION_ON_RESUME)
host_action_resume();
#endif
--did_pause_print;

6
Marlin/src/feature/runout.h
View File

@ -99,9 +99,11 @@ class TFilamentMonitor : public FilamentMonitorBase {
#endif
#ifdef ACTION_ON_FILAMENT_RUNOUT
#if NUM_RUNOUT_SENSORS > 1
SERIAL_ECHOLNPAIR("//action:" ACTION_ON_FILAMENT_RUNOUT " ", int(active_extruder));
host_action_filament_runout(false);
SERIAL_CHAR(' ');
SERIAL_ECHO(int(active_extruder));
#else
SERIAL_ECHOLNPGM("//action:" ACTION_ON_FILAMENT_RUNOUT);
host_action_filament_runout();
#endif
if (!IS_SD_PRINTING())
reset();