diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 2b5e21d61..817890a05 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -192,9 +192,9 @@ const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; //// const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; //// const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Supervision required."; //// const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; //// -const char MSG_OCTOPRINT_PAUSE[] PROGMEM_N1 = "// action:pause"; //// +const char MSG_OCTOPRINT_ASK_PAUSE[] PROGMEM_N1 = "// action:pause"; //// const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; //// -const char MSG_OCTOPRINT_RESUME[] PROGMEM_N1 = "// action:resume"; //// +const char MSG_OCTOPRINT_ASK_RESUME[] PROGMEM_N1 = "// action:resume"; //// const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; //// const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 1cfbe6c37..c25a25ad7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -197,9 +197,9 @@ extern const char MSG_ERR_STOPPED[]; extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_EJECT_FILAMENT[]; extern const char MSG_CUT_FILAMENT[]; -extern const char MSG_OCTOPRINT_PAUSE[]; +extern const char MSG_OCTOPRINT_ASK_PAUSE[]; extern const char MSG_OCTOPRINT_PAUSED[]; -extern const char MSG_OCTOPRINT_RESUME[]; +extern const char MSG_OCTOPRINT_ASK_RESUME[]; extern const char MSG_OCTOPRINT_RESUMED[]; extern const char MSG_OCTOPRINT_CANCEL[]; extern const char MSG_FANCHECK_EXTRUDER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8f8f0caac..ce5adf3cc 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1091,10 +1091,7 @@ void lcd_pause_print() { stop_and_save_print_to_ram(0.0, -default_retraction); - if (!card.sdprinting) { - SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_PAUSED); - } - + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_PAUSED); isPrintPaused = true; // return to status is required to continue processing in the main loop! @@ -1105,7 +1102,7 @@ void lcd_pause_print() //! @brief Send host action "pause" void lcd_pause_usb_print() { - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_ASK_PAUSE); } static void lcd_move_menu_axis(); @@ -5737,7 +5734,7 @@ void lcd_resume_usb_print() if (!resume_print_checks()) return; // resume the usb host - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUME); + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_ASK_RESUME); } static void change_sheet()