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

Merge pull request #112 from PavelSindler/menu_corrections

Browse Source 
Menu corrections, translation to Czech language
This commit is contained in:
PavelSindler 2017-11-27 18:00:31 +01:00 committed by GitHub
commit ddc8587bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 153 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration_prusa.h
View File

@ -381,7 +381,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215
#define PLA_PREHEAT_HPB_TEMP 55 #define PLA_PREHEAT_HPB_TEMP 60
#define PLA_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_FAN_SPEED 0
#define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HOTEND_TEMP 255

96
Firmware/language_all.cpp
View File

@ -279,8 +279,10 @@ const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = {
}; };
const char MSG_CALIBRATE_Z_AUTO_EN[] PROGMEM = "Calibrating Z"; const char MSG_CALIBRATE_Z_AUTO_EN[] PROGMEM = "Calibrating Z";
const char * const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[1] PROGMEM = { const char MSG_CALIBRATE_Z_AUTO_CZ[] PROGMEM = "Kalibruji Z";
MSG_CALIBRATE_Z_AUTO_EN const char * const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_CALIBRATE_Z_AUTO_EN,
MSG_CALIBRATE_Z_AUTO_CZ
}; };
const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration"; const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration";
@ -388,13 +390,17 @@ const char * const MSG_COUNT_X_LANG_TABLE[1] PROGMEM = {
}; };
const char MSG_CRASHDETECT_OFF_EN[] PROGMEM = "Crash det. [off]"; const char MSG_CRASHDETECT_OFF_EN[] PROGMEM = "Crash det. [off]";
const char * const MSG_CRASHDETECT_OFF_LANG_TABLE[1] PROGMEM = { const char MSG_CRASHDETECT_OFF_CZ[] PROGMEM = "Crash det. [vyp]";
MSG_CRASHDETECT_OFF_EN const char * const MSG_CRASHDETECT_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_CRASHDETECT_OFF_EN,
MSG_CRASHDETECT_OFF_CZ
}; };
const char MSG_CRASHDETECT_ON_EN[] PROGMEM = "Crash det. [on]"; const char MSG_CRASHDETECT_ON_EN[] PROGMEM = "Crash det. [on]";
const char * const MSG_CRASHDETECT_ON_LANG_TABLE[1] PROGMEM = { const char MSG_CRASHDETECT_ON_CZ[] PROGMEM = "Crash det. [zap]";
MSG_CRASHDETECT_ON_EN const char * const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_CRASHDETECT_ON_EN,
MSG_CRASHDETECT_ON_CZ
}; };
const char MSG_CRASH_DETECTED_EN[] PROGMEM = "Crash detected. Continue printing?"; const char MSG_CRASH_DETECTED_EN[] PROGMEM = "Crash detected. Continue printing?";
@ -547,6 +553,20 @@ const char * const MSG_FACTOR_LANG_TABLE[1] PROGMEM = {
MSG_FACTOR_EN MSG_FACTOR_EN
}; };
const char MSG_FANS_CHECK_OFF_EN[] PROGMEM = "Fans check [off]";
const char MSG_FANS_CHECK_OFF_CZ[] PROGMEM = "Kontr. vent.[vyp]";
const char * const MSG_FANS_CHECK_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FANS_CHECK_OFF_EN,
MSG_FANS_CHECK_OFF_CZ
};
const char MSG_FANS_CHECK_ON_EN[] PROGMEM = "Fans check [on]";
const char MSG_FANS_CHECK_ON_CZ[] PROGMEM = "Kontr. vent.[zap]";
const char * const MSG_FANS_CHECK_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FANS_CHECK_ON_EN,
MSG_FANS_CHECK_ON_CZ
};
const char MSG_FAN_SPEED_EN[] PROGMEM = "Fan speed"; const char MSG_FAN_SPEED_EN[] PROGMEM = "Fan speed";
const char MSG_FAN_SPEED_CZ[] PROGMEM = "Rychlost vent."; const char MSG_FAN_SPEED_CZ[] PROGMEM = "Rychlost vent.";
const char * const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM] PROGMEM = {
@ -681,13 +701,17 @@ const char * const MSG_FREE_MEMORY_LANG_TABLE[1] PROGMEM = {
}; };
const char MSG_FSENSOR_OFF_EN[] PROGMEM = "Fil. sensor [off]"; const char MSG_FSENSOR_OFF_EN[] PROGMEM = "Fil. sensor [off]";
const char * const MSG_FSENSOR_OFF_LANG_TABLE[1] PROGMEM = { const char MSG_FSENSOR_OFF_CZ[] PROGMEM = "Fil. senzor [vyp]";
MSG_FSENSOR_OFF_EN const char * const MSG_FSENSOR_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FSENSOR_OFF_EN,
MSG_FSENSOR_OFF_CZ
}; };
const char MSG_FSENSOR_ON_EN[] PROGMEM = "Fil. sensor [on]"; const char MSG_FSENSOR_ON_EN[] PROGMEM = "Fil. sensor [on]";
const char * const MSG_FSENSOR_ON_LANG_TABLE[1] PROGMEM = { const char MSG_FSENSOR_ON_CZ[] PROGMEM = "Fil. senzor [zap]";
MSG_FSENSOR_ON_EN const char * const MSG_FSENSOR_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FSENSOR_ON_EN,
MSG_FSENSOR_ON_CZ
}; };
const char MSG_HEATING_EN[] PROGMEM = "Heating"; const char MSG_HEATING_EN[] PROGMEM = "Heating";
@ -1187,8 +1211,10 @@ const char * const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM] PROGMEM = {
}; };
const char MSG_PLACE_STEEL_SHEET_EN[] PROGMEM = "Please place steel sheet on heatbed."; const char MSG_PLACE_STEEL_SHEET_EN[] PROGMEM = "Please place steel sheet on heatbed.";
const char * const MSG_PLACE_STEEL_SHEET_LANG_TABLE[1] PROGMEM = { const char MSG_PLACE_STEEL_SHEET_CZ[] PROGMEM = "Umistete prosim tiskovy plat na heatbed";
MSG_PLACE_STEEL_SHEET_EN const char * const MSG_PLACE_STEEL_SHEET_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_PLACE_STEEL_SHEET_EN,
MSG_PLACE_STEEL_SHEET_CZ
}; };
const char MSG_PLANNER_BUFFER_BYTES_EN[] PROGMEM = " PlannerBufferBytes: "; const char MSG_PLANNER_BUFFER_BYTES_EN[] PROGMEM = " PlannerBufferBytes: ";
@ -1303,8 +1329,10 @@ const char * const MSG_REBOOT_LANG_TABLE[LANG_NUM] PROGMEM = {
}; };
const char MSG_RECOVERING_PRINT_EN[] PROGMEM = "Recovering print "; const char MSG_RECOVERING_PRINT_EN[] PROGMEM = "Recovering print ";
const char * const MSG_RECOVERING_PRINT_LANG_TABLE[1] PROGMEM = { const char MSG_RECOVERING_PRINT_CZ[] PROGMEM = "Obnovovani tisku ";
MSG_RECOVERING_PRINT_EN const char * const MSG_RECOVERING_PRINT_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_RECOVERING_PRINT_EN,
MSG_RECOVERING_PRINT_CZ
}; };
const char MSG_RECOVER_PRINT_EN[] PROGMEM = "Blackout occurred. Recover print?"; const char MSG_RECOVER_PRINT_EN[] PROGMEM = "Blackout occurred. Recover print?";
@ -1323,8 +1351,10 @@ const char * const MSG_REFRESH_LANG_TABLE[1] PROGMEM = {
}; };
const char MSG_REMOVE_STEEL_SHEET_EN[] PROGMEM = "Please remove steel sheet from heatbed."; const char MSG_REMOVE_STEEL_SHEET_EN[] PROGMEM = "Please remove steel sheet from heatbed.";
const char * const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[1] PROGMEM = { const char MSG_REMOVE_STEEL_SHEET_CZ[] PROGMEM = "Odstrante tiskovy plat z heatbed prosim.";
MSG_REMOVE_STEEL_SHEET_EN const char * const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_REMOVE_STEEL_SHEET_EN,
MSG_REMOVE_STEEL_SHEET_CZ
}; };
const char MSG_RESEND_EN[] PROGMEM = "Resend: "; const char MSG_RESEND_EN[] PROGMEM = "Resend: ";
@ -1465,13 +1495,17 @@ const char * const MSG_SELFTEST_LANG_TABLE[1] PROGMEM = {
}; };
const char MSG_SELFTEST_AXIS_EN[] PROGMEM = "Axis"; const char MSG_SELFTEST_AXIS_EN[] PROGMEM = "Axis";
const char * const MSG_SELFTEST_AXIS_LANG_TABLE[1] PROGMEM = { const char MSG_SELFTEST_AXIS_CZ[] PROGMEM = "Osa";
MSG_SELFTEST_AXIS_EN const char * const MSG_SELFTEST_AXIS_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SELFTEST_AXIS_EN,
MSG_SELFTEST_AXIS_CZ
}; };
const char MSG_SELFTEST_AXIS_LENGTH_EN[] PROGMEM = "Axis length"; const char MSG_SELFTEST_AXIS_LENGTH_EN[] PROGMEM = "Axis length";
const char * const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[1] PROGMEM = { const char MSG_SELFTEST_AXIS_LENGTH_CZ[] PROGMEM = "Delka osy";
MSG_SELFTEST_AXIS_LENGTH_EN const char * const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SELFTEST_AXIS_LENGTH_EN,
MSG_SELFTEST_AXIS_LENGTH_CZ
}; };
const char MSG_SELFTEST_BEDHEATER_EN[] PROGMEM = "Bed / Heater"; const char MSG_SELFTEST_BEDHEATER_EN[] PROGMEM = "Bed / Heater";
@ -1674,15 +1708,15 @@ const char * const MSG_SHOW_END_STOPS_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SHOW_END_STOPS_CZ MSG_SHOW_END_STOPS_CZ
}; };
const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [high power]"; const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [Normal]";
const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [vys. vykon]"; const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [Normal]";
const char * const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SILENT_MODE_OFF_EN, MSG_SILENT_MODE_OFF_EN,
MSG_SILENT_MODE_OFF_CZ MSG_SILENT_MODE_OFF_CZ
}; };
const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [silent]"; const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [Stealth]";
const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [tichy]"; const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [Stealth]";
const char * const MSG_SILENT_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_SILENT_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SILENT_MODE_ON_EN, MSG_SILENT_MODE_ON_EN,
MSG_SILENT_MODE_ON_CZ MSG_SILENT_MODE_ON_CZ
@ -1748,8 +1782,10 @@ const char * const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM] PROGMEM = {
}; };
const char MSG_STEEL_SHEET_CHECK_EN[] PROGMEM = "Is steel sheet on heatbed?"; const char MSG_STEEL_SHEET_CHECK_EN[] PROGMEM = "Is steel sheet on heatbed?";
const char * const MSG_STEEL_SHEET_CHECK_LANG_TABLE[1] PROGMEM = { const char MSG_STEEL_SHEET_CHECK_CZ[] PROGMEM = "Je tiskovy plat na heatbed?";
MSG_STEEL_SHEET_CHECK_EN const char * const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_STEEL_SHEET_CHECK_EN,
MSG_STEEL_SHEET_CHECK_CZ
}; };
const char MSG_STEPPER_TOO_HIGH_EN[] PROGMEM = "Steprate too high: "; const char MSG_STEPPER_TOO_HIGH_EN[] PROGMEM = "Steprate too high: ";
@ -1823,15 +1859,15 @@ const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_TEMP_CALIBRATION_DONE_CZ MSG_TEMP_CALIBRATION_DONE_CZ
}; };
const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal. [OFF]"; const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal. [off]";
const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [OFF]"; const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [vyp]";
const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_TEMP_CALIBRATION_OFF_EN, MSG_TEMP_CALIBRATION_OFF_EN,
MSG_TEMP_CALIBRATION_OFF_CZ MSG_TEMP_CALIBRATION_OFF_CZ
}; };
const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal. [ON]"; const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal. [on]";
const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [ON]"; const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [zap]";
const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_TEMP_CALIBRATION_ON_EN, MSG_TEMP_CALIBRATION_ON_EN,
MSG_TEMP_CALIBRATION_ON_CZ MSG_TEMP_CALIBRATION_ON_CZ

48
Firmware/language_all.h
View File

@ -108,8 +108,8 @@ extern const char* const MSG_CALIBRATE_E_LANG_TABLE[LANG_NUM];
#define MSG_CALIBRATE_E LANG_TABLE_SELECT(MSG_CALIBRATE_E_LANG_TABLE) #define MSG_CALIBRATE_E LANG_TABLE_SELECT(MSG_CALIBRATE_E_LANG_TABLE)
extern const char* const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM]; extern const char* const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM];
#define MSG_CALIBRATE_PINDA LANG_TABLE_SELECT(MSG_CALIBRATE_PINDA_LANG_TABLE) #define MSG_CALIBRATE_PINDA LANG_TABLE_SELECT(MSG_CALIBRATE_PINDA_LANG_TABLE)
extern const char* const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[1]; extern const char* const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[LANG_NUM];
#define MSG_CALIBRATE_Z_AUTO LANG_TABLE_SELECT_EXPLICIT(MSG_CALIBRATE_Z_AUTO_LANG_TABLE, 0) #define MSG_CALIBRATE_Z_AUTO LANG_TABLE_SELECT(MSG_CALIBRATE_Z_AUTO_LANG_TABLE)
extern const char* const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM]; extern const char* const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM];
#define MSG_CALIBRATION_PINDA_MENU LANG_TABLE_SELECT(MSG_CALIBRATION_PINDA_MENU_LANG_TABLE) #define MSG_CALIBRATION_PINDA_MENU LANG_TABLE_SELECT(MSG_CALIBRATION_PINDA_MENU_LANG_TABLE)
extern const char* const MSG_CARD_MENU_LANG_TABLE[LANG_NUM]; extern const char* const MSG_CARD_MENU_LANG_TABLE[LANG_NUM];
@ -142,10 +142,10 @@ extern const char* const MSG_CORRECTLY_LANG_TABLE[LANG_NUM];
#define MSG_CORRECTLY LANG_TABLE_SELECT(MSG_CORRECTLY_LANG_TABLE) #define MSG_CORRECTLY LANG_TABLE_SELECT(MSG_CORRECTLY_LANG_TABLE)
extern const char* const MSG_COUNT_X_LANG_TABLE[1]; extern const char* const MSG_COUNT_X_LANG_TABLE[1];
#define MSG_COUNT_X LANG_TABLE_SELECT_EXPLICIT(MSG_COUNT_X_LANG_TABLE, 0) #define MSG_COUNT_X LANG_TABLE_SELECT_EXPLICIT(MSG_COUNT_X_LANG_TABLE, 0)
extern const char* const MSG_CRASHDETECT_OFF_LANG_TABLE[1]; extern const char* const MSG_CRASHDETECT_OFF_LANG_TABLE[LANG_NUM];
#define MSG_CRASHDETECT_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_OFF_LANG_TABLE, 0) #define MSG_CRASHDETECT_OFF LANG_TABLE_SELECT(MSG_CRASHDETECT_OFF_LANG_TABLE)
extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[1]; extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM];
#define MSG_CRASHDETECT_ON LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_ON_LANG_TABLE, 0) #define MSG_CRASHDETECT_ON LANG_TABLE_SELECT(MSG_CRASHDETECT_ON_LANG_TABLE)
extern const char* const MSG_CRASH_DETECTED_LANG_TABLE[1]; extern const char* const MSG_CRASH_DETECTED_LANG_TABLE[1];
#define MSG_CRASH_DETECTED LANG_TABLE_SELECT_EXPLICIT(MSG_CRASH_DETECTED_LANG_TABLE, 0) #define MSG_CRASH_DETECTED LANG_TABLE_SELECT_EXPLICIT(MSG_CRASH_DETECTED_LANG_TABLE, 0)
extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM]; extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM];
@ -202,6 +202,10 @@ extern const char* const MSG_Enqueing_LANG_TABLE[1];
#define MSG_Enqueing LANG_TABLE_SELECT_EXPLICIT(MSG_Enqueing_LANG_TABLE, 0) #define MSG_Enqueing LANG_TABLE_SELECT_EXPLICIT(MSG_Enqueing_LANG_TABLE, 0)
extern const char* const MSG_FACTOR_LANG_TABLE[1]; extern const char* const MSG_FACTOR_LANG_TABLE[1];
#define MSG_FACTOR LANG_TABLE_SELECT_EXPLICIT(MSG_FACTOR_LANG_TABLE, 0) #define MSG_FACTOR LANG_TABLE_SELECT_EXPLICIT(MSG_FACTOR_LANG_TABLE, 0)
extern const char* const MSG_FANS_CHECK_OFF_LANG_TABLE[LANG_NUM];
#define MSG_FANS_CHECK_OFF LANG_TABLE_SELECT(MSG_FANS_CHECK_OFF_LANG_TABLE)
extern const char* const MSG_FANS_CHECK_ON_LANG_TABLE[LANG_NUM];
#define MSG_FANS_CHECK_ON LANG_TABLE_SELECT(MSG_FANS_CHECK_ON_LANG_TABLE)
extern const char* const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM]; extern const char* const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM];
#define MSG_FAN_SPEED LANG_TABLE_SELECT(MSG_FAN_SPEED_LANG_TABLE) #define MSG_FAN_SPEED LANG_TABLE_SELECT(MSG_FAN_SPEED_LANG_TABLE)
extern const char* const MSG_FARM_CARD_MENU_LANG_TABLE[1]; extern const char* const MSG_FARM_CARD_MENU_LANG_TABLE[1];
@ -244,10 +248,10 @@ extern const char* const MSG_FOLLOW_CALIBRATION_FLOW_LANG_TABLE[LANG_NUM];
#define MSG_FOLLOW_CALIBRATION_FLOW LANG_TABLE_SELECT(MSG_FOLLOW_CALIBRATION_FLOW_LANG_TABLE) #define MSG_FOLLOW_CALIBRATION_FLOW LANG_TABLE_SELECT(MSG_FOLLOW_CALIBRATION_FLOW_LANG_TABLE)
extern const char* const MSG_FREE_MEMORY_LANG_TABLE[1]; extern const char* const MSG_FREE_MEMORY_LANG_TABLE[1];
#define MSG_FREE_MEMORY LANG_TABLE_SELECT_EXPLICIT(MSG_FREE_MEMORY_LANG_TABLE, 0) #define MSG_FREE_MEMORY LANG_TABLE_SELECT_EXPLICIT(MSG_FREE_MEMORY_LANG_TABLE, 0)
extern const char* const MSG_FSENSOR_OFF_LANG_TABLE[1]; extern const char* const MSG_FSENSOR_OFF_LANG_TABLE[LANG_NUM];
#define MSG_FSENSOR_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_FSENSOR_OFF_LANG_TABLE, 0) #define MSG_FSENSOR_OFF LANG_TABLE_SELECT(MSG_FSENSOR_OFF_LANG_TABLE)
extern const char* const MSG_FSENSOR_ON_LANG_TABLE[1]; extern const char* const MSG_FSENSOR_ON_LANG_TABLE[LANG_NUM];
#define MSG_FSENSOR_ON LANG_TABLE_SELECT_EXPLICIT(MSG_FSENSOR_ON_LANG_TABLE, 0) #define MSG_FSENSOR_ON LANG_TABLE_SELECT(MSG_FSENSOR_ON_LANG_TABLE)
extern const char* const MSG_HEATING_LANG_TABLE[LANG_NUM]; extern const char* const MSG_HEATING_LANG_TABLE[LANG_NUM];
#define MSG_HEATING LANG_TABLE_SELECT(MSG_HEATING_LANG_TABLE) #define MSG_HEATING LANG_TABLE_SELECT(MSG_HEATING_LANG_TABLE)
extern const char* const MSG_HEATING_COMPLETE_LANG_TABLE[LANG_NUM]; extern const char* const MSG_HEATING_COMPLETE_LANG_TABLE[LANG_NUM];
@ -410,8 +414,8 @@ extern const char* const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM];
#define MSG_PINDA_NOT_CALIBRATED LANG_TABLE_SELECT(MSG_PINDA_NOT_CALIBRATED_LANG_TABLE) #define MSG_PINDA_NOT_CALIBRATED LANG_TABLE_SELECT(MSG_PINDA_NOT_CALIBRATED_LANG_TABLE)
extern const char* const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM]; extern const char* const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM];
#define MSG_PINDA_PREHEAT LANG_TABLE_SELECT(MSG_PINDA_PREHEAT_LANG_TABLE) #define MSG_PINDA_PREHEAT LANG_TABLE_SELECT(MSG_PINDA_PREHEAT_LANG_TABLE)
extern const char* const MSG_PLACE_STEEL_SHEET_LANG_TABLE[1]; extern const char* const MSG_PLACE_STEEL_SHEET_LANG_TABLE[LANG_NUM];
#define MSG_PLACE_STEEL_SHEET LANG_TABLE_SELECT_EXPLICIT(MSG_PLACE_STEEL_SHEET_LANG_TABLE, 0) #define MSG_PLACE_STEEL_SHEET LANG_TABLE_SELECT(MSG_PLACE_STEEL_SHEET_LANG_TABLE)
extern const char* const MSG_PLANNER_BUFFER_BYTES_LANG_TABLE[1]; extern const char* const MSG_PLANNER_BUFFER_BYTES_LANG_TABLE[1];
#define MSG_PLANNER_BUFFER_BYTES LANG_TABLE_SELECT_EXPLICIT(MSG_PLANNER_BUFFER_BYTES_LANG_TABLE, 0) #define MSG_PLANNER_BUFFER_BYTES LANG_TABLE_SELECT_EXPLICIT(MSG_PLANNER_BUFFER_BYTES_LANG_TABLE, 0)
extern const char* const MSG_PLA_FILAMENT_LOADED_LANG_TABLE[LANG_NUM]; extern const char* const MSG_PLA_FILAMENT_LOADED_LANG_TABLE[LANG_NUM];
@ -446,16 +450,16 @@ extern const char* const MSG_PRUSA3D_HOWTO_LANG_TABLE[LANG_NUM];
#define MSG_PRUSA3D_HOWTO LANG_TABLE_SELECT(MSG_PRUSA3D_HOWTO_LANG_TABLE) #define MSG_PRUSA3D_HOWTO LANG_TABLE_SELECT(MSG_PRUSA3D_HOWTO_LANG_TABLE)
extern const char* const MSG_REBOOT_LANG_TABLE[LANG_NUM]; extern const char* const MSG_REBOOT_LANG_TABLE[LANG_NUM];
#define MSG_REBOOT LANG_TABLE_SELECT(MSG_REBOOT_LANG_TABLE) #define MSG_REBOOT LANG_TABLE_SELECT(MSG_REBOOT_LANG_TABLE)
extern const char* const MSG_RECOVERING_PRINT_LANG_TABLE[1]; extern const char* const MSG_RECOVERING_PRINT_LANG_TABLE[LANG_NUM];
#define MSG_RECOVERING_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVERING_PRINT_LANG_TABLE, 0) #define MSG_RECOVERING_PRINT LANG_TABLE_SELECT(MSG_RECOVERING_PRINT_LANG_TABLE)
extern const char* const MSG_RECOVER_PRINT_LANG_TABLE[1]; extern const char* const MSG_RECOVER_PRINT_LANG_TABLE[1];
#define MSG_RECOVER_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVER_PRINT_LANG_TABLE, 0) #define MSG_RECOVER_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVER_PRINT_LANG_TABLE, 0)
extern const char* const MSG_RECTRACT_LANG_TABLE[1]; extern const char* const MSG_RECTRACT_LANG_TABLE[1];
#define MSG_RECTRACT LANG_TABLE_SELECT_EXPLICIT(MSG_RECTRACT_LANG_TABLE, 0) #define MSG_RECTRACT LANG_TABLE_SELECT_EXPLICIT(MSG_RECTRACT_LANG_TABLE, 0)
extern const char* const MSG_REFRESH_LANG_TABLE[1]; extern const char* const MSG_REFRESH_LANG_TABLE[1];
#define MSG_REFRESH LANG_TABLE_SELECT_EXPLICIT(MSG_REFRESH_LANG_TABLE, 0) #define MSG_REFRESH LANG_TABLE_SELECT_EXPLICIT(MSG_REFRESH_LANG_TABLE, 0)
extern const char* const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[1]; extern const char* const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[LANG_NUM];
#define MSG_REMOVE_STEEL_SHEET LANG_TABLE_SELECT_EXPLICIT(MSG_REMOVE_STEEL_SHEET_LANG_TABLE, 0) #define MSG_REMOVE_STEEL_SHEET LANG_TABLE_SELECT(MSG_REMOVE_STEEL_SHEET_LANG_TABLE)
extern const char* const MSG_RESEND_LANG_TABLE[1]; extern const char* const MSG_RESEND_LANG_TABLE[1];
#define MSG_RESEND LANG_TABLE_SELECT_EXPLICIT(MSG_RESEND_LANG_TABLE, 0) #define MSG_RESEND LANG_TABLE_SELECT_EXPLICIT(MSG_RESEND_LANG_TABLE, 0)
extern const char* const MSG_RESET_CALIBRATE_E_LANG_TABLE[1]; extern const char* const MSG_RESET_CALIBRATE_E_LANG_TABLE[1];
@ -506,10 +510,10 @@ extern const char* const MSG_SD_WRITE_TO_FILE_LANG_TABLE[1];
#define MSG_SD_WRITE_TO_FILE LANG_TABLE_SELECT_EXPLICIT(MSG_SD_WRITE_TO_FILE_LANG_TABLE, 0) #define MSG_SD_WRITE_TO_FILE LANG_TABLE_SELECT_EXPLICIT(MSG_SD_WRITE_TO_FILE_LANG_TABLE, 0)
extern const char* const MSG_SELFTEST_LANG_TABLE[1]; extern const char* const MSG_SELFTEST_LANG_TABLE[1];
#define MSG_SELFTEST LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_LANG_TABLE, 0) #define MSG_SELFTEST LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_LANG_TABLE, 0)
extern const char* const MSG_SELFTEST_AXIS_LANG_TABLE[1]; extern const char* const MSG_SELFTEST_AXIS_LANG_TABLE[LANG_NUM];
#define MSG_SELFTEST_AXIS LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_AXIS_LANG_TABLE, 0) #define MSG_SELFTEST_AXIS LANG_TABLE_SELECT(MSG_SELFTEST_AXIS_LANG_TABLE)
extern const char* const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[1]; extern const char* const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[LANG_NUM];
#define MSG_SELFTEST_AXIS_LENGTH LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE, 0) #define MSG_SELFTEST_AXIS_LENGTH LANG_TABLE_SELECT(MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE)
extern const char* const MSG_SELFTEST_BEDHEATER_LANG_TABLE[1]; extern const char* const MSG_SELFTEST_BEDHEATER_LANG_TABLE[1];
#define MSG_SELFTEST_BEDHEATER LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_BEDHEATER_LANG_TABLE, 0) #define MSG_SELFTEST_BEDHEATER LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_BEDHEATER_LANG_TABLE, 0)
extern const char* const MSG_SELFTEST_CHECK_ALLCORRECT_LANG_TABLE[LANG_NUM]; extern const char* const MSG_SELFTEST_CHECK_ALLCORRECT_LANG_TABLE[LANG_NUM];
@ -596,8 +600,8 @@ extern const char* const MSG_STATS_TOTALFILAMENT_LANG_TABLE[LANG_NUM];
#define MSG_STATS_TOTALFILAMENT LANG_TABLE_SELECT(MSG_STATS_TOTALFILAMENT_LANG_TABLE) #define MSG_STATS_TOTALFILAMENT LANG_TABLE_SELECT(MSG_STATS_TOTALFILAMENT_LANG_TABLE)
extern const char* const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM]; extern const char* const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM];
#define MSG_STATS_TOTALPRINTTIME LANG_TABLE_SELECT(MSG_STATS_TOTALPRINTTIME_LANG_TABLE) #define MSG_STATS_TOTALPRINTTIME LANG_TABLE_SELECT(MSG_STATS_TOTALPRINTTIME_LANG_TABLE)
extern const char* const MSG_STEEL_SHEET_CHECK_LANG_TABLE[1]; extern const char* const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM];
#define MSG_STEEL_SHEET_CHECK LANG_TABLE_SELECT_EXPLICIT(MSG_STEEL_SHEET_CHECK_LANG_TABLE, 0) #define MSG_STEEL_SHEET_CHECK LANG_TABLE_SELECT(MSG_STEEL_SHEET_CHECK_LANG_TABLE)
extern const char* const MSG_STEPPER_TOO_HIGH_LANG_TABLE[1]; extern const char* const MSG_STEPPER_TOO_HIGH_LANG_TABLE[1];
#define MSG_STEPPER_TOO_HIGH LANG_TABLE_SELECT_EXPLICIT(MSG_STEPPER_TOO_HIGH_LANG_TABLE, 0) #define MSG_STEPPER_TOO_HIGH LANG_TABLE_SELECT_EXPLICIT(MSG_STEPPER_TOO_HIGH_LANG_TABLE, 0)
extern const char* const MSG_STOPPED_LANG_TABLE[1]; extern const char* const MSG_STOPPED_LANG_TABLE[1];

22
Firmware/language_cz.h
View File

@ -102,8 +102,8 @@
#define MSG_INSERT_FILAMENT "Vlozte filament" #define MSG_INSERT_FILAMENT "Vlozte filament"
#define MSG_CHANGING_FILAMENT "Vymena filamentu!" #define MSG_CHANGING_FILAMENT "Vymena filamentu!"
#define MSG_SILENT_MODE_ON "Mod [tichy]" #define MSG_SILENT_MODE_ON "Mod [Stealth]"
#define MSG_SILENT_MODE_OFF "Mod [vys. vykon]" #define MSG_SILENT_MODE_OFF "Mod [Normal]"
#define MSG_REBOOT "Restartujte tiskarnu" #define MSG_REBOOT "Restartujte tiskarnu"
#define MSG_TAKE_EFFECT " pro projeveni zmen" #define MSG_TAKE_EFFECT " pro projeveni zmen"
@ -290,8 +290,8 @@
#define MSG_PINDA_PREHEAT "Nahrivani PINDA" #define MSG_PINDA_PREHEAT "Nahrivani PINDA"
#define MSG_TEMP_CALIBRATION "Tepl. kal. " #define MSG_TEMP_CALIBRATION "Tepl. kal. "
#define MSG_TEMP_CALIBRATION_DONE "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka." #define MSG_TEMP_CALIBRATION_DONE "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka."
#define MSG_TEMP_CALIBRATION_ON "Tepl. kal. [ON]" #define MSG_TEMP_CALIBRATION_ON "Tepl. kal. [zap]"
#define MSG_TEMP_CALIBRATION_OFF "Tepl. kal. [OFF]" #define MSG_TEMP_CALIBRATION_OFF "Tepl. kal. [vyp]"
#define MSG_PREPARE_FILAMENT "Pripravte filament" #define MSG_PREPARE_FILAMENT "Pripravte filament"
#define MSG_ALL "Vse" #define MSG_ALL "Vse"
#define MSG_USED "Pouzite behem tisku" #define MSG_USED "Pouzite behem tisku"
@ -335,3 +335,17 @@
#define MSG_MEASURED_SKEW "Merene zkoseni:" #define MSG_MEASURED_SKEW "Merene zkoseni:"
#define MSG_SLIGHT_SKEW "Lehke zkoseni:" #define MSG_SLIGHT_SKEW "Lehke zkoseni:"
#define MSG_SEVERE_SKEW "Tezke zkoseni:" #define MSG_SEVERE_SKEW "Tezke zkoseni:"
#define MSG_CALIBRATE_Z_AUTO "Kalibruji Z"
#define MSG_FSENSOR_OFF "Fil. senzor [vyp]"
#define MSG_FSENSOR_ON "Fil. senzor [zap]"
#define MSG_CRASHDETECT_ON "Crash det. [zap]"
#define MSG_CRASHDETECT_OFF "Crash det. [vyp]"
#define MSG_FANS_CHECK_ON "Kontr. vent.[zap]"
#define MSG_FANS_CHECK_OFF "Kontr. vent.[vyp]"
#define MSG_RECOVERING_PRINT "Obnovovani tisku "
#define MSG_SELFTEST_AXIS "Osa"
#define MSG_SELFTEST_AXIS_LENGTH "Delka osy"
#define MSG_STEEL_SHEET_CHECK "Je tiskovy plat na heatbed?"
#define MSG_REMOVE_STEEL_SHEET "Odstrante tiskovy plat z heatbed prosim."
#define MSG_PLACE_STEEL_SHEET "Umistete prosim tiskovy plat na heatbed"

10
Firmware/language_en.h
View File

@ -101,8 +101,8 @@
#define(length=20) MSG_CHANGING_FILAMENT "Changing filament!" #define(length=20) MSG_CHANGING_FILAMENT "Changing filament!"
#define MSG_SILENT_MODE_ON "Mode [silent]" #define MSG_SILENT_MODE_ON "Mode [Stealth]"
#define MSG_SILENT_MODE_OFF "Mode [high power]" #define MSG_SILENT_MODE_OFF "Mode [Normal]"
#define(length=20) MSG_REBOOT "Reboot the printer" #define(length=20) MSG_REBOOT "Reboot the printer"
#define(length=20) MSG_TAKE_EFFECT " for take effect" #define(length=20) MSG_TAKE_EFFECT " for take effect"
@ -291,8 +291,8 @@
#define(length=20, lines=1) MSG_PINDA_PREHEAT "PINDA Heating" #define(length=20, lines=1) MSG_PINDA_PREHEAT "PINDA Heating"
#define(length=20, lines=1) MSG_TEMP_CALIBRATION "Temp. cal. " #define(length=20, lines=1) MSG_TEMP_CALIBRATION "Temp. cal. "
#define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue." #define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE "Temperature calibration is finished. Click to continue."
#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "Temp. cal. [ON]" #define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "Temp. cal. [on]"
#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "Temp. cal. [OFF]" #define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "Temp. cal. [off]"
#define(length=20, lines=1) MSG_PREPARE_FILAMENT "Prepare new filament" #define(length=20, lines=1) MSG_PREPARE_FILAMENT "Prepare new filament"
#define(length=19, lines=1) MSG_ALL "All" #define(length=19, lines=1) MSG_ALL "All"
#define(length=19, lines=1) MSG_USED "Used during print" #define(length=19, lines=1) MSG_USED "Used during print"
@ -364,3 +364,5 @@
#define(length=11, lines=1) MSG_INFO_PRINT_FAN "Print FAN: " #define(length=11, lines=1) MSG_INFO_PRINT_FAN "Print FAN: "
#define(length=11, lines=1) MSG_INFO_FILAMENT_XDIFF "Fil. Xd:" #define(length=11, lines=1) MSG_INFO_FILAMENT_XDIFF "Fil. Xd:"
#define(length=11, lines=1) MSG_INFO_FILAMENT_YDIFF "Fil. Ydiff:" #define(length=11, lines=1) MSG_INFO_FILAMENT_YDIFF "Fil. Ydiff:"
#define(length=17, lines=1) MSG_FANS_CHECK_ON "Fans check [on]"
#define(length=17, lines=1) MSG_FANS_CHECK_OFF "Fans check [off]"

71
Firmware/ultralcd.cpp
View File

@ -1598,9 +1598,9 @@ static void lcd_preheat_menu()
if (farm_mode) if (farm_mode)
MENU_ITEM(function, PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); MENU_ITEM(function, PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm);
MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs);
MENU_ITEM(function, PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM(function, PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla);
MENU_ITEM(function, PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); MENU_ITEM(function, PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet);
MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs);
MENU_ITEM(function, PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); MENU_ITEM(function, PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips);
MENU_ITEM(function, PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); MENU_ITEM(function, PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp);
MENU_ITEM(function, PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex); MENU_ITEM(function, PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex);
@ -1668,24 +1668,14 @@ static void lcd_support_menu()
MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status); MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status);
MENU_ITEM(submenu, PSTR("Temperatures"), lcd_menu_temperatures); MENU_ITEM(submenu, PSTR("Temperatures"), lcd_menu_temperatures);
if (fans_check_enabled == true) {
MENU_ITEM(function, PSTR("Check fans [EN]"), lcd_set_fan_check);
}
else {
MENU_ITEM(function, PSTR("Check fans [DIS]"), lcd_set_fan_check);
}
#endif //MK1BP #endif //MK1BP
#ifdef AUTOMATIC_RECOVERY_AFTER_CRASH
MENU_ITEM(back, PSTR("Auto recover crash"), lcd_main_menu);
#endif
END_MENU(); END_MENU();
} }
void lcd_set_fan_check() { void lcd_set_fan_check() {
fans_check_enabled = !fans_check_enabled; fans_check_enabled = !fans_check_enabled;
eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled);
lcd_goto_menu(lcd_support_menu, 15); lcd_goto_menu(lcd_settings_menu, 8);
} }
void lcd_unLoadFilament() void lcd_unLoadFilament()
@ -3248,7 +3238,8 @@ static void lcd_silent_mode_set() {
sei(); sei();
#endif //TMC2130 #endif //TMC2130
digipot_init(); digipot_init();
lcd_goto_menu(lcd_settings_menu, 7); if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 8);
else lcd_goto_menu(lcd_settings_menu, 7);
} }
static void lcd_crash_mode_set() static void lcd_crash_mode_set()
@ -3259,7 +3250,8 @@ static void lcd_crash_mode_set()
}else{ }else{
crashdet_enable(); crashdet_enable();
} }
lcd_goto_menu(lcd_settings_menu, 7); if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 9);
else lcd_goto_menu(lcd_settings_menu, 9);
} }
@ -3281,7 +3273,8 @@ static void lcd_fsensor_state_set()
}else{ }else{
fsensor_enable(); fsensor_enable();
} }
lcd_goto_menu(lcd_settings_menu, 7); if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 7);
else lcd_goto_menu(lcd_settings_menu, 7);
} }
@ -3327,12 +3320,6 @@ void lcd_pinda_calibration_menu()
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_MENU_CALIBRATION, lcd_calibration_menu); MENU_ITEM(back, MSG_MENU_CALIBRATION, lcd_calibration_menu);
MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda); MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda);
if (temp_cal_active == false) {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
}
else {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
}
END_MENU(); END_MENU();
} }
@ -3340,7 +3327,7 @@ void lcd_temp_calibration_set() {
temp_cal_active = !temp_cal_active; temp_cal_active = !temp_cal_active;
eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, temp_cal_active); eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, temp_cal_active);
digipot_init(); digipot_init();
lcd_goto_menu(lcd_pinda_calibration_menu, 2); lcd_goto_menu(lcd_settings_menu, 10);
} }
void lcd_calibrate_pinda() { void lcd_calibrate_pinda() {
@ -3680,12 +3667,13 @@ static void lcd_settings_menu()
} else { } else {
MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set); MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set);
} }
if (fans_check_enabled == true) {
if (SilentModeMenu == 0) { MENU_ITEM(function, MSG_FANS_CHECK_ON, lcd_set_fan_check);
MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
} else {
MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
} }
else {
MENU_ITEM(function, MSG_FANS_CHECK_OFF, lcd_set_fan_check);
}
if (SilentModeMenu == 0) { if (SilentModeMenu == 0) {
if (CrashDetectMenu == 0) { if (CrashDetectMenu == 0) {
@ -3694,7 +3682,18 @@ static void lcd_settings_menu()
MENU_ITEM(function, MSG_CRASHDETECT_ON, lcd_crash_mode_set); MENU_ITEM(function, MSG_CRASHDETECT_ON, lcd_crash_mode_set);
} }
} }
if (temp_cal_active == false) {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
}
else {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
}
if (SilentModeMenu == 0) {
MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
}
else {
MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
}
if (!isPrintPaused && !homing_flag) if (!isPrintPaused && !homing_flag)
{ {
MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z); MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
@ -3727,30 +3726,27 @@ static void lcd_calibration_menu()
MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
if (!isPrintPaused) if (!isPrintPaused)
{ {
MENU_ITEM(function, MSG_WIZARD, lcd_wizard);
MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration);
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v); MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v);
#ifdef MK1BP #ifdef MK1BP
// MK1 // MK1
// "Calibrate Z" // "Calibrate Z"
MENU_ITEM(gcode, MSG_HOMEYZ, PSTR("G28 Z")); MENU_ITEM(gcode, MSG_HOMEYZ, PSTR("G28 Z"));
#else //MK1BP #else //MK1BP
// MK2 // MK2
MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration); MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
// "Calibrate Z" with storing the reference values to EEPROM. // "Calibrate Z" with storing the reference values to EEPROM.
MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z); MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z);
MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration);
#ifndef SNMM #ifndef SNMM
//MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder); //MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder);
#endif #endif
// "Mesh Bed Leveling" // "Mesh Bed Leveling"
MENU_ITEM(submenu, MSG_MESH_BED_LEVELING, lcd_mesh_bedleveling); MENU_ITEM(submenu, MSG_MESH_BED_LEVELING, lcd_mesh_bedleveling);
MENU_ITEM(function, MSG_WIZARD, lcd_wizard);
#endif //MK1BP #endif //MK1BP
MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed); MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed);
#ifndef MK1BP
MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
#endif //MK1BP
MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder); MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder);
MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops); MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops);
#ifndef MK1BP #ifndef MK1BP
@ -3759,6 +3755,9 @@ MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration);
#ifndef SNMM #ifndef SNMM
//MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset); //MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset);
#endif #endif
#ifndef MK1BP
MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
#endif //MK1BP
} }
END_MENU(); END_MENU();