From 841c8ce0d9bdc67af010692014800431a278dd46 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 9 Sep 2019 15:43:06 -0500 Subject: [PATCH] Remove PROMPT_INFO / PROMPT_GCODE_INFO (#15210) --- Marlin/src/feature/host_actions.cpp | 3 --- Marlin/src/feature/host_actions.h | 3 +-- Marlin/src/feature/pause.cpp | 7 ------- Marlin/src/gcode/sdcard/M24_M25.cpp | 3 --- Marlin/src/lcd/ultralcd.cpp | 3 --- Marlin/src/lcd/ultralcd.h | 4 ++-- 6 files changed, 3 insertions(+), 20 deletions(-) diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp index b39b0fbc3..26c24aaf4 100644 --- a/Marlin/src/feature/host_actions.cpp +++ b/Marlin/src/feature/host_actions.cpp @@ -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); diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h index c93d3a16d..fa3c43ab6 100644 --- a/Marlin/src/feature/host_actions.h +++ b/Marlin/src/feature/host_actions.h @@ -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; diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index f1b8227b7..fb3177d8f 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -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(); diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sdcard/M24_M25.cpp index 81b7350f7..6f27c5558 100644 --- a/Marlin/src/gcode/sdcard/M24_M25.cpp +++ b/Marlin/src/gcode/sdcard/M24_M25.cpp @@ -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 diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index ba2de995e..797abe006 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -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 diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 973fbc451..a6be315e6 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -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)