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

Remove PROMPT_INFO / PROMPT_GCODE_INFO (#15210)

Browse Source
This commit is contained in:
Scott Lahteine 2019-09-09 15:43:06 -05:00 committed by GitHub
parent 3c3a956a17
commit 841c8ce0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/feature/host_actions.cpp
View File

@ -154,9 +154,6 @@ void host_action(const char * const pstr, const bool eol) {
queue.inject_P(PSTR("M24")); queue.inject_P(PSTR("M24"));
#endif #endif
break; break;
case PROMPT_INFO:
msg = PSTR("GCODE_INFO");
break;
default: break; default: break;
} }
say_m876_response(msg); say_m876_response(msg);

3
Marlin/src/feature/host_actions.h
View File

@ -53,8 +53,7 @@ void host_action(const char * const pstr, const bool eol=true);
PROMPT_FILAMENT_RUNOUT, PROMPT_FILAMENT_RUNOUT,
PROMPT_USER_CONTINUE, PROMPT_USER_CONTINUE,
PROMPT_FILAMENT_RUNOUT_REHEAT, PROMPT_FILAMENT_RUNOUT_REHEAT,
PROMPT_PAUSE_RESUME, PROMPT_PAUSE_RESUME
PROMPT_INFO
}; };
extern PromptReason host_prompt_reason; extern PromptReason host_prompt_reason;

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

@ -399,9 +399,6 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
#elif defined(ACTION_ON_PAUSE) #elif defined(ACTION_ON_PAUSE)
host_action_pause(); host_action_pause();
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Pause"));
#endif
#endif #endif
if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) { 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; --did_pause_print;
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Resume"));
#endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
if (did_pause_print) { if (did_pause_print) {
card.startFileprint(); card.startFileprint();

3
Marlin/src/gcode/sdcard/M24_M25.cpp
View File

@ -61,9 +61,6 @@ void GcodeSuite::M24() {
} }
#if ENABLED(HOST_ACTION_COMMANDS) #if ENABLED(HOST_ACTION_COMMANDS)
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Resume SD"));
#endif
#ifdef ACTION_ON_RESUME #ifdef ACTION_ON_RESUME
host_action_resume(); host_action_resume();
#endif #endif

3
Marlin/src/lcd/ultralcd.cpp
View File

@ -1480,9 +1480,6 @@ void MarlinUI::update() {
#ifdef ACTION_ON_CANCEL #ifdef ACTION_ON_CANCEL
host_action_cancel(); host_action_cancel();
#endif #endif
#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("UI Abort"));
#endif
print_job_timer.stop(); print_job_timer.stop();
set_status_P(PSTR(MSG_PRINT_ABORTED)); set_status_P(PSTR(MSG_PRINT_ABORTED));
#if HAS_LCD_MENU #if HAS_LCD_MENU

4
Marlin/src/lcd/ultralcd.h
View File

@ -95,8 +95,8 @@
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
void lcd_pause_show_message(const PauseMessage message, void lcd_pause_show_message(const PauseMessage message,
const PauseMode mode=PAUSE_MODE_SAME, const PauseMode mode=PAUSE_MODE_SAME,
const uint8_t extruder=active_extruder); const uint8_t extruder=active_extruder);
#endif #endif
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)