diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4021dd23..d237ee78 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3480,7 +3480,7 @@ void process_commands() if (calibration_status() >= CALIBRATION_STATUS_XYZ_CALIBRATION) { //we need to know accurate position of first calibration point //if xyz calibration was not performed yet, interrupt temperature calibration and inform user that xyz cal. is needed - lcd_show_fullscreen_message_and_wait_P(MSG_XYZ_CAL_NEEDED); + //lcd_show_fullscreen_message_and_wait_P(); //add message here break; } diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 7f4585c3..2b393eb9 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -2226,10 +2226,8 @@ const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_TEMP_CAL_FAILED_EN[] PROGMEM = "Temperature calibration failed"; -const char MSG_TEMP_CAL_FAILED_CZ[] PROGMEM = "Teplotni kalibrace selhala"; -const char * const MSG_TEMP_CAL_FAILED_LANG_TABLE[LANG_NUM] PROGMEM = { - MSG_TEMP_CAL_FAILED_EN, - MSG_TEMP_CAL_FAILED_CZ +const char * const MSG_TEMP_CAL_FAILED_LANG_TABLE[1] PROGMEM = { + MSG_TEMP_CAL_FAILED_EN }; const char MSG_TEMP_CAL_WARNING_EN[] PROGMEM = "Stable ambient temperature 21-26C is needed a rigid stand is required."; @@ -2518,13 +2516,6 @@ const char * const MSG_WIZARD_Z_CAL_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_WIZARD_Z_CAL_CZ }; -const char MSG_XYZ_CAL_NEEDED_EN[] PROGMEM = "Please run XYZ calibration first."; -const char MSG_XYZ_CAL_NEEDED_CZ[] PROGMEM = "Nejdriv spuste kalibraci XYZ prosim."; -const char * const MSG_XYZ_CAL_NEEDED_LANG_TABLE[LANG_NUM] PROGMEM = { - MSG_XYZ_CAL_NEEDED_EN, - MSG_XYZ_CAL_NEEDED_CZ -}; - const char MSG_XYZ_DETAILS_EN[] PROGMEM = "XYZ cal. details"; const char MSG_XYZ_DETAILS_CZ[] PROGMEM = "Detaily XYZ kal."; const char * const MSG_XYZ_DETAILS_LANG_TABLE[LANG_NUM] PROGMEM = { diff --git a/Firmware/language_all.h b/Firmware/language_all.h index 2e41eed2..c3cb069b 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -728,8 +728,8 @@ extern const char* const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM]; #define MSG_TEMP_CALIBRATION_OFF LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_OFF_LANG_TABLE) extern const char* const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM]; #define MSG_TEMP_CALIBRATION_ON LANG_TABLE_SELECT(MSG_TEMP_CALIBRATION_ON_LANG_TABLE) -extern const char* const MSG_TEMP_CAL_FAILED_LANG_TABLE[LANG_NUM]; -#define MSG_TEMP_CAL_FAILED LANG_TABLE_SELECT(MSG_TEMP_CAL_FAILED_LANG_TABLE) +extern const char* const MSG_TEMP_CAL_FAILED_LANG_TABLE[1]; +#define MSG_TEMP_CAL_FAILED LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CAL_FAILED_LANG_TABLE, 0) extern const char* const MSG_TEMP_CAL_WARNING_LANG_TABLE[1]; #define MSG_TEMP_CAL_WARNING LANG_TABLE_SELECT_EXPLICIT(MSG_TEMP_CAL_WARNING_LANG_TABLE, 0) extern const char* const MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_LANG_TABLE[1]; @@ -818,8 +818,6 @@ extern const char* const MSG_WIZARD_XYZ_CAL_LANG_TABLE[LANG_NUM]; #define MSG_WIZARD_XYZ_CAL LANG_TABLE_SELECT(MSG_WIZARD_XYZ_CAL_LANG_TABLE) extern const char* const MSG_WIZARD_Z_CAL_LANG_TABLE[LANG_NUM]; #define MSG_WIZARD_Z_CAL LANG_TABLE_SELECT(MSG_WIZARD_Z_CAL_LANG_TABLE) -extern const char* const MSG_XYZ_CAL_NEEDED_LANG_TABLE[LANG_NUM]; -#define MSG_XYZ_CAL_NEEDED LANG_TABLE_SELECT(MSG_XYZ_CAL_NEEDED_LANG_TABLE) extern const char* const MSG_XYZ_DETAILS_LANG_TABLE[LANG_NUM]; #define MSG_XYZ_DETAILS LANG_TABLE_SELECT(MSG_XYZ_DETAILS_LANG_TABLE) extern const char* const MSG_X_MAX_LANG_TABLE[1]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 35771cbd..a1ef81a1 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -415,5 +415,3 @@ #define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny." #define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu." #define MSG_WAITING_TEMP_PINDA "Cekani na zchladnuti PINDA" -#define MSG_TEMP_CAL_FAILED "Teplotni kalibrace selhala" -#define MSG_XYZ_CAL_NEEDED "Nejdriv spuste kalibraci XYZ prosim." diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 7b139a70..45a4c5a5 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -424,5 +424,4 @@ #define(length=20, lines=4) MSG_CHANGED_PRINTER "Warning: printer type changed." #define(length=20, lines=4) MSG_CHANGED_BOTH "Warning: both printer type and motherboard type changed." #define(length=20, lines=3) MSG_WAITING_TEMP_PINDA "Waiting for PINDA probe cooling" -#define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed" -#define(length=20, lines=8) MSG_XYZ_CAL_NEEDED "Please run XYZ calibration first." \ No newline at end of file +#define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed" \ No newline at end of file