bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Update German language, &c. (#14613)

Browse Source
This commit is contained in:
Ludy
2019-07-14 11:34:55 +02:00
committed by Scott Lahteine
parent e96468566d
commit 6dcb85927a
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/menu/menu.cpp
View File

@ -448,7 +448,7 @@ bool ui_selection; // = false
void set_ui_selection(const bool sel) { ui_selection = sel; }
void do_select_screen(PGM_P const yes, PGM_P const no, selectFunc_t yesFunc, selectFunc_t noFunc, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
if (ui.encoderPosition) {
ui_selection = (ENCODERBASE) > 0 == int16_t(ui.encoderPosition) > 0;
ui_selection = ((ENCODERBASE) > 0) == (int16_t(ui.encoderPosition) > 0);
ui.encoderPosition = 0;
}
const bool got_click = ui.use_click();

2
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -303,7 +303,7 @@ static void lcd_factory_settings() {
#endif
START_MENU();
MENU_BACK(MSG_CONFIGURATION);
MENU_ITEM_EDIT(uint8, MSG_FAN_SPEED, &ui.preheat_fan_speed[material], 0, 255);
MENU_ITEM_EDIT(percent, MSG_FAN_SPEED, &ui.preheat_fan_speed[material], 0, 255);
#if HAS_TEMP_HOTEND
MENU_ITEM_EDIT(int3, MSG_NOZZLE, &ui.preheat_hotend_temp[material], MINTEMP_ALL, MAXTEMP_ALL - 15);
#endif