diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 46f128d4e..0a5ad203a 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -26,6 +26,7 @@ const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////MSG_COOLDOWN c=18 const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////MSG_CRASH c=7 const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////MSG_CRASH_DETECTED c=20 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////MSG_CRASHDETECT c=13 +const char MSG_DONE[] PROGMEM_I1 = ISTR("Done"); ////MSG_DONE c=8 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////MSG_ERROR c=10 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////MSG_EXTRUDER c=17 const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK c=13 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4153230b0..3b5511a16 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -32,6 +32,7 @@ extern const char MSG_COOLDOWN[]; extern const char MSG_CRASH[]; extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT[]; +extern const char MSG_DONE[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FANS_CHECK[]; diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 8ac16a534..f0d348451 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -350,12 +350,12 @@ static const char * const errorDescs[] PROGMEM = { // Beware - we only have space for 2 buttons on the LCD while the MMU has 3 buttons // -> the left button on the MMU is not used/rendered on the LCD (it is also almost unused on the MMU side) static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY c=8 -static const char MSG_BTN_DONE[] PROGMEM_I1 = ISTR("Done"); ////MSG_BTN_DONE c=8 +//static const char MSG_BTN_DONE[] PROGMEM_I1 = ISTR("Done"); //Reuse MSG_DONE c=8 static const char MSG_BTN_RESET_MMU[] PROGMEM_I1 = ISTR("ResetMMU"); ////MSG_BTN_RESET_MMU c=8 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_LOAD[] PROGMEM_I1 = ISTR("Load"); ////MSG_BTN_LOAD c=8 static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_BTN_EJECT c=8 -static const char MSG_BTN_TUNE_MMU[] PROGMEM_I1 = ISTR("Tune"); ////MSG_BTN_TUNE_MMU c=8 +//static const char MSG_BTN_TUNE_MMU[] PROGMEM_I1 = ISTR("Tune"); //Reuse MSG_TUNE c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; @@ -363,12 +363,12 @@ static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { _R(MSG_BTN_RETRY), - _R(MSG_BTN_DONE), + _R(MSG_DONE), _R(MSG_BTN_RESET_MMU), _R(MSG_BTN_UNLOAD), _R(MSG_BTN_LOAD), _R(MSG_BTN_EJECT), - _R(MSG_BTN_TUNE_MMU), + _R(MSG_TUNE), _R(MSG_BTN_STOP), _R(MSG_BTN_DISABLE_MMU), }; diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 45be6f156..d86f5abb1 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -421,7 +421,7 @@ void tuneIdlerStallguardThresholdMenu() { lcd_return_to_status(); return; ); - MENU_ITEM_BACK_P(_i("Done")); //@Todo same as MSG_BTN_DONE c=8 + MENU_ITEM_BACK_P(_T(MSG_DONE)); MENU_ITEM_EDIT_int3_P( _i("Sensitivity"), ////MSG_MMU_SENSITIVITY c=18 &_md->currentValue,