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

removed message

Browse Source
This commit is contained in:
PavelSindler 2018-05-28 20:31:57 +02:00
parent 7e79ce8e53
commit 26724c4a48
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -3480,7 +3480,7 @@ void process_commands()
if (calibration_status() >= CALIBRATION_STATUS_XYZ_CALIBRATION) { if (calibration_status() >= CALIBRATION_STATUS_XYZ_CALIBRATION) {
//we need to know accurate position of first calibration point //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 //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; break;
} }

13
Firmware/language_all.cpp
View File

@ -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_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[1] PROGMEM = {
const char * const MSG_TEMP_CAL_FAILED_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_TEMP_CAL_FAILED_EN
MSG_TEMP_CAL_FAILED_EN,
MSG_TEMP_CAL_FAILED_CZ
}; };
const char MSG_TEMP_CAL_WARNING_EN[] PROGMEM = "Stable ambient temperature 21-26C is needed a rigid stand is required."; 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 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_EN[] PROGMEM = "XYZ cal. details";
const char MSG_XYZ_DETAILS_CZ[] PROGMEM = "Detaily XYZ kal."; const char MSG_XYZ_DETAILS_CZ[] PROGMEM = "Detaily XYZ kal.";
const char * const MSG_XYZ_DETAILS_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_XYZ_DETAILS_LANG_TABLE[LANG_NUM] PROGMEM = {

6
Firmware/language_all.h
View File

@ -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) #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]; 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) #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]; extern const char* const MSG_TEMP_CAL_FAILED_LANG_TABLE[1];
#define MSG_TEMP_CAL_FAILED LANG_TABLE_SELECT(MSG_TEMP_CAL_FAILED_LANG_TABLE) #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]; 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) #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]; 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) #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]; 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) #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]; extern const char* const MSG_XYZ_DETAILS_LANG_TABLE[LANG_NUM];
#define MSG_XYZ_DETAILS LANG_TABLE_SELECT(MSG_XYZ_DETAILS_LANG_TABLE) #define MSG_XYZ_DETAILS LANG_TABLE_SELECT(MSG_XYZ_DETAILS_LANG_TABLE)
extern const char* const MSG_X_MAX_LANG_TABLE[1]; extern const char* const MSG_X_MAX_LANG_TABLE[1];

2
Firmware/language_cz.h
View File

@ -415,5 +415,3 @@
#define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny." #define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny."
#define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu." #define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu."
#define MSG_WAITING_TEMP_PINDA "Cekani na zchladnuti PINDA" #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."

1
Firmware/language_en.h
View File

@ -425,4 +425,3 @@
#define(length=20, lines=4) MSG_CHANGED_BOTH "Warning: both printer type and motherboard 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=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_TEMP_CAL_FAILED "Temperature calibration failed"
#define(length=20, lines=8) MSG_XYZ_CAL_NEEDED "Please run XYZ calibration first."