josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4520 from 3d-gussner/MK3_Reprint_OP 

Change Reprint action message to comply with OctoPrint actions
This commit is contained in:
3d-gussner 2023-12-01 09:06:32 +01:00 committed by GitHub
parent b37e39fdd9 096a1c9fe0
commit 02a5228f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.cpp
View File

@ -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_CANCEL[] PROGMEM_N1 = "// action:cancel"; ////
const char MSG_OCTOPRINT_READY[] PROGMEM_N1 = "// action:ready"; //// const char MSG_OCTOPRINT_READY[] PROGMEM_N1 = "// action:ready"; ////
const char MSG_OCTOPRINT_NOT_READY[] PROGMEM_N1 = "// action:not_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_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_FANCHECK_PRINT[] PROGMEM_N1 = "Err:PRINT FAN ERROR"; ////c=20
const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20 const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20

2
Firmware/messages.h
View File

@ -236,7 +236,7 @@ extern const char MSG_OCTOPRINT_RESUMED[];
extern const char MSG_OCTOPRINT_CANCEL[]; extern const char MSG_OCTOPRINT_CANCEL[];
extern const char MSG_OCTOPRINT_READY[]; extern const char MSG_OCTOPRINT_READY[];
extern const char MSG_OCTOPRINT_NOT_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_HOTEND[];
extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_FANCHECK_PRINT[];
extern const char MSG_M112_KILL[]; extern const char MSG_M112_KILL[];

4
Firmware/ultralcd.cpp
View File

@ -5197,7 +5197,7 @@ static void lcd_main_menu()
if(!printer_active() && (heating_status == HeatingStatus::NO_HEATING)) { if(!printer_active() && (heating_status == HeatingStatus::NO_HEATING)) {
if ((GetPrinterState() == PrinterState::SDPrintingFinished) && card.cardOK) { if ((GetPrinterState() == PrinterState::SDPrintingFinished) && card.cardOK) {
MENU_ITEM_SUBMENU_P(_T(MSG_REPRINT), reprint_from_eeprom); 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); MENU_ITEM_SUBMENU_P(_T(MSG_REPRINT), lcd_reprint_usb_print);
} }
} }
@ -7507,6 +7507,6 @@ void reprint_from_eeprom() {
//! @brief Send host action "reprint" //! @brief Send host action "reprint"
void lcd_reprint_usb_print() void lcd_reprint_usb_print()
{ {
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_REPRINT); SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_START);
lcd_return_to_status(); lcd_return_to_status();
} }