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

Remove duplicate string HW Setup" using MSG_HW_SETUP`

Browse Source
This commit is contained in:
3d-gussner 2021-01-25 16:15:57 +01:00
parent 5c1da227fe
commit 223f32deae
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -81,7 +81,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); //// const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////
const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); //// const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////

4
Firmware/ultralcd.cpp
View File

@ -5605,7 +5605,7 @@ static void select_sheet_menu()
static void sheets_menu() static void sheets_menu()
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_i("HW Setup")); MENU_ITEM_BACK_P(_T(MSG_HW_SETUP));
MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], select_sheet_menu<0>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], select_sheet_menu<0>);
MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], select_sheet_menu<1>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], select_sheet_menu<1>);
MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], select_sheet_menu<2>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], select_sheet_menu<2>);
@ -5695,7 +5695,7 @@ static void lcd_settings_menu()
if(!farm_mode) if(!farm_mode)
{ {
bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function
MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP MENU_ITEM_SUBMENU_P(_T(MSG_HW_SETUP), lcd_hw_setup_menu);
} }
SETTINGS_MMU_MODE; SETTINGS_MMU_MODE;

2
lang/lang_en.txt
View File

@ -1012,7 +1012,7 @@
#MSG_WARN #MSG_WARN
"Warn" "Warn"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
# #

2
lang/lang_en_cz.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Varovat" "Varovat"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"HW nastaveni" "HW nastaveni"

2
lang/lang_en_de.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Warnen" "Warnen"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"HW Einstellungen" "HW Einstellungen"

2
lang/lang_en_es.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Aviso" "Aviso"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"Configuracion HW" "Configuracion HW"

2
lang/lang_en_fr.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Avert" "Avert"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"Config HW" "Config HW"

2
lang/lang_en_it.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Avviso" "Avviso"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"Impostazioni HW" "Impostazioni HW"

2
lang/lang_en_pl.txt
View File

@ -1350,7 +1350,7 @@
"Warn" "Warn"
"Ostrzez" "Ostrzez"
# #MSG_HW_SETUP c=18
"HW Setup" "HW Setup"
"Ustawienia HW" "Ustawienia HW"