diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 3b010e4f2..39e5c1081 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -232,7 +232,7 @@ const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; //// const char MSG_OCTOPRINT_READY[] PROGMEM_N1 = "// action:ready"; //// const char MSG_OCTOPRINT_NOT_READY[] PROGMEM_N1 = "// action:not_ready"; //// -const char MSG_OCTOPRINT_REPRINT[] PROGMEM_N1 = "// action:reprint"; //// +const char MSG_OCTOPRINT_START[] PROGMEM_N1 = "// action:start"; //// const char MSG_FANCHECK_HOTEND[] PROGMEM_N1 = "Err:HOTEND FAN ERROR"; ////c=20 const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err:PRINT FAN ERROR"; ////c=20 const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 7919375d5..9d8423fdc 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -236,7 +236,7 @@ extern const char MSG_OCTOPRINT_RESUMED[]; extern const char MSG_OCTOPRINT_CANCEL[]; extern const char MSG_OCTOPRINT_READY[]; extern const char MSG_OCTOPRINT_NOT_READY[]; -extern const char MSG_OCTOPRINT_REPRINT[]; +extern const char MSG_OCTOPRINT_START[]; extern const char MSG_FANCHECK_HOTEND[]; extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_M112_KILL[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f31b56b31..dc77bfe7a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5197,7 +5197,7 @@ static void lcd_main_menu() if(!printer_active() && (heating_status == HeatingStatus::NO_HEATING)) { if ((GetPrinterState() == PrinterState::SDPrintingFinished) && card.cardOK) { MENU_ITEM_SUBMENU_P(_T(MSG_REPRINT), reprint_from_eeprom); - } else if (GetPrinterState() == PrinterState::HostPrintingFinished) { + } else if ((GetPrinterState() == PrinterState::HostPrintingFinished) && M79_timer_get_status()) { MENU_ITEM_SUBMENU_P(_T(MSG_REPRINT), lcd_reprint_usb_print); } } @@ -7507,6 +7507,6 @@ void reprint_from_eeprom() { //! @brief Send host action "reprint" void lcd_reprint_usb_print() { - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_REPRINT); + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_START); lcd_return_to_status(); }