From 2ce75293f3e85b0129ab8750fa0a23f844dac738 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 23 Mar 2018 19:49:59 +0100 Subject: [PATCH] stealth mode / silent mode --- Firmware/language_all.cpp | 24 ++++++++++++++++++++---- Firmware/language_all.h | 8 ++++++-- Firmware/language_cz.h | 8 ++++++-- Firmware/language_en.h | 3 +++ Firmware/ultralcd.cpp | 10 ++++++---- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 4dfc4c892..64b91f807 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -61,8 +61,10 @@ const char * const MSG_AUTO_HOME_LANG_TABLE[1] PROGMEM = { }; const char MSG_AUTO_MODE_ON_EN[] PROGMEM = "Mode [auto power]"; -const char * const MSG_AUTO_MODE_ON_LANG_TABLE[1] PROGMEM = { - MSG_AUTO_MODE_ON_EN +const char MSG_AUTO_MODE_ON_CZ[] PROGMEM = "Mod [automaticky]"; +const char * const MSG_AUTO_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_AUTO_MODE_ON_EN, + MSG_AUTO_MODE_ON_CZ }; const char MSG_A_RETRACT_EN[] PROGMEM = "A-retract"; @@ -1993,14 +1995,14 @@ const char * const MSG_SHOW_END_STOPS_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [high power]"; -const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [Normal]"; +const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [vys. vykon]"; const char * const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SILENT_MODE_OFF_EN, MSG_SILENT_MODE_OFF_CZ }; const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [silent]"; -const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [Stealth]"; +const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [tichy]"; const char * const MSG_SILENT_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SILENT_MODE_ON_EN, MSG_SILENT_MODE_ON_CZ @@ -2095,6 +2097,20 @@ const char * const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_STATS_TOTALPRINTTIME_CZ }; +const char MSG_STEALTH_MODE_OFF_EN[] PROGMEM = "Mode [Normal]"; +const char MSG_STEALTH_MODE_OFF_CZ[] PROGMEM = "Mod [Normal]"; +const char * const MSG_STEALTH_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_STEALTH_MODE_OFF_EN, + MSG_STEALTH_MODE_OFF_CZ +}; + +const char MSG_STEALTH_MODE_ON_EN[] PROGMEM = "Mode [Stealth]"; +const char MSG_STEALTH_MODE_ON_CZ[] PROGMEM = "Mod [Stealth]"; +const char * const MSG_STEALTH_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_STEALTH_MODE_ON_EN, + MSG_STEALTH_MODE_ON_CZ +}; + const char MSG_STEEL_SHEET_CHECK_EN[] PROGMEM = "Is steel sheet on heatbed?"; const char MSG_STEEL_SHEET_CHECK_CZ[] PROGMEM = "Je tiskovy plat na heatbed?"; const char * const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM] PROGMEM = { diff --git a/Firmware/language_all.h b/Firmware/language_all.h index ec44ba428..1995f99c3 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -40,8 +40,8 @@ extern const char* const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[LANG_NUM]; #define MSG_AUTOLOAD_FILAMENT LANG_TABLE_SELECT(MSG_AUTOLOAD_FILAMENT_LANG_TABLE) extern const char* const MSG_AUTO_HOME_LANG_TABLE[1]; #define MSG_AUTO_HOME LANG_TABLE_SELECT_EXPLICIT(MSG_AUTO_HOME_LANG_TABLE, 0) -extern const char* const MSG_AUTO_MODE_ON_LANG_TABLE[1]; -#define MSG_AUTO_MODE_ON LANG_TABLE_SELECT_EXPLICIT(MSG_AUTO_MODE_ON_LANG_TABLE, 0) +extern const char* const MSG_AUTO_MODE_ON_LANG_TABLE[LANG_NUM]; +#define MSG_AUTO_MODE_ON LANG_TABLE_SELECT(MSG_AUTO_MODE_ON_LANG_TABLE) extern const char* const MSG_A_RETRACT_LANG_TABLE[1]; #define MSG_A_RETRACT LANG_TABLE_SELECT_EXPLICIT(MSG_A_RETRACT_LANG_TABLE, 0) extern const char* const MSG_BABYSTEPPING_X_LANG_TABLE[1]; @@ -688,6 +688,10 @@ extern const char* const MSG_STATS_TOTALFILAMENT_LANG_TABLE[LANG_NUM]; #define MSG_STATS_TOTALFILAMENT LANG_TABLE_SELECT(MSG_STATS_TOTALFILAMENT_LANG_TABLE) extern const char* const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM]; #define MSG_STATS_TOTALPRINTTIME LANG_TABLE_SELECT(MSG_STATS_TOTALPRINTTIME_LANG_TABLE) +extern const char* const MSG_STEALTH_MODE_OFF_LANG_TABLE[LANG_NUM]; +#define MSG_STEALTH_MODE_OFF LANG_TABLE_SELECT(MSG_STEALTH_MODE_OFF_LANG_TABLE) +extern const char* const MSG_STEALTH_MODE_ON_LANG_TABLE[LANG_NUM]; +#define MSG_STEALTH_MODE_ON LANG_TABLE_SELECT(MSG_STEALTH_MODE_ON_LANG_TABLE) extern const char* const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM]; #define MSG_STEEL_SHEET_CHECK LANG_TABLE_SELECT(MSG_STEEL_SHEET_CHECK_LANG_TABLE) extern const char* const MSG_STEPPER_TIMER_OVERFLOW_ERROR_LANG_TABLE[1]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 911ffd664..a332770a7 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -103,8 +103,12 @@ #define MSG_INSERT_FILAMENT "Vlozte filament" #define MSG_CHANGING_FILAMENT "Vymena filamentu!" -#define MSG_SILENT_MODE_ON "Mod [Stealth]" -#define MSG_SILENT_MODE_OFF "Mod [Normal]" +#define MSG_SILENT_MODE_ON "Mod [tichy]" +#define MSG_SILENT_MODE_OFF "Mod [vys. vykon]" +#define MSG_AUTO_MODE_ON "Mod [automaticky]" +#define MSG_STEALTH_MODE_OFF "Mod [Normal]" +#define MSG_STEALTH_MODE_ON "Mod [Stealth]" + #define MSG_REBOOT "Restartujte tiskarnu" #define MSG_TAKE_EFFECT " pro projeveni zmen" diff --git a/Firmware/language_en.h b/Firmware/language_en.h index b1bb54622..948caf80c 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -105,6 +105,9 @@ #define MSG_SILENT_MODE_ON "Mode [silent]" #define MSG_SILENT_MODE_OFF "Mode [high power]" #define MSG_AUTO_MODE_ON "Mode [auto power]" +#define MSG_STEALTH_MODE_OFF "Mode [Normal]" +#define MSG_STEALTH_MODE_ON "Mode [Stealth]" + #define(length=20) MSG_REBOOT "Reboot the printer" #define(length=20) MSG_TAKE_EFFECT " for take effect" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2fbf2a63e..96d57c76a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3975,6 +3975,7 @@ static void lcd_settings_menu() { MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84")); } +#ifndef TMC2130 if (!farm_mode) { //dont show in menu if we are in farm mode switch (SilentModeMenu) { case 0: MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set); break; @@ -3983,6 +3984,7 @@ static void lcd_settings_menu() default: MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set); break; } } +#endif //TMC2130 #ifdef PAT9125 #ifndef DEBUG_DISABLE_FSENSORCHECK @@ -4020,8 +4022,8 @@ static void lcd_settings_menu() } #ifdef TMC2130 - 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 (SilentModeMenu == 0) MENU_ITEM(function, MSG_STEALTH_MODE_OFF, lcd_silent_mode_set); + else MENU_ITEM(function, MSG_STEALTH_MODE_ON, lcd_silent_mode_set); if (SilentModeMenu == 0) { if (CrashDetectMenu == 0) MENU_ITEM(function, MSG_CRASHDETECT_OFF, lcd_crash_mode_set); @@ -5635,8 +5637,8 @@ static void lcd_tune_menu() #endif //DEBUG_DISABLE_FSENSORCHECK #ifdef TMC2130 - 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 (SilentModeMenu == 0) MENU_ITEM(function, MSG_STEALTH_MODE_OFF, lcd_silent_mode_set); + else MENU_ITEM(function, MSG_STEALTH_MODE_ON, lcd_silent_mode_set); if (SilentModeMenu == 0) {