Scott Lahteine
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
3 additions and
20 deletions
-
Marlin/src/feature/host_actions.cpp
-
Marlin/src/feature/host_actions.h
-
Marlin/src/feature/pause.cpp
-
Marlin/src/gcode/sdcard/M24_M25.cpp
-
Marlin/src/lcd/ultralcd.cpp
-
Marlin/src/lcd/ultralcd.h
|
|
@ -154,9 +154,6 @@ void host_action(const char * const pstr, const bool eol) { |
|
|
|
queue.inject_P(PSTR("M24")); |
|
|
|
#endif |
|
|
|
break; |
|
|
|
case PROMPT_INFO: |
|
|
|
msg = PSTR("GCODE_INFO"); |
|
|
|
break; |
|
|
|
default: break; |
|
|
|
} |
|
|
|
say_m876_response(msg); |
|
|
|
|
|
@ -53,8 +53,7 @@ void host_action(const char * const pstr, const bool eol=true); |
|
|
|
PROMPT_FILAMENT_RUNOUT, |
|
|
|
PROMPT_USER_CONTINUE, |
|
|
|
PROMPT_FILAMENT_RUNOUT_REHEAT, |
|
|
|
PROMPT_PAUSE_RESUME, |
|
|
|
PROMPT_INFO |
|
|
|
PROMPT_PAUSE_RESUME |
|
|
|
}; |
|
|
|
|
|
|
|
extern PromptReason host_prompt_reason; |
|
|
|
|
|
@ -399,9 +399,6 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u |
|
|
|
#elif defined(ACTION_ON_PAUSE) |
|
|
|
host_action_pause(); |
|
|
|
#endif |
|
|
|
#if ENABLED(HOST_PROMPT_SUPPORT) |
|
|
|
host_prompt_open(PROMPT_INFO, PSTR("Pause")); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) { |
|
|
@ -677,10 +674,6 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le |
|
|
|
|
|
|
|
--did_pause_print; |
|
|
|
|
|
|
|
#if ENABLED(HOST_PROMPT_SUPPORT) |
|
|
|
host_prompt_open(PROMPT_INFO, PSTR("Resume")); |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
if (did_pause_print) { |
|
|
|
card.startFileprint(); |
|
|
|
|
|
@ -61,9 +61,6 @@ void GcodeSuite::M24() { |
|
|
|
} |
|
|
|
|
|
|
|
#if ENABLED(HOST_ACTION_COMMANDS) |
|
|
|
#if ENABLED(HOST_PROMPT_SUPPORT) |
|
|
|
host_prompt_open(PROMPT_INFO, PSTR("Resume SD")); |
|
|
|
#endif |
|
|
|
#ifdef ACTION_ON_RESUME |
|
|
|
host_action_resume(); |
|
|
|
#endif |
|
|
|
|
|
@ -1480,9 +1480,6 @@ void MarlinUI::update() { |
|
|
|
#ifdef ACTION_ON_CANCEL |
|
|
|
host_action_cancel(); |
|
|
|
#endif |
|
|
|
#if ENABLED(HOST_PROMPT_SUPPORT) |
|
|
|
host_prompt_open(PROMPT_INFO, PSTR("UI Abort")); |
|
|
|
#endif |
|
|
|
print_job_timer.stop(); |
|
|
|
set_status_P(PSTR(MSG_PRINT_ABORTED)); |
|
|
|
#if HAS_LCD_MENU |
|
|
|
|
|
@ -95,8 +95,8 @@ |
|
|
|
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE) |
|
|
|
void lcd_pause_show_message(const PauseMessage message, |
|
|
|
const PauseMode mode=PAUSE_MODE_SAME, |
|
|
|
const uint8_t extruder=active_extruder); |
|
|
|
const PauseMode mode=PAUSE_MODE_SAME, |
|
|
|
const uint8_t extruder=active_extruder); |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL) |
|
|
|