From 3174da670878dd52af1f2338045b80229d56720e Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sat, 13 Apr 2024 06:00:52 -0400 Subject: [PATCH 01/19] add reverse encoder menu option, rearrange menu items, add "Level" menu - swap w/advancedSettings --- Marlin/src/lcd/e3v2/common/encoder.cpp | 20 +- Marlin/src/lcd/e3v2/proui/dwin.cpp | 368 ++++++++++++----------- Marlin/src/lcd/e3v2/proui/dwin.h | 2 + Marlin/src/lcd/e3v2/proui/dwin_defines.h | 1 + Marlin/src/lcd/e3v2/proui/dwinui.h | 1 - Marlin/src/lcd/language/language_cz.h | 1 - Marlin/src/lcd/language/language_de.h | 1 - Marlin/src/lcd/language/language_en.h | 2 +- Marlin/src/lcd/language/language_es.h | 1 - Marlin/src/lcd/language/language_eu.h | 1 - Marlin/src/lcd/language/language_fr.h | 1 - Marlin/src/lcd/language/language_fr_na.h | 1 - Marlin/src/lcd/language/language_gl.h | 1 - Marlin/src/lcd/language/language_hu.h | 1 - Marlin/src/lcd/language/language_it.h | 5 +- Marlin/src/lcd/language/language_pl.h | 1 - Marlin/src/lcd/language/language_pt_br.h | 1 - Marlin/src/lcd/language/language_ro.h | 1 - Marlin/src/lcd/language/language_ru.h | 1 - Marlin/src/lcd/language/language_sk.h | 1 - Marlin/src/lcd/language/language_sv.h | 1 - Marlin/src/lcd/language/language_tr.h | 1 - Marlin/src/lcd/language/language_uk.h | 1 - Marlin/src/lcd/language/language_vi.h | 1 - Marlin/src/lcd/language/language_zh_CN.h | 1 - Marlin/src/lcd/language/language_zh_TW.h | 1 - Marlin/src/lcd/marlinui.cpp | 4 + Marlin/src/lcd/marlinui.h | 4 + Marlin/src/lcd/menu/menu_ubl.cpp | 2 +- Marlin/src/module/settings.cpp | 29 ++ 30 files changed, 253 insertions(+), 204 deletions(-) diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp index 5825fb0f77..4043f4c819 100644 --- a/Marlin/src/lcd/e3v2/common/encoder.cpp +++ b/Marlin/src/lcd/e3v2/common/encoder.cpp @@ -48,6 +48,11 @@ EncoderRate encoderRate; +#if ENABLED(PROUI_ITEM_ENC) + EncoderState direction1; + EncoderState direction2; +#endif + // TODO: Replace with ui.quick_feedback void Encoder_tick() { TERN_(HAS_BEEPER, if (ui.sound_on) buzzer.click(10)); @@ -120,9 +125,20 @@ EncoderState encoderReceiveAnalyze() { lastEncoderBits = newbutton; } + #if ENABLED(PROUI_ITEM_ENC) + if (ui.rev_rate == true) { + direction1 = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CW, ENCODER_DIFF_CCW); + direction2 = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CCW, ENCODER_DIFF_CW); + } + else { + direction1 = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CCW, ENCODER_DIFF_CW); + direction2 = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CW, ENCODER_DIFF_CCW); + } + #endif + if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) { - if (temp_diff > 0) temp_diffState = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CCW, ENCODER_DIFF_CW); - else temp_diffState = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CW, ENCODER_DIFF_CCW); + if (temp_diff > 0) { temp_diffState = TERN(PROUI_ITEM_ENC, direction1, TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CCW, ENCODER_DIFF_CW)); } + else { temp_diffState = TERN(PROUI_ITEM_ENC, direction2, TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CW, ENCODER_DIFF_CCW)); } #if ENABLED(ENCODER_RATE_MULTIPLIER) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 4c5f91e032..9d6f1141ae 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -180,7 +180,7 @@ enum SelectItem : uint8_t { PAGE_PRINT = 0, PAGE_PREPARE, PAGE_CONTROL, - PAGE_ADVANCE, + PAGE_LEVEL, PAGE_COUNT, PRINT_SETUP = 0, @@ -216,6 +216,7 @@ Menu *prepareMenu = nullptr; Menu *moveMenu = nullptr; Menu *controlMenu = nullptr; Menu *advancedSettingsMenu = nullptr; +Menu *levelMenu = nullptr; #if HAS_HOME_OFFSET Menu *homeOffsetMenu = nullptr; #endif @@ -366,12 +367,12 @@ void ICON_Control() { } // -// Main Menu: "Advanced Settings" +// Main Menu: "Level" // -void ICON_AdvSettings() { +void ICON_Level() { constexpr frame_rect_t ico = { 145, 226, 110, 100 }; constexpr text_info_t txt = { 91, { 405, 447 }, 27, 15 }; - ICON_Button(select_page.now == PAGE_ADVANCE, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_ADVANCED)); + ICON_Button(select_page.now == PAGE_LEVEL, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL)); } // @@ -679,7 +680,7 @@ void drawMainMenu() { ICON_Print(); ICON_Prepare(); ICON_Control(); - ICON_AdvSettings(); + ICON_Level(); } void gotoMainMenu() { @@ -1130,7 +1131,7 @@ void hmiMainMenu() { case PAGE_PRINT: ICON_Print(); break; case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break; case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break; - case PAGE_ADVANCE: ICON_Control(); ICON_AdvSettings(); break; + case PAGE_LEVEL: ICON_Control(); ICON_Level(); break; } } } @@ -1139,8 +1140,8 @@ void hmiMainMenu() { switch (select_page.now) { case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break; case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break; - case PAGE_CONTROL: ICON_Control(); ICON_AdvSettings(); break; - case PAGE_ADVANCE: ICON_AdvSettings(); break; + case PAGE_CONTROL: ICON_Control(); ICON_Level(); break; + case PAGE_LEVEL: ICON_Level(); break; } } } @@ -1155,7 +1156,7 @@ void hmiMainMenu() { break; case PAGE_PREPARE: drawPrepareMenu(); break; case PAGE_CONTROL: drawControlMenu(); break; - case PAGE_ADVANCE: drawAdvancedSettingsMenu(); break; + case PAGE_LEVEL: drawLevelMenu(); break; } } dwinUpdateLCD(); @@ -1849,7 +1850,7 @@ void dwinSetColorDefaults() { hmiData.colorCoordinate = defColorCoordinate; } -static_assert(ExtUI::eeprom_data_size >= sizeof(hmi_data_t), "Insufficient space in EEPROM for UI parameters"); +static_assert(ExtUI::eeprom_data_size >= EXTUI_EEPROM_DATA_SIZE, "Insufficient space in EEPROM for UI parameters"); void dwinSetDataDefaults() { dwinSetColorDefaults(); @@ -1879,6 +1880,7 @@ void dwinSetDataDefaults() { applyLEDColor(); #endif TERN_(HAS_GCODE_PREVIEW, hmiData.enablePreview = true); + TERN_(PROUI_ITEM_ENC, ui.rev_rate = false); } void dwinCopySettingsTo(char * const buff) { @@ -2174,7 +2176,7 @@ void doCoolDown() { thermalManager.cooldown(); } void setLanguage() { hmiToggleLanguage(); currentMenu = nullptr; // Invalidate menu to full redraw - drawPrepareMenu(); + drawControlMenu(); } bool enableLiveMove = false; @@ -2383,6 +2385,73 @@ void setSpeed() { setPIntOnClick(SPEED_EDIT_MIN, SPEED_EDIT_MAX); } void setFlow() { setPIntOnClick(FLOW_EDIT_MIN, FLOW_EDIT_MAX, []{ planner.refresh_e_factor(0); }); } +#if HAS_MESH + + void applyMeshFadeHeight() { set_z_fade_height(planner.z_fade_height); } + void setMeshFadeHeight() { setPFloatOnClick(0, 100, 1, applyMeshFadeHeight); } + + void setMeshActive() { + set_bed_leveling_enabled(!planner.leveling_active); + drawCheckboxLine(currentMenu->line(), planner.leveling_active); + dwinUpdateLCD(); + } + + #if ENABLED(PREHEAT_BEFORE_LEVELING) + void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); } + #endif + + #if ENABLED(PROUI_MESH_EDIT) + void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } + void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; } + void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; } + void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } + void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); } + void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); } + void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); } + #endif + +#endif // HAS_MESH + +#if ENABLED(AUTO_BED_LEVELING_UBL) + + void applyUBLSlot() { bedlevel.storage_slot = menuData.value; } + void setUBLSlot() { setIntOnClick(0, settings.calc_num_meshes() - 1, bedlevel.storage_slot, applyUBLSlot); } + void onDrawUBLSlot(MenuItem* menuitem, int8_t line) { + NOLESS(bedlevel.storage_slot, 0); + onDrawIntMenu(menuitem, line, bedlevel.storage_slot); + } + + void applyUBLTiltGrid() { bedLevelTools.tilt_grid = menuData.value; } + void setUBLTiltGrid() { setIntOnClick(1, 3, bedLevelTools.tilt_grid, applyUBLTiltGrid); } + + void ublMeshTilt() { + NOLESS(bedlevel.storage_slot, 0); + if (bedLevelTools.tilt_grid > 1) + gcode.process_subcommands_now(TS(F("G29J"), bedLevelTools.tilt_grid)); + else + gcode.process_subcommands_now(F("G29J")); + LCD_MESSAGE(MSG_UBL_MESH_TILTED); + } + + void ublSmartFillMesh() { + for (uint8_t x = 0; x < GRID_MAX_POINTS_Y; ++x) bedlevel.smart_fill_mesh(); + LCD_MESSAGE(MSG_UBL_MESH_FILLED); + } + + void ublMeshSave() { + NOLESS(bedlevel.storage_slot, 0); + settings.store_mesh(bedlevel.storage_slot); + ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), bedlevel.storage_slot); + DONE_BUZZ(true); + } + + void ublMeshLoad() { + NOLESS(bedlevel.storage_slot, 0); + settings.load_mesh(bedlevel.storage_slot); + } + +#endif // AUTO_BED_LEVELING_UBL + // Bed Tramming #if ENABLED(LCD_BED_TRAMMING) @@ -2656,8 +2725,9 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu #if HAS_HOTEND void setStepsE() { hmiValue.axis = E_AXIS; setPFloatOnClick( min_steps_edit_values.e, max_steps_edit_values.e, UNITFDIGITS); } #endif + #if ENABLED(FWRETRACT) - void returnFWRetractMenu() { (previousMenu == filSetMenu) ? drawFilSetMenu() : drawTuneMenu(); } + void returnFWRetractMenu() { (previousMenu == filamentMenu) ? drawFilamentManMenu() : drawTuneMenu(); } void setRetractLength() { setPFloatOnClick( 0, 10, UNITFDIGITS); } void setRetractSpeed() { setPFloatOnClick( 1, 90, UNITFDIGITS); } void setZRaise() { setPFloatOnClick( 0, 2, 2); } @@ -2665,6 +2735,10 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu void setAddRecover() { setPFloatOnClick(-5, 5, UNITFDIGITS); } #endif +#if ENABLED(PROUI_ITEM_ENC) + void setRevRate() { toggleCheckboxLine(ui.rev_rate); } +#endif + // Special Menuitem Drawing functions ================================================= void onDrawBack(MenuItem* menuitem, int8_t line) { @@ -3069,24 +3143,16 @@ frame_rect_t selrect(frame_rect_t) { void drawPrepareMenu() { checkkey = ID_Menu; - if (SET_MENU_R(prepareMenu, selrect({133, 1, 28, 13}), MSG_PREPARE, 12 + PREHEAT_COUNT)) { + if (SET_MENU_R(prepareMenu, selrect({133, 1, 28, 13}), MSG_PREPARE, 11)) { BACK_ITEM(gotoMainMenu); - MENU_ITEM(ICON_FilMan, MSG_FILAMENT_MAN, onDrawSubMenu, drawFilamentManMenu); - MENU_ITEM(ICON_Axis, MSG_MOVE_AXIS, onDrawMoveSubMenu, drawMoveMenu); - #if ENABLED(LCD_BED_TRAMMING) - MENU_ITEM(ICON_Tram, MSG_BED_TRAMMING, onDrawSubMenu, drawTrammingMenu); - #endif - MENU_ITEM(ICON_CloseMotor, MSG_DISABLE_STEPPERS, onDrawDisableMotors, disableMotors); #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU) MENU_ITEM(ICON_Homing, MSG_HOMING, onDrawSubMenu, drawHomingMenu); #else MENU_ITEM(ICON_Homing, MSG_AUTO_HOME, onDrawAutoHome, autoHome); #endif - #if ENABLED(MESH_BED_LEVELING) - MENU_ITEM(ICON_ManualMesh, MSG_MANUAL_MESH, onDrawSubMenu, drawManualMeshMenu); - #elif HAS_BED_PROBE - MENU_ITEM(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); - #endif + MENU_ITEM(ICON_Axis, MSG_MOVE_AXIS, onDrawMoveSubMenu, drawMoveMenu); + MENU_ITEM(ICON_CloseMotor, MSG_DISABLE_STEPPERS, onDrawDisableMotors, disableMotors); + MENU_ITEM(ICON_FilMan, MSG_FILAMENT_MAN, onDrawSubMenu, drawFilamentManMenu); #if HAS_ZOFFSET_ITEM #if HAS_BED_PROBE MENU_ITEM(ICON_SetZOffset, MSG_PROBE_WIZARD, onDrawSubMenu, drawZOffsetWizMenu); @@ -3094,16 +3160,17 @@ void drawPrepareMenu() { EDIT_ITEM(ICON_Zoffset, MSG_HOME_OFFSET_Z, onDrawPFloat2Menu, setZOffset, &BABY_Z_VAR); #endif #endif + #if ENABLED(LCD_BED_TRAMMING) + MENU_ITEM(ICON_Tram, MSG_BED_TRAMMING, onDrawSubMenu, drawTrammingMenu); + #endif #if HAS_PREHEAT - #define _ITEM_PREHEAT(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheat##N); - REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT) + MENU_ITEM(ICON_SetEndTemp, MSG_PREHEAT_HOTEND, onDrawSubMenu, drawPreheatHotendMenu); #endif MENU_ITEM(ICON_Cool, MSG_COOLDOWN, onDrawCooldown, doCoolDown); #if ALL(PROUI_TUNING_GRAPH, PROUI_ITEM_PLOT) MENU_ITEM(ICON_PIDNozzle, MSG_HOTEND_TEMP_GRAPH, onDrawMenuItem, drawHPlot); MENU_ITEM(ICON_PIDBed, MSG_BED_TEMP_GRAPH, onDrawMenuItem, drawBPlot); #endif - MENU_ITEM(ICON_Language, MSG_UI_LANGUAGE, onDrawLanguage, setLanguage); } ui.reset_status(true); updateMenu(prepareMenu); @@ -3136,7 +3203,7 @@ void drawPrepareMenu() { void drawControlMenu() { checkkey = ID_Menu; - if (SET_MENU_R(controlMenu, selrect({103, 1, 28, 14}), MSG_CONTROL, 11)) { + if (SET_MENU_R(controlMenu, selrect({103, 1, 28, 14}), MSG_CONTROL, 12)) { BACK_ITEM(gotoMainMenu); MENU_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawTempSubMenu, drawTemperatureMenu); MENU_ITEM(ICON_Motion, MSG_MOTION, onDrawMotionSubMenu, drawMotionMenu); @@ -3158,7 +3225,9 @@ void drawControlMenu() { MENU_ITEM(ICON_ResetEEPROM, MSG_RESTORE_DEFAULTS, onDrawResetEeprom, resetEEPROM); #endif MENU_ITEM(ICON_Reboot, MSG_RESET_PRINTER, onDrawMenuItem, rebootPrinter); + MENU_ITEM(ICON_AdvSet, MSG_ADVANCED_SETTINGS, onDrawSubMenu, drawAdvancedSettingsMenu); MENU_ITEM(ICON_Info, MSG_INFO_SCREEN, onDrawInfoSubMenu, gotoInfoMenu); + MENU_ITEM(ICON_Language, MSG_UI_LANGUAGE, onDrawLanguage, setLanguage); } ui.reset_status(true); updateMenu(controlMenu); @@ -3166,32 +3235,14 @@ void drawControlMenu() { void drawAdvancedSettingsMenu() { checkkey = ID_Menu; - if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, 24)) { - BACK_ITEM(gotoMainMenu); - #if ENABLED(EEPROM_SETTINGS) - MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); + if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, 16)) { + BACK_ITEM(drawControlMenu); + #if HAS_LCD_BRIGHTNESS + EDIT_ITEM(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, setBrightness, &ui.brightness); + MENU_ITEM(ICON_Box, MSG_BRIGHTNESS_OFF, onDrawMenuItem, turnOffBacklight); #endif - #if HAS_MESH - MENU_ITEM(ICON_Mesh, MSG_MESH_LEVELING, onDrawSubMenu, drawMeshSetMenu); - #endif - #if HAS_BED_PROBE - MENU_ITEM(ICON_Probe, MSG_ZPROBE_SETTINGS, onDrawSubMenu, drawProbeSetMenu); - #endif - #if HAS_HOME_OFFSET - MENU_ITEM(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, drawHomeOffsetMenu); - #endif - MENU_ITEM(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, drawFilSetMenu); - #if ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) - MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID " Settings", onDrawSubMenu, drawHotendPIDMenu); - #endif - #if ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_MPCNozzle, "MPC Settings", onDrawSubMenu, drawHotendMPCMenu); - #endif - #if ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) - MENU_ITEM_F(ICON_PIDBed, STR_BED_PID " Settings", onDrawSubMenu, drawBedPIDMenu); - #endif - #if HAS_TRINAMIC_CONFIG - MENU_ITEM(ICON_TMCSet, MSG_TMC_DRIVERS, onDrawSubMenu, drawTrinamicConfigMenu); + #if HAS_CUSTOM_COLORS + MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); #endif #if HAS_ESDIAG MENU_ITEM_F(ICON_esDiag, "End-stops diag.", onDrawSubMenu, drawEndStopDiag); @@ -3222,18 +3273,50 @@ void drawAdvancedSettingsMenu() { #if ENABLED(BAUD_RATE_GCODE) EDIT_ITEM_F(ICON_SetBaudRate, "115K baud", onDrawChkbMenu, setBaudRate, &hmiData.baud115K); #endif - #if HAS_LCD_BRIGHTNESS - EDIT_ITEM(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, setBrightness, &ui.brightness); - MENU_ITEM(ICON_Box, MSG_BRIGHTNESS_OFF, onDrawMenuItem, turnOffBacklight); - #endif - #if HAS_CUSTOM_COLORS - MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); + #if ENABLED(PROUI_ITEM_ENC) + EDIT_ITEM_F(ICON_Motion, "Reverse Encoder", onDrawChkbMenu, setRevRate, &ui.rev_rate); #endif } ui.reset_status(true); updateMenu(advancedSettingsMenu); } +void drawLevelMenu() { + checkkey = ID_Menu; + if (SET_MENU(levelMenu, MSG_BED_LEVELING, 14)) { + BACK_ITEM(gotoMainMenu); + #if ENABLED(EEPROM_SETTINGS) + MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); + #endif + #if ENABLED(MESH_BED_LEVELING) + MENU_ITEM(ICON_ManualMesh, MSG_MANUAL_MESH, onDrawSubMenu, drawManualMeshMenu); + #elif HAS_BED_PROBE + MENU_ITEM(ICON_Mesh, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); + MENU_ITEM(ICON_Probe, MSG_ZPROBE_SETTINGS, onDrawSubMenu, drawProbeSetMenu); + #endif + #if HAS_HOME_OFFSET + MENU_ITEM(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, drawHomeOffsetMenu); + #endif + #if HAS_MESH + MENU_ITEM(ICON_Mesh, MSG_MESH_SETTINGS, onDrawSubMenu, drawMeshSetMenu); + MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); + #if ENABLED(PROUI_MESH_EDIT) + MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu); + MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh); + #endif + #endif + #if ENABLED(AUTO_BED_LEVELING_UBL) + EDIT_ITEM(ICON_UBLSlot, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, setUBLSlot, &bedlevel.storage_slot); + MENU_ITEM(ICON_UBLMeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, ublMeshSave); + MENU_ITEM(ICON_UBLMeshLoad, MSG_UBL_LOAD_MESH, onDrawMenuItem, ublMeshLoad); + MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt); + MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh); + #endif + } + ui.reset_status(true); + updateMenu(levelMenu); +} + void drawMoveMenu() { checkkey = ID_Menu; if (SET_MENU_R(moveMenu, selrect({192, 1, 42, 14}), MSG_MOVE_AXIS, 6)) { @@ -3262,7 +3345,7 @@ void drawMoveMenu() { void drawHomeOffsetMenu() { checkkey = ID_Menu; if (SET_MENU(homeOffsetMenu, MSG_SET_HOME_OFFSETS, 4)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawLevelMenu); #if HAS_X_AXIS EDIT_ITEM(ICON_HomeOffsetX, MSG_HOME_OFFSET_X, onDrawPFloatMenu, setHomeOffsetX, &home_offset.x); #endif @@ -3283,7 +3366,7 @@ void drawMoveMenu() { void drawProbeSetMenu() { checkkey = ID_Menu; if (SET_MENU(probeSettingsMenu, MSG_ZPROBE_SETTINGS, 9)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawLevelMenu); #if HAS_X_AXIS EDIT_ITEM(ICON_ProbeOffsetX, MSG_ZPROBE_XOFFSET, onDrawPFloatMenu, setProbeOffsetX, &probe.offset.x); #endif @@ -3312,8 +3395,11 @@ void drawMoveMenu() { void drawFilSetMenu() { checkkey = ID_Menu; - if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 9)) { - BACK_ITEM(drawAdvancedSettingsMenu); + if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 7)) { + BACK_ITEM(drawFilamentManMenu); + #if ENABLED(EEPROM_SETTINGS) + MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); + #endif #if HAS_FILAMENT_SENSOR EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled); #endif @@ -3327,9 +3413,6 @@ void drawFilSetMenu() { EDIT_ITEM(ICON_FilLoad, MSG_FILAMENT_LOAD, onDrawPFloatMenu, setFilLoad, &fc_settings[0].load_length); EDIT_ITEM(ICON_FilUnload, MSG_FILAMENT_UNLOAD, onDrawPFloatMenu, setFilUnload, &fc_settings[0].unload_length); #endif - #if ENABLED(FWRETRACT) - MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu); - #endif } updateMenu(filSetMenu); } @@ -3511,7 +3594,7 @@ void drawTuneMenu() { void drawTrinamicConfigMenu() { checkkey = ID_Menu; if (SET_MENU(trinamicConfigMenu, MSG_TMC_DRIVERS, 5)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawMotionMenu); #if AXIS_IS_TMC(X) EDIT_ITEM(ICON_TMCXSet, MSG_TMC_ACURRENT, onDrawPIntMenu, setXTMCCurrent, &stepperX.val_mA); #endif @@ -3531,10 +3614,15 @@ void drawTuneMenu() { void drawMotionMenu() { checkkey = ID_Menu; - if (SET_MENU_R(motionMenu, selrect({1, 16, 28, 13}), MSG_MOTION, 10)) { + if (SET_MENU_R(motionMenu, selrect({1, 16, 28, 13}), MSG_MOTION, 11)) { BACK_ITEM(drawControlMenu); + EDIT_ITEM(ICON_Flow, MSG_FLOW, onDrawPIntMenu, setFlow, &planner.flow_percentage[0]); + EDIT_ITEM(ICON_Speed, MSG_SPEED, onDrawPIntMenu, setSpeed, &feedrate_percentage); MENU_ITEM(ICON_MaxSpeed, MSG_SPEED, onDrawSpeed, drawMaxSpeedMenu); MENU_ITEM(ICON_MaxAccelerated, MSG_ACCELERATION, onDrawAcc, drawMaxAccelMenu); + #if ENABLED(EDITABLE_STEPS_PER_UNIT) + MENU_ITEM(ICON_Step, MSG_STEPS_PER_MM, onDrawSteps, drawStepsMenu); + #endif #if ENABLED(CLASSIC_JERK) MENU_ITEM(ICON_MaxJerk, MSG_JERK, onDrawJerk, drawMaxJerkMenu); #elif HAS_JUNCTION_DEVIATION @@ -3549,23 +3637,21 @@ void drawMotionMenu() { #if ENABLED(ADAPTIVE_STEP_SMOOTHING_TOGGLE) EDIT_ITEM(ICON_UBLActive, MSG_STEP_SMOOTHING, onDrawChkbMenu, setAdaptiveStepSmoothing, &stepper.adaptive_step_smoothing_enabled); #endif - #if ENABLED(EDITABLE_STEPS_PER_UNIT) - MENU_ITEM(ICON_Step, MSG_STEPS_PER_MM, onDrawSteps, drawStepsMenu); + #if HAS_TRINAMIC_CONFIG + MENU_ITEM(ICON_TMCSet, MSG_TMC_DRIVERS, onDrawSubMenu, drawTrinamicConfigMenu); #endif - EDIT_ITEM(ICON_Flow, MSG_FLOW, onDrawPIntMenu, setFlow, &planner.flow_percentage[0]); - EDIT_ITEM(ICON_Speed, MSG_SPEED, onDrawPIntMenu, setSpeed, &feedrate_percentage); } updateMenu(motionMenu); } -#if ALL(ADVANCED_PAUSE_FEATURE, HAS_PREHEAT) +#if HAS_PREHEAT void drawPreheatHotendMenu() { checkkey = ID_Menu; if (SET_MENU(preheatHotendMenu, MSG_PREHEAT_HOTEND, 1 + PREHEAT_COUNT)) { - BACK_ITEM(drawFilamentManMenu); - #define _ITEM_PREHEAT_HE(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheatHotend##N); - REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT_HE) + BACK_ITEM(drawPrepareMenu); + #define _ITEM_PREHEAT(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheat##N); + REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT) } updateMenu(preheatHotendMenu); } @@ -3574,20 +3660,21 @@ void drawMotionMenu() { void drawFilamentManMenu() { checkkey = ID_Menu; - if (SET_MENU(filamentMenu, MSG_FILAMENT_MAN, 6)) { + if (SET_MENU(filamentMenu, MSG_FILAMENT_MAN, 7)) { BACK_ITEM(drawPrepareMenu); + MENU_ITEM(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, drawFilSetMenu); #if ENABLED(NOZZLE_PARK_FEATURE) MENU_ITEM(ICON_Park, MSG_FILAMENT_PARK_ENABLED, onDrawMenuItem, parkHead); #endif #if ENABLED(ADVANCED_PAUSE_FEATURE) - #if HAS_PREHEAT - MENU_ITEM(ICON_SetEndTemp, MSG_PREHEAT_HOTEND, onDrawSubMenu, drawPreheatHotendMenu); - #endif MENU_ITEM(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, changeFilament); #endif #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES) - MENU_ITEM(ICON_FilUnload, MSG_FILAMENTUNLOAD, onDrawMenuItem, unloadFilament); MENU_ITEM(ICON_FilLoad, MSG_FILAMENTLOAD, onDrawMenuItem, loadFilament); + MENU_ITEM(ICON_FilUnload, MSG_FILAMENTUNLOAD, onDrawMenuItem, unloadFilament); + #endif + #if ENABLED(FWRETRACT) + MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu); #endif } updateMenu(filamentMenu); @@ -3597,12 +3684,11 @@ void drawFilamentManMenu() { void drawManualMeshMenu() { checkkey = ID_Menu; - if (SET_MENU(manualMeshMenu, MSG_UBL_MANUAL_MESH, 6)) { - BACK_ITEM(drawPrepareMenu); - MENU_ITEM(ICON_ManualMesh, MSG_LEVEL_BED, onDrawMenuItem, manualMeshStart); + if (SET_MENU(manualMeshMenu, MSG_MANUAL_LEVELING, 5)) { + BACK_ITEM(drawLevelMenu); + MENU_ITEM(ICON_ManualMesh, MSG_UBL_MANUAL_MESH, onDrawMenuItem, manualMeshStart); mMeshMoveZItem = EDIT_ITEM(ICON_Zoffset, MSG_MOVE_Z, onDrawMMeshMoveZ, setMMeshMoveZ, ¤t_position.z); MENU_ITEM(ICON_Axis, MSG_UBL_CONTINUE_MESH, onDrawMenuItem, manualMeshContinue); - MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); MENU_ITEM(ICON_MeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, manualMeshSave); } updateMenu(manualMeshMenu); @@ -3643,7 +3729,7 @@ void drawFilamentManMenu() { void drawTemperatureMenu() { checkkey = ID_Menu; - if (SET_MENU_R(temperatureMenu, selrect({236, 2, 28, 12}), MSG_TEMPERATURE, 4 + PREHEAT_COUNT)) { + if (SET_MENU_R(temperatureMenu, selrect({236, 2, 28, 12}), MSG_TEMPERATURE, 6 + PREHEAT_COUNT)) { BACK_ITEM(drawControlMenu); #if HAS_HOTEND hotendTargetItem = EDIT_ITEM(ICON_HotendTemp, MSG_UBL_SET_TEMP_HOTEND, onDrawHotendTemp, setHotendTemp, &thermalManager.temp_hotend[0].target); @@ -3658,6 +3744,14 @@ void drawTemperatureMenu() { #define _ITEM_SETPREHEAT(N) MENU_ITEM(ICON_SetPreheat##N, MSG_PREHEAT_## N ##_SETTINGS, onDrawSubMenu, drawPreheat## N ##Menu); REPEAT_1(PREHEAT_COUNT, _ITEM_SETPREHEAT) #endif + #if ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) + MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID " Settings", onDrawSubMenu, drawHotendPIDMenu); + #elif ENABLED(MPCTEMP) && ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) + MENU_ITEM_F(ICON_MPCNozzle, "MPC Settings", onDrawSubMenu, drawHotendMPCMenu); + #endif + #if ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) + MENU_ITEM_F(ICON_PIDBed, STR_BED_PID " Settings", onDrawSubMenu, drawBedPIDMenu); + #endif } updateMenu(temperatureMenu); } @@ -3835,7 +3929,7 @@ void drawMaxAccelMenu() { // Nozzle and Bed PID/MPC //============================================================================= -#if ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) +#if ENABLED(MPCTEMP) && ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) #if ENABLED(MPC_EDIT_MENU) void setHeaterPower() { setPFloatOnClick(1, 200, 1); } @@ -3853,7 +3947,7 @@ void drawMaxAccelMenu() { checkkey = ID_Menu; if (SET_MENU_F(hotendMPCMenu, "MPC Settings", 7)) { MPC_t &mpc = thermalManager.temp_hotend[0].mpc; - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawTemperatureMenu); #if ENABLED(MPC_AUTOTUNE_MENU) MENU_ITEM(ICON_MPCNozzle, MSG_MPC_AUTOTUNE, onDrawMenuItem, []{ thermalManager.MPC_autotune(active_extruder, Temperature::MPCTuningType::AUTO); }); #endif @@ -3870,7 +3964,7 @@ void drawMaxAccelMenu() { updateMenu(hotendMPCMenu); } -#endif // MPC_EDIT_MENU || MPC_AUTOTUNE_MENU +#endif // MPCTEMP && MPC_EDIT_MENU || MPC_AUTOTUNE_MENU #if HAS_PID_HEATING @@ -3922,7 +4016,7 @@ void drawMaxAccelMenu() { void drawHotendPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(hotendPIDMenu, STR_HOTEND_PID " Settings", 8)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawTemperatureMenu); #if ENABLED(PID_AUTOTUNE_MENU) MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID, onDrawMenuItem, hotendPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setHotendPIDT, &hmiData.hotendPIDT); @@ -3952,9 +4046,9 @@ void drawMaxAccelMenu() { void drawBedPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(bedPIDMenu, STR_BED_PID " Settings", 8)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawTemperatureMenu); #if ENABLED(PID_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_PIDBed, STR_BED_PID, onDrawMenuItem,bedPID); + MENU_ITEM_F(ICON_PIDBed, STR_BED_PID, onDrawMenuItem, bedPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setBedPIDT, &hmiData.bedPIDT); EDIT_ITEM(ICON_PIDCycles, MSG_PID_CYCLE, onDrawPIntMenu, setPIDCycles, &hmiData.pidCycles); #endif @@ -3982,9 +4076,9 @@ void drawMaxAccelMenu() { void drawChamberPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(chamberPIDMenu, STR_CHAMBER_PID " Settings", 8)) { - BACK_ITEM(drawAdvancedSettingsMenu); + BACK_ITEM(drawTemperatureMenu); #if ENABLED(PID_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_PIDChamber, STR_CHAMBER_PID, onDrawMenuItem,chamberPID); + MENU_ITEM_F(ICON_PIDChamber, STR_CHAMBER_PID, onDrawMenuItem, chamberPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setChamberPIDT, &hmiData.chamberPIDT); EDIT_ITEM(ICON_PIDCycles, MSG_PID_CYCLE, onDrawPIntMenu, setPIDCycles, &hmiData.pidCycles); #endif @@ -4068,100 +4162,20 @@ void drawMaxAccelMenu() { // Mesh Bed Leveling //============================================================================= -#if HAS_MESH - - void applyMeshFadeHeight() { set_z_fade_height(planner.z_fade_height); } - void setMeshFadeHeight() { setPFloatOnClick(0, 100, 1, applyMeshFadeHeight); } - - void setMeshActive() { - set_bed_leveling_enabled(!planner.leveling_active); - drawCheckboxLine(currentMenu->line(), planner.leveling_active); - dwinUpdateLCD(); - } - - #if ENABLED(PREHEAT_BEFORE_LEVELING) - void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); } - #endif - - #if ENABLED(PROUI_MESH_EDIT) - void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } - void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; } - void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; } - void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } - void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); } - void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); } - void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); } - #endif - -#endif // HAS_MESH - -#if ENABLED(AUTO_BED_LEVELING_UBL) - - void applyUBLSlot() { bedlevel.storage_slot = menuData.value; } - void setUBLSlot() { setIntOnClick(0, settings.calc_num_meshes() - 1, bedlevel.storage_slot, applyUBLSlot); } - void onDrawUBLSlot(MenuItem* menuitem, int8_t line) { - NOLESS(bedlevel.storage_slot, 0); - onDrawIntMenu(menuitem, line, bedlevel.storage_slot); - } - - void applyUBLTiltGrid() { bedLevelTools.tilt_grid = menuData.value; } - void setUBLTiltGrid() { setIntOnClick(1, 3, bedLevelTools.tilt_grid, applyUBLTiltGrid); } - - void ublMeshTilt() { - NOLESS(bedlevel.storage_slot, 0); - if (bedLevelTools.tilt_grid > 1) - gcode.process_subcommands_now(TS(F("G29J"), bedLevelTools.tilt_grid)); - else - gcode.process_subcommands_now(F("G29J")); - LCD_MESSAGE(MSG_UBL_MESH_TILTED); - } - - void ublSmartFillMesh() { - for (uint8_t x = 0; x < GRID_MAX_POINTS_Y; ++x) bedlevel.smart_fill_mesh(); - LCD_MESSAGE(MSG_UBL_MESH_FILLED); - } - - void ublMeshSave() { - NOLESS(bedlevel.storage_slot, 0); - settings.store_mesh(bedlevel.storage_slot); - ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), bedlevel.storage_slot); - DONE_BUZZ(true); - } - - void ublMeshLoad() { - NOLESS(bedlevel.storage_slot, 0); - settings.load_mesh(bedlevel.storage_slot); - } - -#endif // AUTO_BED_LEVELING_UBL - #if HAS_MESH void drawMeshSetMenu() { checkkey = ID_Menu; - if (SET_MENU(meshMenu, MSG_MESH_LEVELING, 14)) { - BACK_ITEM(drawAdvancedSettingsMenu); + if (SET_MENU(meshMenu, MSG_MESH_SETTINGS, 5)) { + BACK_ITEM(drawLevelMenu); #if ENABLED(PREHEAT_BEFORE_LEVELING) EDIT_ITEM(ICON_Temperature, MSG_UBL_SET_TEMP_BED, onDrawPIntMenu, setBedLevT, &hmiData.bedLevT); #endif EDIT_ITEM(ICON_SetZOffset, MSG_Z_FADE_HEIGHT, onDrawPFloatMenu, setMeshFadeHeight, &planner.z_fade_height); EDIT_ITEM(ICON_UBLActive, MSG_ACTIVATE_MESH, onDrawChkbMenu, setMeshActive, &planner.leveling_active); - #if HAS_BED_PROBE - MENU_ITEM(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); - #endif #if ENABLED(AUTO_BED_LEVELING_UBL) - EDIT_ITEM(ICON_UBLSlot, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, setUBLSlot, &bedlevel.storage_slot); - MENU_ITEM(ICON_UBLMeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, ublMeshSave); - MENU_ITEM(ICON_UBLMeshLoad, MSG_UBL_LOAD_MESH, onDrawMenuItem, ublMeshLoad); EDIT_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, setUBLTiltGrid, &bedLevelTools.tilt_grid); - MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt); - MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh); #endif - #if ENABLED(PROUI_MESH_EDIT) - MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh); - MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu); - #endif - MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); } updateMenu(meshMenu); } @@ -4173,7 +4187,7 @@ void drawMaxAccelMenu() { checkkey = ID_Menu; if (SET_MENU(editMeshMenu, MSG_EDIT_MESH, 4)) { bedLevelTools.mesh_x = bedLevelTools.mesh_y = 0; - BACK_ITEM(drawMeshSetMenu); + BACK_ITEM(drawLevelMenu); EDIT_ITEM(ICON_MeshEditX, MSG_MESH_X, onDrawPInt8Menu, setEditMeshX, &bedLevelTools.mesh_x); EDIT_ITEM(ICON_MeshEditY, MSG_MESH_Y, onDrawPInt8Menu, setEditMeshY, &bedLevelTools.mesh_y); editZValueItem = EDIT_ITEM(ICON_MeshEditZ, MSG_MESH_EDIT_Z, onDrawPFloat2Menu, setEditZValue, &bedlevel.z_values[bedLevelTools.mesh_x][bedLevelTools.mesh_y]); diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h index 7d264b8b12..fcc626646f 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.h +++ b/Marlin/src/lcd/e3v2/proui/dwin.h @@ -229,6 +229,7 @@ void disableMotors(); void autoLevel(); void autoHome(); #if HAS_PREHEAT +void drawPreheatHotendMenu(); #define _DOPREHEAT(N) void DoPreheat##N(); REPEAT_1(PREHEAT_COUNT, _DOPREHEAT) #endif @@ -333,6 +334,7 @@ void dwinRebootScreen(); // Menu drawing functions void drawPrintFileMenu(); void drawControlMenu(); +void drawLevelMenu(); void drawAdvancedSettingsMenu(); void drawPrepareMenu(); void drawMoveMenu(); diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h index f09d2bd625..cd0e7f8723 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h +++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h @@ -133,3 +133,4 @@ #define HAS_ESDIAG 1 // View End-stop/Runout switch continuity #define HAS_LOCKSCREEN 1 // Simple lockscreen #define HAS_SD_EXTENDER 1 // Enable to support SD card extender cables +#define PROUI_ITEM_ENC // Enable option to reverse encoder direction | Control > Advanced Settings diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h index 27825b0869..d475de1933 100644 --- a/Marlin/src/lcd/e3v2/proui/dwinui.h +++ b/Marlin/src/lcd/e3v2/proui/dwinui.h @@ -72,7 +72,6 @@ #define ICON_HSMode ICON_MaxAccZ #define ICON_InputShaping ICON_MaxAccelerated #define ICON_JDmm ICON_MaxJerk -#define ICON_Level ICON_Mesh #define ICON_Lock ICON_Checkbox #define ICON_ManualMesh ICON_Mesh #define ICON_MaxPosX ICON_MoveX diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 89f1a4ab2a..9ec7911af2 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -162,7 +162,6 @@ namespace LanguageNarrow_cz { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Pokračovat v síťi"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Síťové rovnání"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-bodové rovnání"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Mřížkové rovnání"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Srovnat podložku"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 6885da5ca6..bf160dc502 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -213,7 +213,6 @@ namespace LanguageNarrow_de { LSTR MSG_G26_CANCELED = _UxGT("G26 abgebrochen"); LSTR MSG_G26_LEAVING = _UxGT("G26 verlassen"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Netzerst. forts."); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Netz-Nivellierung"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Punkt-Nivell."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Gitternetz-Nivell."); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Netz nivellieren"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 1ecf65a57f..bb394ad199 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -241,7 +241,6 @@ namespace LanguageNarrow_en { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continue Bed Mesh"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Point Leveling"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Grid Mesh Leveling"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Level Mesh"); @@ -660,6 +659,7 @@ namespace LanguageNarrow_en { LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_MESH_DONE = _UxGT("Mesh probing done"); + LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Settings"); LSTR MSG_INFO_STATS_MENU = _UxGT("Printer Stats"); LSTR MSG_RESET_STATS = _UxGT("Reset Print Stats?"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Board Info"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 5bee09b242..3f2d57f10b 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -160,7 +160,6 @@ namespace LanguageNarrow_es { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("Dejando G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Contin. Mallado cama"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelando Mallado"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelando 3Puntos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niv. Mall. cuadri"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivel de Mallado"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 1c2cf8fb86..00d62233db 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -104,7 +104,6 @@ namespace LanguageNarrow_eu { LSTR MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Lauki-sare berdinketa"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Sarea berdindu"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 09e7f94917..5a02082a56 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -164,7 +164,6 @@ namespace LanguageNarrow_fr { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Niveau à 3 points"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Effectuer mesures"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index dc31af4fcb..96b2e22d72 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -164,7 +164,6 @@ namespace LanguageNarrow_fr_na { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Verifier grille"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Niveau a 3 points"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Effectuer mesures"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index ebcf384c5c..f94aad1308 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -157,7 +157,6 @@ namespace LanguageNarrow_gl { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("Saíndo de G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuar Malla"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelación Malla"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelación 3Puntos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Nivelación Grid"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivelar Malla"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 9153df7186..79e1879935 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -188,7 +188,6 @@ namespace LanguageNarrow_hu { LSTR MSG_G26_CANCELED = _UxGT("G26 Törölve"); LSTR MSG_G26_LEAVING = _UxGT("Kilépö G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Ágy háló folyt."); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Háló szintezés"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Pontos szintezés"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Rács szintezés"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Háló szint"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 7a4f17d49b..452fb03b20 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -233,9 +233,8 @@ namespace LanguageNarrow_it { LSTR MSG_G26_LEAVING = _UxGT("Uscita da G26"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valida mesh pers."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continua mesh"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Livell. mesh"); - LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Livell. 3 Punti"); - LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Livell. griglia mesh"); + LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Livella 3 Punti"); + LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Livel. griglia mesh"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Livella mesh"); LSTR MSG_UBL_SIDE_POINTS = _UxGT("Punti laterali"); LSTR MSG_UBL_MAP_TYPE = _UxGT("Tipo di mappa"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index c96da22b60..a7aa163103 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -170,7 +170,6 @@ namespace LanguageNarrow_pl { LSTR MSG_G26_CANCELED = _UxGT("G26 Przewane"); LSTR MSG_G26_LEAVING = _UxGT("Opuszczanie G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Kontynuuj tworzenie siatki"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Poziomowanie siatką"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Poziomowaie 3-punktowe"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Poziomowaie według siatki"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Poziomuj siatkę"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 17c6ada026..298f21133c 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -143,7 +143,6 @@ namespace LanguageNarrow_pt_br { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("G26 Saindo"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuar Malha"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelação da Malha"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelação 3 pontos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Nivelação Grid"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivelar Malha"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 81f44fe65a..87165b259f 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -156,7 +156,6 @@ namespace LanguageNarrow_ro { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continue Bed Mesh"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Point Leveling"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Grid Mesh Leveling"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Level Mesh"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 851b4ffd0d..a324a1f874 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -191,7 +191,6 @@ namespace LanguageNarrow_ru { LSTR MSG_G26_CANCELED = _UxGT("G26 завершена"); LSTR MSG_G26_LEAVING = _UxGT("Выйти из G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Продолжить сетку"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Выравнивание сетки"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-точечное выравн."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Выравнивание сеткой"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Выровнять сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index dd64c29f25..4d03ae84d6 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -229,7 +229,6 @@ namespace LanguageNarrow_sk { LSTR MSG_G26_CANCELED = _UxGT("G26 zrušený"); LSTR MSG_G26_LEAVING = _UxGT("Opúšťam G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Pokračovať v sieti"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Sieťové rovnanie"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-bodové rovnanie"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Mriežkové rovnanie"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Vyrovnať podložku"); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 4023d13521..83680af2a6 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -179,7 +179,6 @@ namespace LanguageNarrow_sv { LSTR MSG_G26_CANCELED = _UxGT("G26 Avbruten"); LSTR MSG_G26_LEAVING = _UxGT("Nivellera G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Fortsätt Bädd Nät"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nät Nivellering"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Punkts Nivellering"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Rutnät Nivellering"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivellera Nät"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 1a335bac3a..ecfc211138 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -232,7 +232,6 @@ namespace LanguageNarrow_tr { LSTR MSG_G26_CANCELED = _UxGT("G26 İptal edildi"); LSTR MSG_G26_LEAVING = _UxGT("Çıkış G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Tabla Mesh Devam et"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Seviyeleme"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Nokta Seviyeleme"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Kafes Mesh Seviyeleme"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Mesh Seviyesi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 150739b174..76ced11447 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -190,7 +190,6 @@ namespace LanguageNarrow_uk { LSTR MSG_G26_CANCELED = _UxGT("G26 скасовано"); LSTR MSG_G26_LEAVING = _UxGT("Вийти з G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Продовжити сітку"); - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Вирівнювання сітки"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-точкове вирівн."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Вирівнюв. растру"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Вирівняти сітку"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index c952416ec8..69c4531115 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -132,7 +132,6 @@ namespace LanguageNarrow_vi { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // Validate custom mesh LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh - LSTR MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Đang san lấp 3-điểm"); // 3-Point Leveling LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Đang san lấp lưới phẳng"); // Grid (planar) Mesh Leveling LSTR MSG_UBL_MESH_LEVEL = _UxGT("Làm bằng lưới"); // Level Mesh diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 75d81f2c9a..78c6936314 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -164,7 +164,6 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_G26_CANCELED = _UxGT("G26已取消"); LSTR MSG_G26_LEAVING = _UxGT("离开G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("继续热床网格"); // "Continue Bed Mesh" - LSTR MSG_UBL_MESH_LEVELING = _UxGT("网格调平"); // "Mesh Leveling" LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("三点调平"); // "3-Point Leveling" LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("格子网格调平"); // "Grid Mesh Leveling" LSTR MSG_UBL_MESH_LEVEL = _UxGT("调平网格"); // "Level Mesh" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index e47704da7e..2bc8358b90 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -152,7 +152,6 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_G26_CANCELED = _UxGT("G26已取消"); // "G26 Canceled" LSTR MSG_G26_LEAVING = _UxGT("離開 G26"); // "Leaving G26" LSTR MSG_UBL_CONTINUE_MESH = _UxGT("繼續熱床網格"); // "Continue Bed Mesh" - LSTR MSG_UBL_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling" LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("三點調平"); // "3-Point Leveling" LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("格子網格調平"); // "Grid Mesh Leveling" LSTR MSG_UBL_MESH_LEVEL = _UxGT("調平網格"); // "Level Mesh" diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index dca18f2125..d9f5dc4888 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -66,6 +66,10 @@ MarlinUI ui; constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; +#if ENABLED(PROUI_ITEM_ENC) + bool MarlinUI::rev_rate = false; +#endif + #if HAS_STATUS_MESSAGE #if ENABLED(STATUS_MESSAGE_SCROLLING) uint8_t MarlinUI::status_scroll_offset; // = 0 diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index f21d2565be..05e42de231 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -202,6 +202,10 @@ public: TERN_(HAS_MARLINUI_MENU, currentScreen = status_screen); } + #if ENABLED(PROUI_ITEM_ENC) + static bool rev_rate; + #endif + static void init(); #if HAS_DISPLAY || HAS_DWIN_E3V2 diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 701d2ae97a..5d8abaf197 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -550,7 +550,7 @@ void _menu_ubl_tools() { SUBMENU(MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh); #endif SUBMENU(MSG_EDIT_MESH, _lcd_ubl_edit_mesh); - SUBMENU(MSG_UBL_MESH_LEVELING, _lcd_ubl_mesh_leveling); + SUBMENU(MSG_MESH_LEVELING, _lcd_ubl_mesh_leveling); END_MENU(); } diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 17b8ae4d72..59d89b5843 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -588,6 +588,13 @@ typedef struct SettingsDataStruct { bool sound_on; #endif + // + // Encoder Rate + // + #if ENABLED(PROUI_ITEM_ENC) + bool rev_rate; + #endif + // // Fan tachometer check // @@ -1680,6 +1687,13 @@ void MarlinSettings::postprocess() { EEPROM_WRITE(ui.sound_on); #endif + // + // Encoder Rate + // + #if ENABLED(PROUI_ITEM_ENC) + EEPROM_WRITE(ui.rev_rate); + #endif + // // Fan tachometer check // @@ -2762,6 +2776,14 @@ void MarlinSettings::postprocess() { EEPROM_READ(ui.sound_on); #endif + // + // Encoder Rate + // + #if ENABLED(PROUI_ITEM_ENC) + _FIELD_TEST(rev_rate); + EEPROM_READ(ui.rev_rate); + #endif + // // Fan tachometer check // @@ -3234,6 +3256,13 @@ void MarlinSettings::reset() { ui.sound_on = ENABLED(SOUND_ON_DEFAULT); #endif + // + // Encoder Rate + // + #if ENABLED(PROUI_ITEM_ENC) + ui.rev_rate = false; + #endif + // // Magnetic Parking Extruder // From 5c0c1db3ab06c5784667e3f91525e941bf5b1451 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sat, 13 Apr 2024 07:05:28 -0400 Subject: [PATCH 02/19] update languages - add msg_mesh_settings, arrange a tad --- Marlin/src/lcd/language/language_cz.h | 1 + Marlin/src/lcd/language/language_de.h | 1 + Marlin/src/lcd/language/language_en.h | 4 ++-- Marlin/src/lcd/language/language_es.h | 1 + Marlin/src/lcd/language/language_eu.h | 1 + Marlin/src/lcd/language/language_fr.h | 1 + Marlin/src/lcd/language/language_fr_na.h | 1 + Marlin/src/lcd/language/language_gl.h | 1 + Marlin/src/lcd/language/language_hu.h | 1 + Marlin/src/lcd/language/language_it.h | 5 +++-- Marlin/src/lcd/language/language_pl.h | 1 + Marlin/src/lcd/language/language_pt_br.h | 1 + Marlin/src/lcd/language/language_ro.h | 1 + Marlin/src/lcd/language/language_ru.h | 6 +++--- Marlin/src/lcd/language/language_sk.h | 3 ++- Marlin/src/lcd/language/language_sv.h | 1 + Marlin/src/lcd/language/language_tr.h | 5 +++-- Marlin/src/lcd/language/language_uk.h | 1 + Marlin/src/lcd/language/language_vi.h | 1 + Marlin/src/lcd/language/language_zh_CN.h | 1 + Marlin/src/lcd/language/language_zh_TW.h | 1 + 21 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 9ec7911af2..5280d6f0a1 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -422,6 +422,7 @@ namespace LanguageNarrow_cz { LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilineární rovnání"); LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Mřížkové rovnání"); + LSTR MSG_MESH_SETTINGS = _UxGT("Nastavení sítě"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statistika"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info o desce"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index bf160dc502..945a9230e7 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -574,6 +574,7 @@ namespace LanguageNarrow_de { LSTR MSG_UBL_LEVELING = _UxGT("Einheit. Bettnivell."); LSTR MSG_MESH_LEVELING = _UxGT("Netz-Nivellierung"); LSTR MSG_MESH_DONE = _UxGT("Nivellierung fertig"); + LSTR MSG_MESH_SETTINGS = _UxGT("Netzeinstellungen"); LSTR MSG_INFO_STATS_MENU = _UxGT("Drucker-Statistik"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Board-Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistoren"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index bb394ad199..32cd633ccc 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -641,11 +641,11 @@ namespace LanguageNarrow_en { LSTR MSG_CHAMBER_COOLING = _UxGT("Chamber Cooling..."); LSTR MSG_LASER_COOLING = _UxGT("Laser Cooling..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Delta Calibration"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Calibration in progress"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Calibrate X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Calibrate Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Calibrate Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Calibrate Center"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Calibration in progress"); LSTR MSG_DELTA_SETTINGS = _UxGT("Delta Settings"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Auto Calibration"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Diag Rod"); @@ -660,8 +660,8 @@ namespace LanguageNarrow_en { LSTR MSG_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_MESH_DONE = _UxGT("Mesh probing done"); LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Settings"); - LSTR MSG_INFO_STATS_MENU = _UxGT("Printer Stats"); LSTR MSG_RESET_STATS = _UxGT("Reset Print Stats?"); + LSTR MSG_INFO_STATS_MENU = _UxGT("Printer Stats"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Board Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistors"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Extruders"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 3f2d57f10b..48c3933792 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -432,6 +432,7 @@ namespace LanguageNarrow_es { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelando Bilineal"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelando UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelando en Mallado"); + LSTR MSG_MESH_SETTINGS = _UxGT("Ajustes en Mallado"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estadísticas Imp."); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. Controlador"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 00d62233db..a3378294ab 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -261,6 +261,7 @@ namespace LanguageNarrow_eu { LSTR MSG_BILINEAR_LEVELING = _UxGT("Berdinketa bilinearra"); LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Sare berdinketa"); + LSTR MSG_MESH_SETTINGS = _UxGT("Sarearen ezarpenak"); LSTR MSG_INFO_STATS_MENU = _UxGT("Inprima. estatis."); LSTR MSG_INFO_BOARD_MENU = _UxGT("Txartelaren Info."); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistoreak"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 5a02082a56..70ae78e7c8 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -463,6 +463,7 @@ namespace LanguageNarrow_fr { LSTR MSG_UBL_LEVELING = _UxGT("Niveau lit unifié"); LSTR MSG_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_MESH_DONE = _UxGT("Niveau terminé"); + LSTR MSG_MESH_SETTINGS = _UxGT("Réglages de maillage"); LSTR MSG_INFO_STATS_MENU = _UxGT("Stats. imprimante"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Infos carte"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistances"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index 96b2e22d72..23b5d4af38 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -466,6 +466,7 @@ namespace LanguageNarrow_fr_na { LSTR MSG_UBL_LEVELING = _UxGT("Niveau lit unifie"); LSTR MSG_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_MESH_DONE = _UxGT("Niveau termine"); + LSTR MSG_MESH_SETTINGS = _UxGT("Reglages de maillage"); LSTR MSG_INFO_STATS_MENU = _UxGT("Stats. imprimante"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Infos carte"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistances"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index f94aad1308..627d6085bf 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -447,6 +447,7 @@ namespace LanguageNarrow_gl { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelación Bilineal"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelación UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelación en Malla"); + LSTR MSG_MESH_SETTINGS = _UxGT("Configuración Malla"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estatísticas"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Placa nai"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 79e1879935..89b4266591 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -504,6 +504,7 @@ namespace LanguageNarrow_hu { LSTR MSG_UBL_LEVELING = _UxGT("Egységes ágy szintezés"); LSTR MSG_MESH_LEVELING = _UxGT("Háló szintezés"); LSTR MSG_MESH_DONE = _UxGT("Háló szintezés kész"); + LSTR MSG_MESH_SETTINGS = _UxGT("Hálós beállítások"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statisztikák"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Alaplap infó"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termisztorok"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 452fb03b20..bf5d7720bd 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -619,11 +619,11 @@ namespace LanguageNarrow_it { LSTR MSG_CHAMBER_COOLING = _UxGT("Raffr. camera..."); LSTR MSG_LASER_COOLING = _UxGT("Raffr. laser..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Calibraz. Delta"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Calibrazione delta in corso"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Calibra X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Calibra Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Calibra Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Calibra centro"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Calibrazione delta in corso"); LSTR MSG_DELTA_SETTINGS = _UxGT("Impostaz. delta"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Auto calibrazione"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Barra diagonale"); @@ -637,8 +637,9 @@ namespace LanguageNarrow_it { LSTR MSG_UBL_LEVELING = _UxGT("Livel.piatto unific."); LSTR MSG_MESH_LEVELING = _UxGT("Livel. mesh"); LSTR MSG_MESH_DONE = _UxGT("Sond.mesh eseguito"); - LSTR MSG_INFO_STATS_MENU = _UxGT("Statistiche"); + LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Impostazioni"); LSTR MSG_RESET_STATS = _UxGT("Reset stat.stampa?"); + LSTR MSG_INFO_STATS_MENU = _UxGT("Statistiche"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. scheda"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistori"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Estrusori"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index a7aa163103..b771625700 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -401,6 +401,7 @@ namespace LanguageNarrow_pl { LSTR MSG_LINEAR_LEVELING = _UxGT("Poziomowanie liniowe"); LSTR MSG_BILINEAR_LEVELING = _UxGT("Poziomowanie biliniowe"); LSTR MSG_MESH_LEVELING = _UxGT("Poziomowanie siatką"); + LSTR MSG_MESH_SETTINGS = _UxGT("Siatki Ustawienia"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statystyki"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info płyty"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 298f21133c..09756be8a1 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -375,6 +375,7 @@ namespace LanguageNarrow_pt_br { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelamento Bilinear"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelamento UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelamento da Malha"); + LSTR MSG_MESH_SETTINGS = _UxGT("Malha Configuração"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estatísticas"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. da Placa"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 87165b259f..c086647923 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -454,6 +454,7 @@ namespace LanguageNarrow_ro { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelare Bilineara"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelarea Patului Unificata"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelare Mesh"); + LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Setari"); LSTR MSG_INFO_STATS_MENU = _UxGT("Status Imprimanta"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Informatii Placa"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistoare"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index a324a1f874..3ef240cb57 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -498,6 +498,7 @@ namespace LanguageNarrow_ru { LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Калибровать Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Калибровать Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Калибровать центр"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); LSTR MSG_DELTA_SETTINGS = _UxGT("Настройки дельты"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Автокалибр. дельты"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Стержень диаг."); @@ -511,7 +512,8 @@ namespace LanguageNarrow_ru { LSTR MSG_UBL_LEVELING = _UxGT("Выравнивание UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Выравнивание сеткой"); LSTR MSG_MESH_DONE = _UxGT("Зондиров. выполнено"); - + LSTR MSG_MESH_SETTINGS = _UxGT("Сетка Настройки"); + LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); LSTR MSG_INFO_STATS_MENU = _UxGT("Статистика принтера"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Данные платы"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Термисторы"); @@ -774,8 +776,6 @@ namespace LanguageNarrow_ru { LSTR MSG_ERR_TEMP_MALFUNCTION = _UxGT("СБОЙ ТЕМПЕРАТУРЫ"); LSTR MSG_PLEASE_WAIT = _UxGT("Ожидайте..."); LSTR MSG_PREHEATING = _UxGT("Нагреваю..."); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); - LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); LSTR MSG_FAN_SPEED_FAULT = _UxGT("Сбой скорости кулера"); LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 4d03ae84d6..87923b377e 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -616,8 +616,9 @@ namespace LanguageNarrow_sk { LSTR MSG_UBL_LEVELING = _UxGT("UBL rovnanie"); LSTR MSG_MESH_LEVELING = _UxGT("Mriežkové rovnanie"); LSTR MSG_MESH_DONE = _UxGT("Mriežka dokončená"); - LSTR MSG_INFO_STATS_MENU = _UxGT("Štatistika"); + LSTR MSG_MESH_SETTINGS = _UxGT("Mriežka nastavenia"); LSTR MSG_RESET_STATS = _UxGT("Vynulovať štatis.?"); + LSTR MSG_INFO_STATS_MENU = _UxGT("Štatistika"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. o doske"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Extrudéry"); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 83680af2a6..cf5668e33a 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -488,6 +488,7 @@ namespace LanguageNarrow_sv { LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilinjär Nivellering"); LSTR MSG_UBL_LEVELING = _UxGT("Enhetlig Bädd Nivellering (UBL)"); LSTR MSG_MESH_LEVELING = _UxGT("Nät Nivellering"); + LSTR MSG_MESH_SETTINGS = _UxGT("Nät Inställningar"); LSTR MSG_INFO_STATS_MENU = _UxGT("Skrivar Stats"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Kort Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistor"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index ecfc211138..e996ba107c 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -619,11 +619,11 @@ namespace LanguageNarrow_tr { LSTR MSG_CHAMBER_COOLING = _UxGT("Kabin Soğuyor..."); LSTR MSG_LASER_COOLING = _UxGT("Lazer Soğuyor..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Delta Kalibrasyonu"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Kalibrasyonu sürüyor"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Ayarla X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Ayarla Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Ayarla Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Ayarla Merkez"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Kalibrasyonu sürüyor"); LSTR MSG_DELTA_SETTINGS = _UxGT("Delta Ayarları"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Oto Kalibrasyon"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Çapral Mil"); @@ -637,8 +637,9 @@ namespace LanguageNarrow_tr { LSTR MSG_UBL_LEVELING = _UxGT("Birleşik Tabla Hiza."); LSTR MSG_MESH_LEVELING = _UxGT("Mesh Seviyeleme"); LSTR MSG_MESH_DONE = _UxGT("Mesh sondalama tamam"); - LSTR MSG_INFO_STATS_MENU = _UxGT("İstatistikler"); + LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Ayarları"); LSTR MSG_RESET_STATS = _UxGT("Yazdırma istatistik Sıfırla?"); + LSTR MSG_INFO_STATS_MENU = _UxGT("İstatistikler"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Kontrolcü Bilgisi"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistörler"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Ekstruderler"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 76ced11447..bc9198544c 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -523,6 +523,7 @@ namespace LanguageNarrow_uk { LSTR MSG_UBL_LEVELING = _UxGT("UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Вирівнювання сітки"); LSTR MSG_MESH_DONE = _UxGT("Зондування виконано"); + LSTR MSG_MESH_SETTINGS = _UxGT("Сітка Параметри"); LSTR MSG_INFO_STATS_MENU = _UxGT("Статистика принтера"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Про плату"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 69c4531115..be7228e48f 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -356,6 +356,7 @@ namespace LanguageNarrow_vi { LSTR MSG_BILINEAR_LEVELING = _UxGT("San Lấp Song Tuyến"); // Bilinear Leveling LSTR MSG_UBL_LEVELING = _UxGT("San Lấp Bàn Thống Nhất"); // Unified Bed Leveling LSTR MSG_MESH_LEVELING = _UxGT("Lưới San Lấp"); // Mesh Leveling + LSTR MSG_MESH_SETTINGS = _UxGT("Lưới Cài Đặt"); // Mesh Settings LSTR MSG_INFO_STATS_MENU = _UxGT("Thống Kê Máy In"); // Printer Stats LSTR MSG_INFO_BOARD_MENU = _UxGT("Thông Tin Bo Mạch"); // Board Info LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Điện Trở Nhiệt"); // Thermistors diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 78c6936314..2e4e416f3b 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -463,6 +463,7 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_BILINEAR_LEVELING = _UxGT("双线性调平"); // "Bilinear Leveling" LSTR MSG_UBL_LEVELING = _UxGT("统一热床调平(UBL)"); // "Unified Bed Leveling" LSTR MSG_MESH_LEVELING = _UxGT("网格调平"); // "Mesh Leveling" + LSTR MSG_MESH_SETTINGS = _UxGT("网格设置"); // "Mesh Settings" LSTR MSG_INFO_STATS_MENU = _UxGT("打印机统计"); // "Printer Stats" LSTR MSG_INFO_BOARD_MENU = _UxGT("主板信息"); // "Board Info" LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("温度计"); // "Thermistors" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 2bc8358b90..a701e9ce90 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -402,6 +402,7 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_BILINEAR_LEVELING = _UxGT(" 雙線性調平"); // "Bilinear Leveling" LSTR MSG_UBL_LEVELING = _UxGT("統一熱床調平(UBL)"); // "Unified Bed Leveling" LSTR MSG_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling" + LSTR MSG_MESH_SETTINGS = _UxGT("網格設置"); // "Mesh Settings" LSTR MSG_INFO_STATS_MENU = _UxGT("印表機統計"); // "Printer Stats" LSTR MSG_INFO_BOARD_MENU = _UxGT("主板訊息"); // "Board Info" LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("溫度計"); // "Thermistors" From d44f518143f4c3b21a1520ebc972ad6f4985a1e1 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sat, 20 Apr 2024 07:42:37 -0400 Subject: [PATCH 03/19] revert and move to other PR --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 366 +++++++++++------------ Marlin/src/lcd/e3v2/proui/dwin.h | 2 - Marlin/src/lcd/e3v2/proui/dwinui.h | 1 + Marlin/src/lcd/language/language_cz.h | 2 +- Marlin/src/lcd/language/language_de.h | 2 +- Marlin/src/lcd/language/language_en.h | 6 +- Marlin/src/lcd/language/language_es.h | 2 +- Marlin/src/lcd/language/language_eu.h | 2 +- Marlin/src/lcd/language/language_fr.h | 2 +- Marlin/src/lcd/language/language_fr_na.h | 2 +- Marlin/src/lcd/language/language_gl.h | 2 +- Marlin/src/lcd/language/language_hu.h | 2 +- Marlin/src/lcd/language/language_it.h | 10 +- Marlin/src/lcd/language/language_pl.h | 2 +- Marlin/src/lcd/language/language_pt_br.h | 2 +- Marlin/src/lcd/language/language_ro.h | 2 +- Marlin/src/lcd/language/language_ru.h | 7 +- Marlin/src/lcd/language/language_sk.h | 4 +- Marlin/src/lcd/language/language_sv.h | 2 +- Marlin/src/lcd/language/language_tr.h | 6 +- Marlin/src/lcd/language/language_uk.h | 2 +- Marlin/src/lcd/language/language_vi.h | 2 +- Marlin/src/lcd/language/language_zh_CN.h | 2 +- Marlin/src/lcd/language/language_zh_TW.h | 2 +- Marlin/src/lcd/menu/menu_ubl.cpp | 2 +- 25 files changed, 215 insertions(+), 221 deletions(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 22dd1a191a..e6111e56d1 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -180,7 +180,7 @@ enum SelectItem : uint8_t { PAGE_PRINT = 0, PAGE_PREPARE, PAGE_CONTROL, - PAGE_LEVEL, + PAGE_ADVANCE, PAGE_COUNT, PRINT_SETUP = 0, @@ -216,7 +216,6 @@ Menu *prepareMenu = nullptr; Menu *moveMenu = nullptr; Menu *controlMenu = nullptr; Menu *advancedSettingsMenu = nullptr; -Menu *levelMenu = nullptr; #if HAS_HOME_OFFSET Menu *homeOffsetMenu = nullptr; #endif @@ -367,12 +366,12 @@ void ICON_Control() { } // -// Main Menu: "Level" +// Main Menu: "Advanced Settings" // -void ICON_Level() { +void ICON_AdvSettings() { constexpr frame_rect_t ico = { 145, 226, 110, 100 }; constexpr text_info_t txt = { 91, { 405, 447 }, 27, 15 }; - ICON_Button(select_page.now == PAGE_LEVEL, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL)); + ICON_Button(select_page.now == PAGE_ADVANCE, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_ADVANCED)); } // @@ -680,7 +679,7 @@ void drawMainMenu() { ICON_Print(); ICON_Prepare(); ICON_Control(); - ICON_Level(); + ICON_AdvSettings(); } void gotoMainMenu() { @@ -1131,7 +1130,7 @@ void hmiMainMenu() { case PAGE_PRINT: ICON_Print(); break; case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break; case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break; - case PAGE_LEVEL: ICON_Control(); ICON_Level(); break; + case PAGE_ADVANCE: ICON_Control(); ICON_AdvSettings(); break; } } } @@ -1140,8 +1139,8 @@ void hmiMainMenu() { switch (select_page.now) { case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break; case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break; - case PAGE_CONTROL: ICON_Control(); ICON_Level(); break; - case PAGE_LEVEL: ICON_Level(); break; + case PAGE_CONTROL: ICON_Control(); ICON_AdvSettings(); break; + case PAGE_ADVANCE: ICON_AdvSettings(); break; } } } @@ -1156,7 +1155,7 @@ void hmiMainMenu() { break; case PAGE_PREPARE: drawPrepareMenu(); break; case PAGE_CONTROL: drawControlMenu(); break; - case PAGE_LEVEL: drawLevelMenu(); break; + case PAGE_ADVANCE: drawAdvancedSettingsMenu(); break; } } dwinUpdateLCD(); @@ -1850,7 +1849,7 @@ void dwinSetColorDefaults() { hmiData.colorCoordinate = defColorCoordinate; } -static_assert(ExtUI::eeprom_data_size >= EXTUI_EEPROM_DATA_SIZE, "Insufficient space in EEPROM for UI parameters"); +static_assert(ExtUI::eeprom_data_size >= sizeof(hmi_data_t), "Insufficient space in EEPROM for UI parameters"); void dwinSetDataDefaults() { dwinSetColorDefaults(); @@ -2176,7 +2175,7 @@ void doCoolDown() { thermalManager.cooldown(); } void setLanguage() { hmiToggleLanguage(); currentMenu = nullptr; // Invalidate menu to full redraw - drawControlMenu(); + drawPrepareMenu(); } bool enableLiveMove = false; @@ -2385,73 +2384,6 @@ void setSpeed() { setPIntOnClick(SPEED_EDIT_MIN, SPEED_EDIT_MAX); } void setFlow() { setPIntOnClick(FLOW_EDIT_MIN, FLOW_EDIT_MAX, []{ planner.refresh_e_factor(0); }); } -#if HAS_MESH - - void applyMeshFadeHeight() { set_z_fade_height(planner.z_fade_height); } - void setMeshFadeHeight() { setPFloatOnClick(0, 100, 1, applyMeshFadeHeight); } - - void setMeshActive() { - set_bed_leveling_enabled(!planner.leveling_active); - drawCheckboxLine(currentMenu->line(), planner.leveling_active); - dwinUpdateLCD(); - } - - #if ENABLED(PREHEAT_BEFORE_LEVELING) - void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); } - #endif - - #if ENABLED(PROUI_MESH_EDIT) - void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } - void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; } - void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; } - void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } - void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); } - void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); } - void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); } - #endif - -#endif // HAS_MESH - -#if ENABLED(AUTO_BED_LEVELING_UBL) - - void applyUBLSlot() { bedlevel.storage_slot = menuData.value; } - void setUBLSlot() { setIntOnClick(0, settings.calc_num_meshes() - 1, bedlevel.storage_slot, applyUBLSlot); } - void onDrawUBLSlot(MenuItem* menuitem, int8_t line) { - NOLESS(bedlevel.storage_slot, 0); - onDrawIntMenu(menuitem, line, bedlevel.storage_slot); - } - - void applyUBLTiltGrid() { bedLevelTools.tilt_grid = menuData.value; } - void setUBLTiltGrid() { setIntOnClick(1, 3, bedLevelTools.tilt_grid, applyUBLTiltGrid); } - - void ublMeshTilt() { - NOLESS(bedlevel.storage_slot, 0); - if (bedLevelTools.tilt_grid > 1) - gcode.process_subcommands_now(TS(F("G29J"), bedLevelTools.tilt_grid)); - else - gcode.process_subcommands_now(F("G29J")); - LCD_MESSAGE(MSG_UBL_MESH_TILTED); - } - - void ublSmartFillMesh() { - for (uint8_t x = 0; x < GRID_MAX_POINTS_Y; ++x) bedlevel.smart_fill_mesh(); - LCD_MESSAGE(MSG_UBL_MESH_FILLED); - } - - void ublMeshSave() { - NOLESS(bedlevel.storage_slot, 0); - settings.store_mesh(bedlevel.storage_slot); - ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), bedlevel.storage_slot); - DONE_BUZZ(true); - } - - void ublMeshLoad() { - NOLESS(bedlevel.storage_slot, 0); - settings.load_mesh(bedlevel.storage_slot); - } - -#endif // AUTO_BED_LEVELING_UBL - // Bed Tramming #if ENABLED(LCD_BED_TRAMMING) @@ -2725,9 +2657,8 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu #if HAS_HOTEND void setStepsE() { hmiValue.axis = E_AXIS; setPFloatOnClick( min_steps_edit_values.e, max_steps_edit_values.e, UNITFDIGITS); } #endif - #if ENABLED(FWRETRACT) - void returnFWRetractMenu() { (previousMenu == filamentMenu) ? drawFilamentManMenu() : drawTuneMenu(); } + void returnFWRetractMenu() { (previousMenu == filSetMenu) ? drawFilSetMenu() : drawTuneMenu(); } void setRetractLength() { setPFloatOnClick( 0, 10, UNITFDIGITS); } void setRetractSpeed() { setPFloatOnClick( 1, 90, UNITFDIGITS); } void setZRaise() { setPFloatOnClick( 0, 2, 2); } @@ -3143,16 +3074,24 @@ frame_rect_t selrect(frame_rect_t) { void drawPrepareMenu() { checkkey = ID_Menu; - if (SET_MENU_R(prepareMenu, selrect({133, 1, 28, 13}), MSG_PREPARE, 11)) { + if (SET_MENU_R(prepareMenu, selrect({133, 1, 28, 13}), MSG_PREPARE, 12 + PREHEAT_COUNT)) { BACK_ITEM(gotoMainMenu); + MENU_ITEM(ICON_FilMan, MSG_FILAMENT_MAN, onDrawSubMenu, drawFilamentManMenu); + MENU_ITEM(ICON_Axis, MSG_MOVE_AXIS, onDrawMoveSubMenu, drawMoveMenu); + #if ENABLED(LCD_BED_TRAMMING) + MENU_ITEM(ICON_Tram, MSG_BED_TRAMMING, onDrawSubMenu, drawTrammingMenu); + #endif + MENU_ITEM(ICON_CloseMotor, MSG_DISABLE_STEPPERS, onDrawDisableMotors, disableMotors); #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU) MENU_ITEM(ICON_Homing, MSG_HOMING, onDrawSubMenu, drawHomingMenu); #else MENU_ITEM(ICON_Homing, MSG_AUTO_HOME, onDrawAutoHome, autoHome); #endif - MENU_ITEM(ICON_Axis, MSG_MOVE_AXIS, onDrawMoveSubMenu, drawMoveMenu); - MENU_ITEM(ICON_CloseMotor, MSG_DISABLE_STEPPERS, onDrawDisableMotors, disableMotors); - MENU_ITEM(ICON_FilMan, MSG_FILAMENT_MAN, onDrawSubMenu, drawFilamentManMenu); + #if ENABLED(MESH_BED_LEVELING) + MENU_ITEM(ICON_ManualMesh, MSG_MANUAL_MESH, onDrawSubMenu, drawManualMeshMenu); + #elif HAS_BED_PROBE + MENU_ITEM(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); + #endif #if HAS_ZOFFSET_ITEM #if HAS_BED_PROBE MENU_ITEM(ICON_SetZOffset, MSG_PROBE_WIZARD, onDrawSubMenu, drawZOffsetWizMenu); @@ -3160,17 +3099,16 @@ void drawPrepareMenu() { EDIT_ITEM(ICON_Zoffset, MSG_HOME_OFFSET_Z, onDrawPFloat2Menu, setZOffset, &BABY_Z_VAR); #endif #endif - #if ENABLED(LCD_BED_TRAMMING) - MENU_ITEM(ICON_Tram, MSG_BED_TRAMMING, onDrawSubMenu, drawTrammingMenu); - #endif #if HAS_PREHEAT - MENU_ITEM(ICON_SetEndTemp, MSG_PREHEAT_HOTEND, onDrawSubMenu, drawPreheatHotendMenu); + #define _ITEM_PREHEAT(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheat##N); + REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT) #endif MENU_ITEM(ICON_Cool, MSG_COOLDOWN, onDrawCooldown, doCoolDown); #if ALL(PROUI_TUNING_GRAPH, PROUI_ITEM_PLOT) MENU_ITEM(ICON_PIDNozzle, MSG_HOTEND_TEMP_GRAPH, onDrawMenuItem, drawHPlot); MENU_ITEM(ICON_PIDBed, MSG_BED_TEMP_GRAPH, onDrawMenuItem, drawBPlot); #endif + MENU_ITEM(ICON_Language, MSG_UI_LANGUAGE, onDrawLanguage, setLanguage); } ui.reset_status(true); updateMenu(prepareMenu); @@ -3203,7 +3141,7 @@ void drawPrepareMenu() { void drawControlMenu() { checkkey = ID_Menu; - if (SET_MENU_R(controlMenu, selrect({103, 1, 28, 14}), MSG_CONTROL, 12)) { + if (SET_MENU_R(controlMenu, selrect({103, 1, 28, 14}), MSG_CONTROL, 11)) { BACK_ITEM(gotoMainMenu); MENU_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawTempSubMenu, drawTemperatureMenu); MENU_ITEM(ICON_Motion, MSG_MOTION, onDrawMotionSubMenu, drawMotionMenu); @@ -3225,9 +3163,7 @@ void drawControlMenu() { MENU_ITEM(ICON_ResetEEPROM, MSG_RESTORE_DEFAULTS, onDrawResetEeprom, resetEEPROM); #endif MENU_ITEM(ICON_Reboot, MSG_RESET_PRINTER, onDrawMenuItem, rebootPrinter); - MENU_ITEM(ICON_AdvSet, MSG_ADVANCED_SETTINGS, onDrawSubMenu, drawAdvancedSettingsMenu); MENU_ITEM(ICON_Info, MSG_INFO_SCREEN, onDrawInfoSubMenu, gotoInfoMenu); - MENU_ITEM(ICON_Language, MSG_UI_LANGUAGE, onDrawLanguage, setLanguage); } ui.reset_status(true); updateMenu(controlMenu); @@ -3235,14 +3171,32 @@ void drawControlMenu() { void drawAdvancedSettingsMenu() { checkkey = ID_Menu; - if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, 16)) { - BACK_ITEM(drawControlMenu); - #if HAS_LCD_BRIGHTNESS - EDIT_ITEM(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, setBrightness, &ui.brightness); - MENU_ITEM(ICON_Box, MSG_BRIGHTNESS_OFF, onDrawMenuItem, turnOffBacklight); + if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, 25)) { + BACK_ITEM(gotoMainMenu); + #if ENABLED(EEPROM_SETTINGS) + MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); #endif - #if HAS_CUSTOM_COLORS - MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); + #if HAS_MESH + MENU_ITEM(ICON_Mesh, MSG_MESH_LEVELING, onDrawSubMenu, drawMeshSetMenu); + #endif + #if HAS_BED_PROBE + MENU_ITEM(ICON_Probe, MSG_ZPROBE_SETTINGS, onDrawSubMenu, drawProbeSetMenu); + #endif + #if HAS_HOME_OFFSET + MENU_ITEM(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, drawHomeOffsetMenu); + #endif + MENU_ITEM(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, drawFilSetMenu); + #if ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) + MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID " Settings", onDrawSubMenu, drawHotendPIDMenu); + #endif + #if ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) + MENU_ITEM_F(ICON_MPCNozzle, "MPC Settings", onDrawSubMenu, drawHotendMPCMenu); + #endif + #if ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) + MENU_ITEM_F(ICON_PIDBed, STR_BED_PID " Settings", onDrawSubMenu, drawBedPIDMenu); + #endif + #if HAS_TRINAMIC_CONFIG + MENU_ITEM(ICON_TMCSet, MSG_TMC_DRIVERS, onDrawSubMenu, drawTrinamicConfigMenu); #endif #if HAS_ESDIAG MENU_ITEM_F(ICON_esDiag, "End-stops diag.", onDrawSubMenu, drawEndStopDiag); @@ -3273,6 +3227,13 @@ void drawAdvancedSettingsMenu() { #if ENABLED(BAUD_RATE_GCODE) EDIT_ITEM_F(ICON_SetBaudRate, "115K baud", onDrawChkbMenu, setBaudRate, &hmiData.baud115K); #endif + #if HAS_LCD_BRIGHTNESS + EDIT_ITEM(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, setBrightness, &ui.brightness); + MENU_ITEM(ICON_Box, MSG_BRIGHTNESS_OFF, onDrawMenuItem, turnOffBacklight); + #endif + #if HAS_CUSTOM_COLORS + MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); + #endif #if ENABLED(PROUI_ITEM_ENC) EDIT_ITEM_F(ICON_Motion, "Reverse Encoder", onDrawChkbMenu, setRevRate, &ui.rev_rate); #endif @@ -3281,42 +3242,6 @@ void drawAdvancedSettingsMenu() { updateMenu(advancedSettingsMenu); } -void drawLevelMenu() { - checkkey = ID_Menu; - if (SET_MENU(levelMenu, MSG_BED_LEVELING, 14)) { - BACK_ITEM(gotoMainMenu); - #if ENABLED(EEPROM_SETTINGS) - MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); - #endif - #if ENABLED(MESH_BED_LEVELING) - MENU_ITEM(ICON_ManualMesh, MSG_MANUAL_MESH, onDrawSubMenu, drawManualMeshMenu); - #elif HAS_BED_PROBE - MENU_ITEM(ICON_Mesh, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); - MENU_ITEM(ICON_Probe, MSG_ZPROBE_SETTINGS, onDrawSubMenu, drawProbeSetMenu); - #endif - #if HAS_HOME_OFFSET - MENU_ITEM(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, drawHomeOffsetMenu); - #endif - #if HAS_MESH - MENU_ITEM(ICON_Mesh, MSG_MESH_SETTINGS, onDrawSubMenu, drawMeshSetMenu); - MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); - #if ENABLED(PROUI_MESH_EDIT) - MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu); - MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh); - #endif - #endif - #if ENABLED(AUTO_BED_LEVELING_UBL) - EDIT_ITEM(ICON_UBLSlot, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, setUBLSlot, &bedlevel.storage_slot); - MENU_ITEM(ICON_UBLMeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, ublMeshSave); - MENU_ITEM(ICON_UBLMeshLoad, MSG_UBL_LOAD_MESH, onDrawMenuItem, ublMeshLoad); - MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt); - MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh); - #endif - } - ui.reset_status(true); - updateMenu(levelMenu); -} - void drawMoveMenu() { checkkey = ID_Menu; if (SET_MENU_R(moveMenu, selrect({192, 1, 42, 14}), MSG_MOVE_AXIS, 6)) { @@ -3345,7 +3270,7 @@ void drawMoveMenu() { void drawHomeOffsetMenu() { checkkey = ID_Menu; if (SET_MENU(homeOffsetMenu, MSG_SET_HOME_OFFSETS, 4)) { - BACK_ITEM(drawLevelMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if HAS_X_AXIS EDIT_ITEM(ICON_HomeOffsetX, MSG_HOME_OFFSET_X, onDrawPFloatMenu, setHomeOffsetX, &home_offset.x); #endif @@ -3366,7 +3291,7 @@ void drawMoveMenu() { void drawProbeSetMenu() { checkkey = ID_Menu; if (SET_MENU(probeSettingsMenu, MSG_ZPROBE_SETTINGS, 9)) { - BACK_ITEM(drawLevelMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if HAS_X_AXIS EDIT_ITEM(ICON_ProbeOffsetX, MSG_ZPROBE_XOFFSET, onDrawPFloatMenu, setProbeOffsetX, &probe.offset.x); #endif @@ -3395,11 +3320,8 @@ void drawMoveMenu() { void drawFilSetMenu() { checkkey = ID_Menu; - if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 7)) { - BACK_ITEM(drawFilamentManMenu); - #if ENABLED(EEPROM_SETTINGS) - MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); - #endif + if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 9)) { + BACK_ITEM(drawAdvancedSettingsMenu); #if HAS_FILAMENT_SENSOR EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled); #endif @@ -3413,6 +3335,9 @@ void drawFilSetMenu() { EDIT_ITEM(ICON_FilLoad, MSG_FILAMENT_LOAD, onDrawPFloatMenu, setFilLoad, &fc_settings[0].load_length); EDIT_ITEM(ICON_FilUnload, MSG_FILAMENT_UNLOAD, onDrawPFloatMenu, setFilUnload, &fc_settings[0].unload_length); #endif + #if ENABLED(FWRETRACT) + MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu); + #endif } updateMenu(filSetMenu); } @@ -3594,7 +3519,7 @@ void drawTuneMenu() { void drawTrinamicConfigMenu() { checkkey = ID_Menu; if (SET_MENU(trinamicConfigMenu, MSG_TMC_DRIVERS, 5)) { - BACK_ITEM(drawMotionMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if AXIS_IS_TMC(X) EDIT_ITEM(ICON_TMCXSet, MSG_TMC_ACURRENT, onDrawPIntMenu, setXTMCCurrent, &stepperX.val_mA); #endif @@ -3614,15 +3539,10 @@ void drawTuneMenu() { void drawMotionMenu() { checkkey = ID_Menu; - if (SET_MENU_R(motionMenu, selrect({1, 16, 28, 13}), MSG_MOTION, 11)) { + if (SET_MENU_R(motionMenu, selrect({1, 16, 28, 13}), MSG_MOTION, 10)) { BACK_ITEM(drawControlMenu); - EDIT_ITEM(ICON_Flow, MSG_FLOW, onDrawPIntMenu, setFlow, &planner.flow_percentage[0]); - EDIT_ITEM(ICON_Speed, MSG_SPEED, onDrawPIntMenu, setSpeed, &feedrate_percentage); MENU_ITEM(ICON_MaxSpeed, MSG_SPEED, onDrawSpeed, drawMaxSpeedMenu); MENU_ITEM(ICON_MaxAccelerated, MSG_ACCELERATION, onDrawAcc, drawMaxAccelMenu); - #if ENABLED(EDITABLE_STEPS_PER_UNIT) - MENU_ITEM(ICON_Step, MSG_STEPS_PER_MM, onDrawSteps, drawStepsMenu); - #endif #if ENABLED(CLASSIC_JERK) MENU_ITEM(ICON_MaxJerk, MSG_JERK, onDrawJerk, drawMaxJerkMenu); #elif HAS_JUNCTION_DEVIATION @@ -3637,21 +3557,23 @@ void drawMotionMenu() { #if ENABLED(ADAPTIVE_STEP_SMOOTHING_TOGGLE) EDIT_ITEM(ICON_UBLActive, MSG_STEP_SMOOTHING, onDrawChkbMenu, setAdaptiveStepSmoothing, &stepper.adaptive_step_smoothing_enabled); #endif - #if HAS_TRINAMIC_CONFIG - MENU_ITEM(ICON_TMCSet, MSG_TMC_DRIVERS, onDrawSubMenu, drawTrinamicConfigMenu); + #if ENABLED(EDITABLE_STEPS_PER_UNIT) + MENU_ITEM(ICON_Step, MSG_STEPS_PER_MM, onDrawSteps, drawStepsMenu); #endif + EDIT_ITEM(ICON_Flow, MSG_FLOW, onDrawPIntMenu, setFlow, &planner.flow_percentage[0]); + EDIT_ITEM(ICON_Speed, MSG_SPEED, onDrawPIntMenu, setSpeed, &feedrate_percentage); } updateMenu(motionMenu); } -#if HAS_PREHEAT +#if ALL(ADVANCED_PAUSE_FEATURE, HAS_PREHEAT) void drawPreheatHotendMenu() { checkkey = ID_Menu; if (SET_MENU(preheatHotendMenu, MSG_PREHEAT_HOTEND, 1 + PREHEAT_COUNT)) { - BACK_ITEM(drawPrepareMenu); - #define _ITEM_PREHEAT(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheat##N); - REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT) + BACK_ITEM(drawFilamentManMenu); + #define _ITEM_PREHEAT_HE(N) MENU_ITEM(ICON_Preheat##N, MSG_PREHEAT_##N, onDrawMenuItem, DoPreheatHotend##N); + REPEAT_1(PREHEAT_COUNT, _ITEM_PREHEAT_HE) } updateMenu(preheatHotendMenu); } @@ -3660,21 +3582,20 @@ void drawMotionMenu() { void drawFilamentManMenu() { checkkey = ID_Menu; - if (SET_MENU(filamentMenu, MSG_FILAMENT_MAN, 7)) { + if (SET_MENU(filamentMenu, MSG_FILAMENT_MAN, 6)) { BACK_ITEM(drawPrepareMenu); - MENU_ITEM(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, drawFilSetMenu); #if ENABLED(NOZZLE_PARK_FEATURE) MENU_ITEM(ICON_Park, MSG_FILAMENT_PARK_ENABLED, onDrawMenuItem, parkHead); #endif #if ENABLED(ADVANCED_PAUSE_FEATURE) + #if HAS_PREHEAT + MENU_ITEM(ICON_SetEndTemp, MSG_PREHEAT_HOTEND, onDrawSubMenu, drawPreheatHotendMenu); + #endif MENU_ITEM(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, changeFilament); #endif #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES) - MENU_ITEM(ICON_FilLoad, MSG_FILAMENTLOAD, onDrawMenuItem, loadFilament); MENU_ITEM(ICON_FilUnload, MSG_FILAMENTUNLOAD, onDrawMenuItem, unloadFilament); - #endif - #if ENABLED(FWRETRACT) - MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu); + MENU_ITEM(ICON_FilLoad, MSG_FILAMENTLOAD, onDrawMenuItem, loadFilament); #endif } updateMenu(filamentMenu); @@ -3684,11 +3605,12 @@ void drawFilamentManMenu() { void drawManualMeshMenu() { checkkey = ID_Menu; - if (SET_MENU(manualMeshMenu, MSG_MANUAL_LEVELING, 5)) { - BACK_ITEM(drawLevelMenu); - MENU_ITEM(ICON_ManualMesh, MSG_UBL_MANUAL_MESH, onDrawMenuItem, manualMeshStart); + if (SET_MENU(manualMeshMenu, MSG_UBL_MANUAL_MESH, 6)) { + BACK_ITEM(drawPrepareMenu); + MENU_ITEM(ICON_ManualMesh, MSG_LEVEL_BED, onDrawMenuItem, manualMeshStart); mMeshMoveZItem = EDIT_ITEM(ICON_Zoffset, MSG_MOVE_Z, onDrawMMeshMoveZ, setMMeshMoveZ, ¤t_position.z); MENU_ITEM(ICON_Axis, MSG_UBL_CONTINUE_MESH, onDrawMenuItem, manualMeshContinue); + MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); MENU_ITEM(ICON_MeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, manualMeshSave); } updateMenu(manualMeshMenu); @@ -3729,7 +3651,7 @@ void drawFilamentManMenu() { void drawTemperatureMenu() { checkkey = ID_Menu; - if (SET_MENU_R(temperatureMenu, selrect({236, 2, 28, 12}), MSG_TEMPERATURE, 6 + PREHEAT_COUNT)) { + if (SET_MENU_R(temperatureMenu, selrect({236, 2, 28, 12}), MSG_TEMPERATURE, 4 + PREHEAT_COUNT)) { BACK_ITEM(drawControlMenu); #if HAS_HOTEND hotendTargetItem = EDIT_ITEM(ICON_HotendTemp, MSG_UBL_SET_TEMP_HOTEND, onDrawHotendTemp, setHotendTemp, &thermalManager.temp_hotend[0].target); @@ -3744,14 +3666,6 @@ void drawTemperatureMenu() { #define _ITEM_SETPREHEAT(N) MENU_ITEM(ICON_SetPreheat##N, MSG_PREHEAT_## N ##_SETTINGS, onDrawSubMenu, drawPreheat## N ##Menu); REPEAT_1(PREHEAT_COUNT, _ITEM_SETPREHEAT) #endif - #if ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) - MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID " Settings", onDrawSubMenu, drawHotendPIDMenu); - #elif ENABLED(MPCTEMP) && ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_MPCNozzle, "MPC Settings", onDrawSubMenu, drawHotendMPCMenu); - #endif - #if ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU) - MENU_ITEM_F(ICON_PIDBed, STR_BED_PID " Settings", onDrawSubMenu, drawBedPIDMenu); - #endif } updateMenu(temperatureMenu); } @@ -3929,7 +3843,7 @@ void drawMaxAccelMenu() { // Nozzle and Bed PID/MPC //============================================================================= -#if ENABLED(MPCTEMP) && ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) +#if ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) #if ENABLED(MPC_EDIT_MENU) void setHeaterPower() { setPFloatOnClick(1, 200, 1); } @@ -3947,7 +3861,7 @@ void drawMaxAccelMenu() { checkkey = ID_Menu; if (SET_MENU_F(hotendMPCMenu, "MPC Settings", 7)) { MPC_t &mpc = thermalManager.temp_hotend[0].mpc; - BACK_ITEM(drawTemperatureMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if ENABLED(MPC_AUTOTUNE_MENU) MENU_ITEM(ICON_MPCNozzle, MSG_MPC_AUTOTUNE, onDrawMenuItem, []{ thermalManager.MPC_autotune(active_extruder, Temperature::MPCTuningType::AUTO); }); #endif @@ -3964,7 +3878,7 @@ void drawMaxAccelMenu() { updateMenu(hotendMPCMenu); } -#endif // MPCTEMP && MPC_EDIT_MENU || MPC_AUTOTUNE_MENU +#endif // MPC_EDIT_MENU || MPC_AUTOTUNE_MENU #if HAS_PID_HEATING @@ -4016,7 +3930,7 @@ void drawMaxAccelMenu() { void drawHotendPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(hotendPIDMenu, STR_HOTEND_PID " Settings", 8)) { - BACK_ITEM(drawTemperatureMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if ENABLED(PID_AUTOTUNE_MENU) MENU_ITEM_F(ICON_PIDNozzle, STR_HOTEND_PID, onDrawMenuItem, hotendPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setHotendPIDT, &hmiData.hotendPIDT); @@ -4046,9 +3960,9 @@ void drawMaxAccelMenu() { void drawBedPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(bedPIDMenu, STR_BED_PID " Settings", 8)) { - BACK_ITEM(drawTemperatureMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if ENABLED(PID_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_PIDBed, STR_BED_PID, onDrawMenuItem, bedPID); + MENU_ITEM_F(ICON_PIDBed, STR_BED_PID, onDrawMenuItem,bedPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setBedPIDT, &hmiData.bedPIDT); EDIT_ITEM(ICON_PIDCycles, MSG_PID_CYCLE, onDrawPIntMenu, setPIDCycles, &hmiData.pidCycles); #endif @@ -4076,9 +3990,9 @@ void drawMaxAccelMenu() { void drawChamberPIDMenu() { checkkey = ID_Menu; if (SET_MENU_F(chamberPIDMenu, STR_CHAMBER_PID " Settings", 8)) { - BACK_ITEM(drawTemperatureMenu); + BACK_ITEM(drawAdvancedSettingsMenu); #if ENABLED(PID_AUTOTUNE_MENU) - MENU_ITEM_F(ICON_PIDChamber, STR_CHAMBER_PID, onDrawMenuItem, chamberPID); + MENU_ITEM_F(ICON_PIDChamber, STR_CHAMBER_PID, onDrawMenuItem,chamberPID); EDIT_ITEM(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, setChamberPIDT, &hmiData.chamberPIDT); EDIT_ITEM(ICON_PIDCycles, MSG_PID_CYCLE, onDrawPIntMenu, setPIDCycles, &hmiData.pidCycles); #endif @@ -4162,20 +4076,100 @@ void drawMaxAccelMenu() { // Mesh Bed Leveling //============================================================================= +#if HAS_MESH + + void applyMeshFadeHeight() { set_z_fade_height(planner.z_fade_height); } + void setMeshFadeHeight() { setPFloatOnClick(0, 100, 1, applyMeshFadeHeight); } + + void setMeshActive() { + set_bed_leveling_enabled(!planner.leveling_active); + drawCheckboxLine(currentMenu->line(), planner.leveling_active); + dwinUpdateLCD(); + } + + #if ENABLED(PREHEAT_BEFORE_LEVELING) + void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); } + #endif + + #if ENABLED(PROUI_MESH_EDIT) + void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } + void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; } + void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; } + void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } + void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); } + void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); } + void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); } + #endif + +#endif // HAS_MESH + +#if ENABLED(AUTO_BED_LEVELING_UBL) + + void applyUBLSlot() { bedlevel.storage_slot = menuData.value; } + void setUBLSlot() { setIntOnClick(0, settings.calc_num_meshes() - 1, bedlevel.storage_slot, applyUBLSlot); } + void onDrawUBLSlot(MenuItem* menuitem, int8_t line) { + NOLESS(bedlevel.storage_slot, 0); + onDrawIntMenu(menuitem, line, bedlevel.storage_slot); + } + + void applyUBLTiltGrid() { bedLevelTools.tilt_grid = menuData.value; } + void setUBLTiltGrid() { setIntOnClick(1, 3, bedLevelTools.tilt_grid, applyUBLTiltGrid); } + + void ublMeshTilt() { + NOLESS(bedlevel.storage_slot, 0); + if (bedLevelTools.tilt_grid > 1) + gcode.process_subcommands_now(TS(F("G29J"), bedLevelTools.tilt_grid)); + else + gcode.process_subcommands_now(F("G29J")); + LCD_MESSAGE(MSG_UBL_MESH_TILTED); + } + + void ublSmartFillMesh() { + for (uint8_t x = 0; x < GRID_MAX_POINTS_Y; ++x) bedlevel.smart_fill_mesh(); + LCD_MESSAGE(MSG_UBL_MESH_FILLED); + } + + void ublMeshSave() { + NOLESS(bedlevel.storage_slot, 0); + settings.store_mesh(bedlevel.storage_slot); + ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), bedlevel.storage_slot); + DONE_BUZZ(true); + } + + void ublMeshLoad() { + NOLESS(bedlevel.storage_slot, 0); + settings.load_mesh(bedlevel.storage_slot); + } + +#endif // AUTO_BED_LEVELING_UBL + #if HAS_MESH void drawMeshSetMenu() { checkkey = ID_Menu; - if (SET_MENU(meshMenu, MSG_MESH_SETTINGS, 5)) { - BACK_ITEM(drawLevelMenu); + if (SET_MENU(meshMenu, MSG_MESH_LEVELING, 14)) { + BACK_ITEM(drawAdvancedSettingsMenu); #if ENABLED(PREHEAT_BEFORE_LEVELING) EDIT_ITEM(ICON_Temperature, MSG_UBL_SET_TEMP_BED, onDrawPIntMenu, setBedLevT, &hmiData.bedLevT); #endif EDIT_ITEM(ICON_SetZOffset, MSG_Z_FADE_HEIGHT, onDrawPFloatMenu, setMeshFadeHeight, &planner.z_fade_height); EDIT_ITEM(ICON_UBLActive, MSG_ACTIVATE_MESH, onDrawChkbMenu, setMeshActive, &planner.leveling_active); - #if ENABLED(AUTO_BED_LEVELING_UBL) - EDIT_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, setUBLTiltGrid, &bedLevelTools.tilt_grid); + #if HAS_BED_PROBE + MENU_ITEM(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, autoLevel); #endif + #if ENABLED(AUTO_BED_LEVELING_UBL) + EDIT_ITEM(ICON_UBLSlot, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, setUBLSlot, &bedlevel.storage_slot); + MENU_ITEM(ICON_UBLMeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, ublMeshSave); + MENU_ITEM(ICON_UBLMeshLoad, MSG_UBL_LOAD_MESH, onDrawMenuItem, ublMeshLoad); + EDIT_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, setUBLTiltGrid, &bedLevelTools.tilt_grid); + MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt); + MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh); + #endif + #if ENABLED(PROUI_MESH_EDIT) + MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh); + MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu); + #endif + MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer); } updateMenu(meshMenu); } @@ -4187,7 +4181,7 @@ void drawMaxAccelMenu() { checkkey = ID_Menu; if (SET_MENU(editMeshMenu, MSG_EDIT_MESH, 4)) { bedLevelTools.mesh_x = bedLevelTools.mesh_y = 0; - BACK_ITEM(drawLevelMenu); + BACK_ITEM(drawMeshSetMenu); EDIT_ITEM(ICON_MeshEditX, MSG_MESH_X, onDrawPInt8Menu, setEditMeshX, &bedLevelTools.mesh_x); EDIT_ITEM(ICON_MeshEditY, MSG_MESH_Y, onDrawPInt8Menu, setEditMeshY, &bedLevelTools.mesh_y); editZValueItem = EDIT_ITEM(ICON_MeshEditZ, MSG_MESH_EDIT_Z, onDrawPFloat2Menu, setEditZValue, &bedlevel.z_values[bedLevelTools.mesh_x][bedLevelTools.mesh_y]); diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h index fcc626646f..7d264b8b12 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.h +++ b/Marlin/src/lcd/e3v2/proui/dwin.h @@ -229,7 +229,6 @@ void disableMotors(); void autoLevel(); void autoHome(); #if HAS_PREHEAT -void drawPreheatHotendMenu(); #define _DOPREHEAT(N) void DoPreheat##N(); REPEAT_1(PREHEAT_COUNT, _DOPREHEAT) #endif @@ -334,7 +333,6 @@ void dwinRebootScreen(); // Menu drawing functions void drawPrintFileMenu(); void drawControlMenu(); -void drawLevelMenu(); void drawAdvancedSettingsMenu(); void drawPrepareMenu(); void drawMoveMenu(); diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h index d475de1933..27825b0869 100644 --- a/Marlin/src/lcd/e3v2/proui/dwinui.h +++ b/Marlin/src/lcd/e3v2/proui/dwinui.h @@ -72,6 +72,7 @@ #define ICON_HSMode ICON_MaxAccZ #define ICON_InputShaping ICON_MaxAccelerated #define ICON_JDmm ICON_MaxJerk +#define ICON_Level ICON_Mesh #define ICON_Lock ICON_Checkbox #define ICON_ManualMesh ICON_Mesh #define ICON_MaxPosX ICON_MoveX diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 5280d6f0a1..89f1a4ab2a 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -162,6 +162,7 @@ namespace LanguageNarrow_cz { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Pokračovat v síťi"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Síťové rovnání"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-bodové rovnání"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Mřížkové rovnání"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Srovnat podložku"); @@ -422,7 +423,6 @@ namespace LanguageNarrow_cz { LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilineární rovnání"); LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Mřížkové rovnání"); - LSTR MSG_MESH_SETTINGS = _UxGT("Nastavení sítě"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statistika"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info o desce"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 945a9230e7..6885da5ca6 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -213,6 +213,7 @@ namespace LanguageNarrow_de { LSTR MSG_G26_CANCELED = _UxGT("G26 abgebrochen"); LSTR MSG_G26_LEAVING = _UxGT("G26 verlassen"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Netzerst. forts."); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Netz-Nivellierung"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Punkt-Nivell."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Gitternetz-Nivell."); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Netz nivellieren"); @@ -574,7 +575,6 @@ namespace LanguageNarrow_de { LSTR MSG_UBL_LEVELING = _UxGT("Einheit. Bettnivell."); LSTR MSG_MESH_LEVELING = _UxGT("Netz-Nivellierung"); LSTR MSG_MESH_DONE = _UxGT("Nivellierung fertig"); - LSTR MSG_MESH_SETTINGS = _UxGT("Netzeinstellungen"); LSTR MSG_INFO_STATS_MENU = _UxGT("Drucker-Statistik"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Board-Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistoren"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 32cd633ccc..1ecf65a57f 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -241,6 +241,7 @@ namespace LanguageNarrow_en { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continue Bed Mesh"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Point Leveling"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Grid Mesh Leveling"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Level Mesh"); @@ -641,11 +642,11 @@ namespace LanguageNarrow_en { LSTR MSG_CHAMBER_COOLING = _UxGT("Chamber Cooling..."); LSTR MSG_LASER_COOLING = _UxGT("Laser Cooling..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Delta Calibration"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Calibration in progress"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Calibrate X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Calibrate Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Calibrate Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Calibrate Center"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Calibration in progress"); LSTR MSG_DELTA_SETTINGS = _UxGT("Delta Settings"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Auto Calibration"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Diag Rod"); @@ -659,9 +660,8 @@ namespace LanguageNarrow_en { LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_MESH_DONE = _UxGT("Mesh probing done"); - LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Settings"); - LSTR MSG_RESET_STATS = _UxGT("Reset Print Stats?"); LSTR MSG_INFO_STATS_MENU = _UxGT("Printer Stats"); + LSTR MSG_RESET_STATS = _UxGT("Reset Print Stats?"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Board Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistors"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Extruders"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 48c3933792..5bee09b242 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -160,6 +160,7 @@ namespace LanguageNarrow_es { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("Dejando G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Contin. Mallado cama"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelando Mallado"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelando 3Puntos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niv. Mall. cuadri"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivel de Mallado"); @@ -432,7 +433,6 @@ namespace LanguageNarrow_es { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelando Bilineal"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelando UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelando en Mallado"); - LSTR MSG_MESH_SETTINGS = _UxGT("Ajustes en Mallado"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estadísticas Imp."); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. Controlador"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index a3378294ab..1c2cf8fb86 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -104,6 +104,7 @@ namespace LanguageNarrow_eu { LSTR MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Lauki-sare berdinketa"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Sarea berdindu"); @@ -261,7 +262,6 @@ namespace LanguageNarrow_eu { LSTR MSG_BILINEAR_LEVELING = _UxGT("Berdinketa bilinearra"); LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); LSTR MSG_MESH_LEVELING = _UxGT("Sare berdinketa"); - LSTR MSG_MESH_SETTINGS = _UxGT("Sarearen ezarpenak"); LSTR MSG_INFO_STATS_MENU = _UxGT("Inprima. estatis."); LSTR MSG_INFO_BOARD_MENU = _UxGT("Txartelaren Info."); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistoreak"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 70ae78e7c8..09e7f94917 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -164,6 +164,7 @@ namespace LanguageNarrow_fr { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Niveau à 3 points"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Effectuer mesures"); @@ -463,7 +464,6 @@ namespace LanguageNarrow_fr { LSTR MSG_UBL_LEVELING = _UxGT("Niveau lit unifié"); LSTR MSG_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_MESH_DONE = _UxGT("Niveau terminé"); - LSTR MSG_MESH_SETTINGS = _UxGT("Réglages de maillage"); LSTR MSG_INFO_STATS_MENU = _UxGT("Stats. imprimante"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Infos carte"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistances"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index 23b5d4af38..dc31af4fcb 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -164,6 +164,7 @@ namespace LanguageNarrow_fr_na { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Verifier grille"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Niveau a 3 points"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Effectuer mesures"); @@ -466,7 +467,6 @@ namespace LanguageNarrow_fr_na { LSTR MSG_UBL_LEVELING = _UxGT("Niveau lit unifie"); LSTR MSG_MESH_LEVELING = _UxGT("Niveau par grille"); LSTR MSG_MESH_DONE = _UxGT("Niveau termine"); - LSTR MSG_MESH_SETTINGS = _UxGT("Reglages de maillage"); LSTR MSG_INFO_STATS_MENU = _UxGT("Stats. imprimante"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Infos carte"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Thermistances"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 627d6085bf..ebcf384c5c 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -157,6 +157,7 @@ namespace LanguageNarrow_gl { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("Saíndo de G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuar Malla"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelación Malla"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelación 3Puntos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Nivelación Grid"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivelar Malla"); @@ -447,7 +448,6 @@ namespace LanguageNarrow_gl { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelación Bilineal"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelación UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelación en Malla"); - LSTR MSG_MESH_SETTINGS = _UxGT("Configuración Malla"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estatísticas"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Placa nai"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 89b4266591..9153df7186 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -188,6 +188,7 @@ namespace LanguageNarrow_hu { LSTR MSG_G26_CANCELED = _UxGT("G26 Törölve"); LSTR MSG_G26_LEAVING = _UxGT("Kilépö G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Ágy háló folyt."); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Háló szintezés"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Pontos szintezés"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Rács szintezés"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Háló szint"); @@ -504,7 +505,6 @@ namespace LanguageNarrow_hu { LSTR MSG_UBL_LEVELING = _UxGT("Egységes ágy szintezés"); LSTR MSG_MESH_LEVELING = _UxGT("Háló szintezés"); LSTR MSG_MESH_DONE = _UxGT("Háló szintezés kész"); - LSTR MSG_MESH_SETTINGS = _UxGT("Hálós beállítások"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statisztikák"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Alaplap infó"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termisztorok"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index bf5d7720bd..7a4f17d49b 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -233,8 +233,9 @@ namespace LanguageNarrow_it { LSTR MSG_G26_LEAVING = _UxGT("Uscita da G26"); LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valida mesh pers."); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continua mesh"); - LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Livella 3 Punti"); - LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Livel. griglia mesh"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Livell. mesh"); + LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Livell. 3 Punti"); + LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Livell. griglia mesh"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Livella mesh"); LSTR MSG_UBL_SIDE_POINTS = _UxGT("Punti laterali"); LSTR MSG_UBL_MAP_TYPE = _UxGT("Tipo di mappa"); @@ -619,11 +620,11 @@ namespace LanguageNarrow_it { LSTR MSG_CHAMBER_COOLING = _UxGT("Raffr. camera..."); LSTR MSG_LASER_COOLING = _UxGT("Raffr. laser..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Calibraz. Delta"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Calibrazione delta in corso"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Calibra X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Calibra Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Calibra Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Calibra centro"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Calibrazione delta in corso"); LSTR MSG_DELTA_SETTINGS = _UxGT("Impostaz. delta"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Auto calibrazione"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Barra diagonale"); @@ -637,9 +638,8 @@ namespace LanguageNarrow_it { LSTR MSG_UBL_LEVELING = _UxGT("Livel.piatto unific."); LSTR MSG_MESH_LEVELING = _UxGT("Livel. mesh"); LSTR MSG_MESH_DONE = _UxGT("Sond.mesh eseguito"); - LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Impostazioni"); - LSTR MSG_RESET_STATS = _UxGT("Reset stat.stampa?"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statistiche"); + LSTR MSG_RESET_STATS = _UxGT("Reset stat.stampa?"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. scheda"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistori"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Estrusori"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index b771625700..c96da22b60 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -170,6 +170,7 @@ namespace LanguageNarrow_pl { LSTR MSG_G26_CANCELED = _UxGT("G26 Przewane"); LSTR MSG_G26_LEAVING = _UxGT("Opuszczanie G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Kontynuuj tworzenie siatki"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Poziomowanie siatką"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Poziomowaie 3-punktowe"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Poziomowaie według siatki"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Poziomuj siatkę"); @@ -401,7 +402,6 @@ namespace LanguageNarrow_pl { LSTR MSG_LINEAR_LEVELING = _UxGT("Poziomowanie liniowe"); LSTR MSG_BILINEAR_LEVELING = _UxGT("Poziomowanie biliniowe"); LSTR MSG_MESH_LEVELING = _UxGT("Poziomowanie siatką"); - LSTR MSG_MESH_SETTINGS = _UxGT("Siatki Ustawienia"); LSTR MSG_INFO_STATS_MENU = _UxGT("Statystyki"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info płyty"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 09756be8a1..17c6ada026 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -143,6 +143,7 @@ namespace LanguageNarrow_pt_br { LSTR MSG_G26_CANCELED = _UxGT("G26 Cancelado"); LSTR MSG_G26_LEAVING = _UxGT("G26 Saindo"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continuar Malha"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nivelação da Malha"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Nivelação 3 pontos"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Nivelação Grid"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivelar Malha"); @@ -375,7 +376,6 @@ namespace LanguageNarrow_pt_br { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelamento Bilinear"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelamento UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelamento da Malha"); - LSTR MSG_MESH_SETTINGS = _UxGT("Malha Configuração"); LSTR MSG_INFO_STATS_MENU = _UxGT("Estatísticas"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. da Placa"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistores"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index c086647923..81f44fe65a 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -156,6 +156,7 @@ namespace LanguageNarrow_ro { LSTR MSG_G26_CANCELED = _UxGT("G26 Canceled"); LSTR MSG_G26_LEAVING = _UxGT("Leaving G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Continue Bed Mesh"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Leveling"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Point Leveling"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Grid Mesh Leveling"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Level Mesh"); @@ -454,7 +455,6 @@ namespace LanguageNarrow_ro { LSTR MSG_BILINEAR_LEVELING = _UxGT("Nivelare Bilineara"); LSTR MSG_UBL_LEVELING = _UxGT("Nivelarea Patului Unificata"); LSTR MSG_MESH_LEVELING = _UxGT("Nivelare Mesh"); - LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Setari"); LSTR MSG_INFO_STATS_MENU = _UxGT("Status Imprimanta"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Informatii Placa"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistoare"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 3ef240cb57..851b4ffd0d 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -191,6 +191,7 @@ namespace LanguageNarrow_ru { LSTR MSG_G26_CANCELED = _UxGT("G26 завершена"); LSTR MSG_G26_LEAVING = _UxGT("Выйти из G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Продолжить сетку"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Выравнивание сетки"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-точечное выравн."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Выравнивание сеткой"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Выровнять сетку"); @@ -498,7 +499,6 @@ namespace LanguageNarrow_ru { LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Калибровать Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Калибровать Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Калибровать центр"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); LSTR MSG_DELTA_SETTINGS = _UxGT("Настройки дельты"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Автокалибр. дельты"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Стержень диаг."); @@ -512,8 +512,7 @@ namespace LanguageNarrow_ru { LSTR MSG_UBL_LEVELING = _UxGT("Выравнивание UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Выравнивание сеткой"); LSTR MSG_MESH_DONE = _UxGT("Зондиров. выполнено"); - LSTR MSG_MESH_SETTINGS = _UxGT("Сетка Настройки"); - LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); + LSTR MSG_INFO_STATS_MENU = _UxGT("Статистика принтера"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Данные платы"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Термисторы"); @@ -776,6 +775,8 @@ namespace LanguageNarrow_ru { LSTR MSG_ERR_TEMP_MALFUNCTION = _UxGT("СБОЙ ТЕМПЕРАТУРЫ"); LSTR MSG_PLEASE_WAIT = _UxGT("Ожидайте..."); LSTR MSG_PREHEATING = _UxGT("Нагреваю..."); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); + LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); LSTR MSG_FAN_SPEED_FAULT = _UxGT("Сбой скорости кулера"); LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 87923b377e..dd64c29f25 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -229,6 +229,7 @@ namespace LanguageNarrow_sk { LSTR MSG_G26_CANCELED = _UxGT("G26 zrušený"); LSTR MSG_G26_LEAVING = _UxGT("Opúšťam G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Pokračovať v sieti"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Sieťové rovnanie"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-bodové rovnanie"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Mriežkové rovnanie"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Vyrovnať podložku"); @@ -616,9 +617,8 @@ namespace LanguageNarrow_sk { LSTR MSG_UBL_LEVELING = _UxGT("UBL rovnanie"); LSTR MSG_MESH_LEVELING = _UxGT("Mriežkové rovnanie"); LSTR MSG_MESH_DONE = _UxGT("Mriežka dokončená"); - LSTR MSG_MESH_SETTINGS = _UxGT("Mriežka nastavenia"); - LSTR MSG_RESET_STATS = _UxGT("Vynulovať štatis.?"); LSTR MSG_INFO_STATS_MENU = _UxGT("Štatistika"); + LSTR MSG_RESET_STATS = _UxGT("Vynulovať štatis.?"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Info. o doske"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistory"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Extrudéry"); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index cf5668e33a..4023d13521 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -179,6 +179,7 @@ namespace LanguageNarrow_sv { LSTR MSG_G26_CANCELED = _UxGT("G26 Avbruten"); LSTR MSG_G26_LEAVING = _UxGT("Nivellera G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Fortsätt Bädd Nät"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Nät Nivellering"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Punkts Nivellering"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Rutnät Nivellering"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Nivellera Nät"); @@ -488,7 +489,6 @@ namespace LanguageNarrow_sv { LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilinjär Nivellering"); LSTR MSG_UBL_LEVELING = _UxGT("Enhetlig Bädd Nivellering (UBL)"); LSTR MSG_MESH_LEVELING = _UxGT("Nät Nivellering"); - LSTR MSG_MESH_SETTINGS = _UxGT("Nät Inställningar"); LSTR MSG_INFO_STATS_MENU = _UxGT("Skrivar Stats"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Kort Info"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistor"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index e996ba107c..1a335bac3a 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -232,6 +232,7 @@ namespace LanguageNarrow_tr { LSTR MSG_G26_CANCELED = _UxGT("G26 İptal edildi"); LSTR MSG_G26_LEAVING = _UxGT("Çıkış G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Tabla Mesh Devam et"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Mesh Seviyeleme"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-Nokta Seviyeleme"); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Kafes Mesh Seviyeleme"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Mesh Seviyesi"); @@ -619,11 +620,11 @@ namespace LanguageNarrow_tr { LSTR MSG_CHAMBER_COOLING = _UxGT("Kabin Soğuyor..."); LSTR MSG_LASER_COOLING = _UxGT("Lazer Soğuyor..."); LSTR MSG_DELTA_CALIBRATE = _UxGT("Delta Kalibrasyonu"); + LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Kalibrasyonu sürüyor"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Ayarla X"); LSTR MSG_DELTA_CALIBRATE_Y = _UxGT("Ayarla Y"); LSTR MSG_DELTA_CALIBRATE_Z = _UxGT("Ayarla Z"); LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Ayarla Merkez"); - LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Kalibrasyonu sürüyor"); LSTR MSG_DELTA_SETTINGS = _UxGT("Delta Ayarları"); LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Oto Kalibrasyon"); LSTR MSG_DELTA_DIAG_ROD = _UxGT("Çapral Mil"); @@ -637,9 +638,8 @@ namespace LanguageNarrow_tr { LSTR MSG_UBL_LEVELING = _UxGT("Birleşik Tabla Hiza."); LSTR MSG_MESH_LEVELING = _UxGT("Mesh Seviyeleme"); LSTR MSG_MESH_DONE = _UxGT("Mesh sondalama tamam"); - LSTR MSG_MESH_SETTINGS = _UxGT("Mesh Ayarları"); - LSTR MSG_RESET_STATS = _UxGT("Yazdırma istatistik Sıfırla?"); LSTR MSG_INFO_STATS_MENU = _UxGT("İstatistikler"); + LSTR MSG_RESET_STATS = _UxGT("Yazdırma istatistik Sıfırla?"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Kontrolcü Bilgisi"); LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Termistörler"); LSTR MSG_INFO_EXTRUDERS = _UxGT("Ekstruderler"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index bc9198544c..150739b174 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -190,6 +190,7 @@ namespace LanguageNarrow_uk { LSTR MSG_G26_CANCELED = _UxGT("G26 скасовано"); LSTR MSG_G26_LEAVING = _UxGT("Вийти з G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Продовжити сітку"); + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Вирівнювання сітки"); LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3-точкове вирівн."); LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Вирівнюв. растру"); LSTR MSG_UBL_MESH_LEVEL = _UxGT("Вирівняти сітку"); @@ -523,7 +524,6 @@ namespace LanguageNarrow_uk { LSTR MSG_UBL_LEVELING = _UxGT("UBL"); LSTR MSG_MESH_LEVELING = _UxGT("Вирівнювання сітки"); LSTR MSG_MESH_DONE = _UxGT("Зондування виконано"); - LSTR MSG_MESH_SETTINGS = _UxGT("Сітка Параметри"); LSTR MSG_INFO_STATS_MENU = _UxGT("Статистика принтера"); LSTR MSG_INFO_BOARD_MENU = _UxGT("Про плату"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index be7228e48f..c952416ec8 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -132,6 +132,7 @@ namespace LanguageNarrow_vi { LSTR MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh LSTR MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // Validate custom mesh LSTR MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh + LSTR MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("Đang san lấp 3-điểm"); // 3-Point Leveling LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("Đang san lấp lưới phẳng"); // Grid (planar) Mesh Leveling LSTR MSG_UBL_MESH_LEVEL = _UxGT("Làm bằng lưới"); // Level Mesh @@ -356,7 +357,6 @@ namespace LanguageNarrow_vi { LSTR MSG_BILINEAR_LEVELING = _UxGT("San Lấp Song Tuyến"); // Bilinear Leveling LSTR MSG_UBL_LEVELING = _UxGT("San Lấp Bàn Thống Nhất"); // Unified Bed Leveling LSTR MSG_MESH_LEVELING = _UxGT("Lưới San Lấp"); // Mesh Leveling - LSTR MSG_MESH_SETTINGS = _UxGT("Lưới Cài Đặt"); // Mesh Settings LSTR MSG_INFO_STATS_MENU = _UxGT("Thống Kê Máy In"); // Printer Stats LSTR MSG_INFO_BOARD_MENU = _UxGT("Thông Tin Bo Mạch"); // Board Info LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("Điện Trở Nhiệt"); // Thermistors diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 2e4e416f3b..75d81f2c9a 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -164,6 +164,7 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_G26_CANCELED = _UxGT("G26已取消"); LSTR MSG_G26_LEAVING = _UxGT("离开G26"); LSTR MSG_UBL_CONTINUE_MESH = _UxGT("继续热床网格"); // "Continue Bed Mesh" + LSTR MSG_UBL_MESH_LEVELING = _UxGT("网格调平"); // "Mesh Leveling" LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("三点调平"); // "3-Point Leveling" LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("格子网格调平"); // "Grid Mesh Leveling" LSTR MSG_UBL_MESH_LEVEL = _UxGT("调平网格"); // "Level Mesh" @@ -463,7 +464,6 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_BILINEAR_LEVELING = _UxGT("双线性调平"); // "Bilinear Leveling" LSTR MSG_UBL_LEVELING = _UxGT("统一热床调平(UBL)"); // "Unified Bed Leveling" LSTR MSG_MESH_LEVELING = _UxGT("网格调平"); // "Mesh Leveling" - LSTR MSG_MESH_SETTINGS = _UxGT("网格设置"); // "Mesh Settings" LSTR MSG_INFO_STATS_MENU = _UxGT("打印机统计"); // "Printer Stats" LSTR MSG_INFO_BOARD_MENU = _UxGT("主板信息"); // "Board Info" LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("温度计"); // "Thermistors" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index a701e9ce90..e47704da7e 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -152,6 +152,7 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_G26_CANCELED = _UxGT("G26已取消"); // "G26 Canceled" LSTR MSG_G26_LEAVING = _UxGT("離開 G26"); // "Leaving G26" LSTR MSG_UBL_CONTINUE_MESH = _UxGT("繼續熱床網格"); // "Continue Bed Mesh" + LSTR MSG_UBL_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling" LSTR MSG_UBL_3POINT_MESH_LEVELING = _UxGT("三點調平"); // "3-Point Leveling" LSTR MSG_UBL_GRID_MESH_LEVELING = _UxGT("格子網格調平"); // "Grid Mesh Leveling" LSTR MSG_UBL_MESH_LEVEL = _UxGT("調平網格"); // "Level Mesh" @@ -402,7 +403,6 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_BILINEAR_LEVELING = _UxGT(" 雙線性調平"); // "Bilinear Leveling" LSTR MSG_UBL_LEVELING = _UxGT("統一熱床調平(UBL)"); // "Unified Bed Leveling" LSTR MSG_MESH_LEVELING = _UxGT("網格調平"); // "Mesh Leveling" - LSTR MSG_MESH_SETTINGS = _UxGT("網格設置"); // "Mesh Settings" LSTR MSG_INFO_STATS_MENU = _UxGT("印表機統計"); // "Printer Stats" LSTR MSG_INFO_BOARD_MENU = _UxGT("主板訊息"); // "Board Info" LSTR MSG_INFO_THERMISTOR_MENU = _UxGT("溫度計"); // "Thermistors" diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 5d8abaf197..701d2ae97a 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -550,7 +550,7 @@ void _menu_ubl_tools() { SUBMENU(MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh); #endif SUBMENU(MSG_EDIT_MESH, _lcd_ubl_edit_mesh); - SUBMENU(MSG_MESH_LEVELING, _lcd_ubl_mesh_leveling); + SUBMENU(MSG_UBL_MESH_LEVELING, _lcd_ubl_mesh_leveling); END_MENU(); } From e05ddab1fbb8c3d841a2f5568582676fcda5976a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 14:44:02 -0500 Subject: [PATCH 04/19] conditional --- Marlin/src/inc/Conditionals_LCD.h | 1 + Marlin/src/lcd/e3v2/common/encoder.cpp | 4 ++-- Marlin/src/lcd/e3v2/proui/dwin.cpp | 10 +++++----- Marlin/src/lcd/e3v2/proui/dwin_defines.h | 1 - Marlin/src/lcd/marlinui.cpp | 4 ++-- Marlin/src/lcd/marlinui.h | 4 ++-- Marlin/src/module/settings.cpp | 20 ++++++++++---------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index efda2d493e..53d37e0f52 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -1065,6 +1065,7 @@ #define DO_LIST_BIN_FILES 1 #define LCD_BRIGHTNESS_DEFAULT 127 #define STATUS_DO_CLEAR_EMPTY + #define REVERSIBLE_ENCODER // Menu > Control > Advanced Settings #endif // Serial Controllers require LCD_SERIAL_PORT diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp index fb9bd036fb..33788107c6 100644 --- a/Marlin/src/lcd/e3v2/common/encoder.cpp +++ b/Marlin/src/lcd/e3v2/common/encoder.cpp @@ -44,7 +44,7 @@ EncoderRate encoderRate; -#if ENABLED(PROUI_ITEM_ENC) +#if ENABLED(REVERSIBLE_ENCODER) EncoderState direction1; EncoderState direction2; #endif @@ -81,7 +81,7 @@ EncoderState encoderReceiveAnalyze() { } const int8_t delta = ui.get_encoder_delta(); - temp_diff += TERN0(PROUI_ITEM_ENC, ui.rev_rate) ? -delta : delta; + temp_diff += TERN0(REVERSIBLE_ENCODER, ui.reverse_encoder) ? -delta : delta; const int8_t abs_diff = ABS(temp_diff); if (abs_diff >= ENCODER_PULSES_PER_STEP) { diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index ac8fa24d71..bd747b9f0c 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -1881,7 +1881,7 @@ void dwinSetDataDefaults() { applyLEDColor(); #endif TERN_(HAS_GCODE_PREVIEW, hmiData.enablePreview = true); - TERN_(PROUI_ITEM_ENC, ui.rev_rate = false); + TERN_(REVERSIBLE_ENCODER, ui.reverse_encoder = false); } void dwinCopySettingsTo(char * const buff) { @@ -2667,8 +2667,8 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu void setAddRecover() { setPFloatOnClick(-5, 5, UNITFDIGITS); } #endif -#if ENABLED(PROUI_ITEM_ENC) - void setRevRate() { toggleCheckboxLine(ui.rev_rate); } +#if ENABLED(REVERSIBLE_ENCODER) + void setRevRate() { toggleCheckboxLine(ui.reverse_encoder); } #endif // Special Menuitem Drawing functions ================================================= @@ -3235,8 +3235,8 @@ void drawAdvancedSettingsMenu() { #if HAS_CUSTOM_COLORS MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); #endif - #if ENABLED(PROUI_ITEM_ENC) - EDIT_ITEM_F(ICON_Motion, "Reverse Encoder", onDrawChkbMenu, setRevRate, &ui.rev_rate); + #if ENABLED(REVERSIBLE_ENCODER) + EDIT_ITEM_F(ICON_Motion, MSG_REVERSE_ENCODER, onDrawChkbMenu, setRevRate, &ui.reverse_encoder); #endif } ui.reset_status(true); diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h index be8efa4e19..b72bdf1d23 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h +++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h @@ -134,4 +134,3 @@ #define HAS_ESDIAG 1 // View End-stop/Runout switch continuity #define HAS_LOCKSCREEN 1 // Simple lockscreen #define HAS_SD_EXTENDER 1 // Enable to support SD card extender cables -#define PROUI_ITEM_ENC // Enable option to reverse encoder direction | Control > Advanced Settings diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index c9a876dceb..617e576bb5 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -66,8 +66,8 @@ MarlinUI ui; constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; -#if ENABLED(PROUI_ITEM_ENC) - bool MarlinUI::rev_rate = false; +#if ENABLED(REVERSIBLE_ENCODER) + bool MarlinUI::reverse_encoder = false; #endif #if HAS_STATUS_MESSAGE diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index bd49037cf6..40b1c348e0 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -203,8 +203,8 @@ public: TERN_(HAS_MARLINUI_MENU, currentScreen = status_screen); } - #if ENABLED(PROUI_ITEM_ENC) - static bool rev_rate; + #if ENABLED(REVERSIBLE_ENCODER) + static bool reverse_encoder; #endif static void init(); diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index d7cb67c9e3..3d4bd4b4e1 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -589,10 +589,10 @@ typedef struct SettingsDataStruct { #endif // - // Encoder Rate + // Encoder Direction // - #if ENABLED(PROUI_ITEM_ENC) - bool rev_rate; + #if ENABLED(REVERSIBLE_ENCODER) + bool reverse_encoder; // ProUI #endif // @@ -1694,8 +1694,8 @@ void MarlinSettings::postprocess() { // // Encoder Rate // - #if ENABLED(PROUI_ITEM_ENC) - EEPROM_WRITE(ui.rev_rate); + #if ENABLED(REVERSIBLE_ENCODER) + EEPROM_WRITE(ui.reverse_encoder); #endif // @@ -2787,9 +2787,9 @@ void MarlinSettings::postprocess() { // // Encoder Rate // - #if ENABLED(PROUI_ITEM_ENC) - _FIELD_TEST(rev_rate); - EEPROM_READ(ui.rev_rate); + #if ENABLED(REVERSIBLE_ENCODER) + _FIELD_TEST(reverse_encoder); + EEPROM_READ(ui.reverse_encoder); #endif // @@ -3278,8 +3278,8 @@ void MarlinSettings::reset() { // // Encoder Rate // - #if ENABLED(PROUI_ITEM_ENC) - ui.rev_rate = false; + #if ENABLED(REVERSIBLE_ENCODER) + ui.reverse_encoder = false; #endif // From ecd4b61c9224f529bbbc40b82a5f79918d8b222f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 14:44:30 -0500 Subject: [PATCH 05/19] some language cleanup --- Marlin/src/lcd/language/language_de.h | 8 ++---- Marlin/src/lcd/language/language_en.h | 31 ++++++++++---------- Marlin/src/lcd/language/language_it.h | 31 ++++++++++---------- Marlin/src/lcd/language/language_ru.h | 41 +++++++++++++-------------- Marlin/src/lcd/language/language_sk.h | 6 ++-- Marlin/src/lcd/language/language_tr.h | 6 ++-- Marlin/src/lcd/language/language_uk.h | 14 ++++----- 7 files changed, 64 insertions(+), 73 deletions(-) diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index adbe637483..dfd3675b2f 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -603,7 +603,7 @@ namespace LanguageNarrow_de { LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Drucker ist gesperrt,"); LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scrollen zum Entsper."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten"); + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten"); // ProUI LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte vorheizen"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Drucke"); LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Komplette"); @@ -625,13 +625,11 @@ namespace LanguageNarrow_de { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("FORTS. OPTIONEN:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Mehr entladen"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Druck weiter"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?"); + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Düse: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout-Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout-Weg mm"); LSTR MSG_RUNOUT_ENABLE = _UxGT("Runout aktivieren"); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Runout aktiv"); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert Extruder"); LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); LSTR MSG_FANCHECK = _UxGT("Lüftergeschw. prüfen"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing gescheitert"); @@ -765,7 +763,7 @@ namespace LanguageWide_de { using namespace LanguageNarrow_de; #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2 LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Kein Medium eingelegt."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten."); + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten."); // ProUI LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte das Hotend vorheizen."); LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Druckzähler zurücksetzen"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Gesamte Drucke"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index e8516c9029..1bfa5da79d 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -679,19 +679,20 @@ namespace LanguageNarrow_en { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Light Brightness"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("INCORRECT PRINTER"); - LSTR MSG_COLORS_GET = _UxGT("Get Color"); - LSTR MSG_COLORS_SELECT = _UxGT("Select Colors"); - LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied"); - LSTR MSG_COLORS_RED = _UxGT("Red"); - LSTR MSG_COLORS_GREEN = _UxGT("Green"); - LSTR MSG_COLORS_BLUE = _UxGT("Blue"); - LSTR MSG_COLORS_WHITE = _UxGT("White"); - LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); - LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound"); - LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait until reboot."); + LSTR MSG_COLORS_GET = _UxGT("Get Color"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Select Colors"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Red"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Green"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Blue"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("White"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait for reboot."); // ProUI + LSTR MSG_REVERSE_ENCODER = _UxGT("Reverse Encoder"); // ProUI LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); @@ -715,13 +716,11 @@ namespace LanguageNarrow_en { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("RESUME OPTIONS:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Purge more"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Continue"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Purge or Continue?"); + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Purge or Continue?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozzle: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout Dist mm"); LSTR MSG_RUNOUT_ENABLE = _UxGT("Enable Runout"); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Runout Active"); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert Extruder"); LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); LSTR MSG_FANCHECK = _UxGT("Fan Tacho Check"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing Failed"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 7d6c7bbd01..980422b51f 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -657,19 +657,19 @@ namespace LanguageNarrow_it { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Luminosità Luci"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("STAMPANTE ERRATA"); - LSTR MSG_COLORS_GET = _UxGT("Ottieni colori"); - LSTR MSG_COLORS_SELECT = _UxGT("Selez.colori"); - LSTR MSG_COLORS_APPLIED = _UxGT("Colori applicati"); - LSTR MSG_COLORS_RED = _UxGT("Rosso"); - LSTR MSG_COLORS_GREEN = _UxGT("Verde"); - LSTR MSG_COLORS_BLUE = _UxGT("Blu"); - LSTR MSG_COLORS_WHITE = _UxGT("Bianco"); - LSTR MSG_UI_LANGUAGE = _UxGT("Lingua UI"); - LSTR MSG_SOUND_ENABLE = _UxGT("Abilita suono"); - LSTR MSG_LOCKSCREEN = _UxGT("Blocca schermo"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Stamp. bloccata,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll x sbloccare."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Attendere fino al riavvio."); + LSTR MSG_COLORS_GET = _UxGT("Ottieni colori"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Selez.colori"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Colori applicati"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Rosso"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Verde"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Blu"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Bianco"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("Lingua UI"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Abilita suono"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Blocca schermo"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Stamp. bloccata,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll x sbloccare."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Attendere fino al riavvio."); // ProUI LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No supporto"); LSTR MSG_PLEASE_PREHEAT = _UxGT("Prerisc. ugello."); @@ -693,13 +693,12 @@ namespace LanguageNarrow_it { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("OPZIONI RIPRESA:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Spurga di più"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Riprendi stampa"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Spurga o continua?"); + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Spurga o continua?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Ugello: "); + LSTR MSG_RUNOUT_SENSOR = _UxGT("Sens.filo termin."); // Max 17 characters LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Dist mm filo term."); LSTR MSG_RUNOUT_ENABLE = _UxGT("Abil.filo termin."); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Filo termin. attivo"); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Inverti estrusore"); LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore"); LSTR MSG_FANCHECK = _UxGT("Verif.tacho vent."); // Max 17 characters LSTR MSG_KILL_HOMING_FAILED = _UxGT("Home fallito"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 161c3b1b96..6882aff27f 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -775,30 +775,29 @@ namespace LanguageNarrow_ru { LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); LSTR MSG_FAN_SPEED_FAULT = _UxGT("Сбой скорости кулера"); - LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); - LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); - LSTR MSG_COLORS_APPLIED = _UxGT("Цвета применены"); - LSTR MSG_COLORS_RED = _UxGT("Красный"); - LSTR MSG_COLORS_GREEN = _UxGT("Зелёный"); - LSTR MSG_COLORS_BLUE = _UxGT("Синий"); - LSTR MSG_COLORS_WHITE = _UxGT("Белый"); - LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); - LSTR MSG_SOUND_ENABLE = _UxGT("Включить звук"); - LSTR MSG_LOCKSCREEN = _UxGT("Блокировать экран"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Принтер заблокирован,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Крутить для разблокировки."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Ждите перезагрузки."); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Нет носителя."); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрейте сопло."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Сбросить счетчик"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Включить датч.филамента"); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Датч.филам. активен"); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Инвертировать экструдер"); - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера."); + LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Цвета применены"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Красный"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Зелёный"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Синий"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Белый"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Включить звук"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Блокировать экран"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Принтер заблокирован,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Крутить для разблокировки."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Ждите перезагрузки."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Нет носителя."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрейте сопло."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Сбросить счетчик"); // ProUI + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?"); // ProUI + LSTR MSG_RUNOUT_ENABLE = _UxGT("Включить датч.филамента"); // ProUI + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера."); // ProUI LSTR MSG_FANCHECK = _UxGT("Пров.тахометра кулера"); LSTR MSG_MMU2_REMOVE_AND_CLICK = _UxGT("Уберите и кликните..."); LSTR MSG_REHEATDONE = _UxGT("Нагрето"); + LSTR MSG_XATC = _UxGT("Помощник перекоса X"); LSTR MSG_XATC_DONE = _UxGT("Перекос Х настроен!"); LSTR MSG_XATC_UPDATE_Z_OFFSET = _UxGT("Новое смещение Z-зонда "); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index d31bd13dff..70f2b8ec0f 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -669,13 +669,11 @@ namespace LanguageNarrow_sk { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("MOŽNOSTI POKRAČ.:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Vytlačiť viacej"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Obnoviť tlač"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Vytlač. alebo pokrač.?"); + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Vytlač. alebo pokrač.?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Tryska: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Senzor filamentu"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Vzd. mm fil. senz."); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Zapnúť senzor"); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Senz. fil. zapn."); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert. extrudér"); + LSTR MSG_RUNOUT_ENABLE = _UxGT("Zapnúť senzor"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud."); LSTR MSG_FANCHECK = _UxGT("Kontrola rýchl."); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Parkovanie zlyhalo"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 8424170596..92ef081e61 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -693,13 +693,11 @@ namespace LanguageNarrow_tr { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("Seçenekler:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Daha Fazla Temizle"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Baskıyı sürdür"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Temizle veya Devam?"); + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Temizle veya Devam?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozul: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Fil. Sensörü"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Aşınma Farkı mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Fil. Sens. Aç"); - LSTR MSG_RUNOUT_ACTIVE = _UxGT("Fil. Sens. Aktif"); - LSTR MSG_INVERT_EXTRUDER = _UxGT("Ekstruder Ters Çevir"); + LSTR MSG_RUNOUT_ENABLE = _UxGT("Fil. Sens. Aç"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı"); LSTR MSG_FANCHECK = _UxGT("Fan Takosu Kontrolü"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Sıfırlama Başarısız"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 4acf1f9ad3..eb509e18d6 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -539,18 +539,18 @@ namespace LanguageNarrow_uk { LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано"); LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд"); - LSTR MSG_COLORS_GET = _UxGT("Отримати колір"); LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія"); LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж..."); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Друків"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Загалом"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовше"); - LSTR MSG_COLORS_SELECT = _UxGT("Кольори"); - LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос."); - LSTR MSG_COLORS_RED = _UxGT("Червоний"); - LSTR MSG_COLORS_GREEN = _UxGT("Зелений"); - LSTR MSG_COLORS_BLUE = _UxGT("Синій"); - LSTR MSG_COLORS_WHITE = _UxGT("Білий"); + LSTR MSG_COLORS_GET = _UxGT("Отримати колір"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Кольори"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос."); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Червоний"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Зелений"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Синій"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Білий"); // ProUI LSTR MSG_UI_LANGUAGE = _UxGT("Мова"); LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук"); LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран"); From 6992314464ae626867183312f96d3eeca7d549fd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 14:46:20 -0500 Subject: [PATCH 06/19] cleanup --- Marlin/src/lcd/e3v2/common/encoder.cpp | 5 ----- Marlin/src/lcd/e3v2/proui/dwin.cpp | 4 ++-- Marlin/src/module/settings.cpp | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp index 33788107c6..07e8043e22 100644 --- a/Marlin/src/lcd/e3v2/common/encoder.cpp +++ b/Marlin/src/lcd/e3v2/common/encoder.cpp @@ -44,11 +44,6 @@ EncoderRate encoderRate; -#if ENABLED(REVERSIBLE_ENCODER) - EncoderState direction1; - EncoderState direction2; -#endif - // TODO: Replace with ui.quick_feedback void Encoder_tick() { TERN_(HAS_BEEPER, if (ui.sound_on) buzzer.click(10)); diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index bd747b9f0c..0c02a3085e 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -2668,7 +2668,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu #endif #if ENABLED(REVERSIBLE_ENCODER) - void setRevRate() { toggleCheckboxLine(ui.reverse_encoder); } + void toggleReverseEncoder() { toggleCheckboxLine(ui.reverse_encoder); } #endif // Special Menuitem Drawing functions ================================================= @@ -3236,7 +3236,7 @@ void drawAdvancedSettingsMenu() { MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); #endif #if ENABLED(REVERSIBLE_ENCODER) - EDIT_ITEM_F(ICON_Motion, MSG_REVERSE_ENCODER, onDrawChkbMenu, setRevRate, &ui.reverse_encoder); + EDIT_ITEM_F(ICON_Motion, MSG_REVERSE_ENCODER, onDrawChkbMenu, toggleReverseEncoder, &ui.reverse_encoder); #endif } ui.reset_status(true); diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 3d4bd4b4e1..44c386c3f7 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -1692,7 +1692,7 @@ void MarlinSettings::postprocess() { #endif // - // Encoder Rate + // Encoder Reverse // #if ENABLED(REVERSIBLE_ENCODER) EEPROM_WRITE(ui.reverse_encoder); @@ -2785,7 +2785,7 @@ void MarlinSettings::postprocess() { #endif // - // Encoder Rate + // Encoder Reverse // #if ENABLED(REVERSIBLE_ENCODER) _FIELD_TEST(reverse_encoder); @@ -3276,7 +3276,7 @@ void MarlinSettings::reset() { #endif // - // Encoder Rate + // Encoder Reverse // #if ENABLED(REVERSIBLE_ENCODER) ui.reverse_encoder = false; From 8ec8d40632d8106d77bab07171ddb8fa958c2a53 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 16:50:14 -0500 Subject: [PATCH 07/19] menu-item --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 0c02a3085e..5df25e3e28 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3236,7 +3236,7 @@ void drawAdvancedSettingsMenu() { MENU_ITEM(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, drawSelectColorsMenu); #endif #if ENABLED(REVERSIBLE_ENCODER) - EDIT_ITEM_F(ICON_Motion, MSG_REVERSE_ENCODER, onDrawChkbMenu, toggleReverseEncoder, &ui.reverse_encoder); + EDIT_ITEM(ICON_Motion, MSG_REVERSE_ENCODER, onDrawChkbMenu, toggleReverseEncoder, &ui.reverse_encoder); #endif } ui.reset_status(true); From 450a6181d4d6f201097c8d698eed34a97ba93b76 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:09:21 -0500 Subject: [PATCH 08/19] more lang labels --- Marlin/src/lcd/language/language_de.h | 44 +++++++++++++-------------- Marlin/src/lcd/language/language_en.h | 12 ++++---- Marlin/src/lcd/language/language_it.h | 16 +++++----- Marlin/src/lcd/language/language_ru.h | 2 ++ Marlin/src/lcd/language/language_sk.h | 40 ++++++++++++------------ Marlin/src/lcd/language/language_tr.h | 40 ++++++++++++------------ Marlin/src/lcd/language/language_uk.h | 25 ++++++++------- 7 files changed, 92 insertions(+), 87 deletions(-) diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index dfd3675b2f..3055d21ed0 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -590,30 +590,30 @@ namespace LanguageNarrow_de { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Helligkeit"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("Falscher Drucker"); - LSTR MSG_COLORS_GET = _UxGT("Farbe"); - LSTR MSG_COLORS_SELECT = _UxGT("Farben auswählen"); - LSTR MSG_COLORS_APPLIED = _UxGT("Farben verwenden"); - LSTR MSG_COLORS_RED = _UxGT("Rot"); - LSTR MSG_COLORS_GREEN = _UxGT("Grün"); - LSTR MSG_COLORS_BLUE = _UxGT("Blau"); - LSTR MSG_COLORS_WHITE = _UxGT("Weiß"); - LSTR MSG_UI_LANGUAGE = _UxGT("UI Sprache"); - LSTR MSG_SOUND_ENABLE = _UxGT("Ton aktivieren"); - LSTR MSG_LOCKSCREEN = _UxGT("Bildschirm sperren"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Drucker ist gesperrt,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scrollen zum Entsper."); + LSTR MSG_COLORS_GET = _UxGT("Farbe"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Farben auswählen"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Farben verwenden"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Rot"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Grün"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Blau"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Weiß"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("UI Sprache"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Ton aktivieren"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Bildschirm sperren"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Drucker ist gesperrt,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scrollen zum Entsper."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte vorheizen"); // ProUI - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten"); // ProUI - LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte vorheizen"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Drucke"); LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Komplette"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Gesamte"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Längste"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extrud."); - LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp"); LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp"); LSTR MSG_INFO_PSU = _UxGT("Netzteil"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Motorleistung"); LSTR MSG_DAC_PERCENT_N = _UxGT("@ Treiber %"); LSTR MSG_ERROR_TMC = _UxGT("TMC Verbindungsfehler"); @@ -625,12 +625,12 @@ namespace LanguageNarrow_de { LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("FORTS. OPTIONEN:"); LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Mehr entladen"); LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Druck weiter"); - LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?"); // ProUI + LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?"); // ProUI LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Düse: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout-Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout-Weg mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Runout aktivieren"); - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); + LSTR MSG_RUNOUT_ENABLE = _UxGT("Runout aktivieren"); // ProUI + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI LSTR MSG_FANCHECK = _UxGT("Lüftergeschw. prüfen"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing gescheitert"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing gescheitert"); @@ -762,10 +762,10 @@ namespace LanguageNarrow_de { namespace LanguageWide_de { using namespace LanguageNarrow_de; #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2 - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Kein Medium eingelegt."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten."); // ProUI - LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte das Hotend vorheizen."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Druckzähler zurücksetzen"); + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Kein Medium eingelegt."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte das Hotend vorheizen."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Druckzähler zurücksetzen"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Gesamte Drucke"); LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Komplette Drucke"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Gesamte Druckzeit"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 1bfa5da79d..fe0c1f48b3 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -693,18 +693,18 @@ namespace LanguageNarrow_en { LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); // ProUI LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait for reboot."); // ProUI LSTR MSG_REVERSE_ENCODER = _UxGT("Reverse Encoder"); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); // ProUI - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Prints"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Total"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extruded"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completed"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp"); LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp"); LSTR MSG_INFO_PSU = _UxGT("PSU"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Drive Strength"); LSTR MSG_DAC_PERCENT_N = _UxGT("@ Driver %"); LSTR MSG_ERROR_TMC = _UxGT("TMC CONNECTION ERROR"); @@ -720,8 +720,8 @@ namespace LanguageNarrow_en { LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozzle: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout Dist mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Enable Runout"); - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); + LSTR MSG_RUNOUT_ENABLE = _UxGT("Enable Runout"); // ProUI + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI LSTR MSG_FANCHECK = _UxGT("Fan Tacho Check"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing Failed"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing Failed"); @@ -922,7 +922,7 @@ namespace LanguageWide_en { LSTR MSG_END_LOOPS = _UxGT("End Repeat Loops"); LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No media inserted."); LSTR MSG_PLEASE_PREHEAT = _UxGT("Please preheat the hot end."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count"); + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Print Count"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Print Time"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest Job Time"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 980422b51f..ed2c666504 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -670,18 +670,18 @@ namespace LanguageNarrow_it { LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Stamp. bloccata,"); // ProUI LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll x sbloccare."); // ProUI LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Attendere fino al riavvio."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No supporto"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Prerisc. ugello."); // ProUI - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No supporto"); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Prerisc. ugello."); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Stampe"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Durata"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Più lungo"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Estruso"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completate"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Temp min"); LSTR MSG_INFO_MAX_TEMP = _UxGT("Temp max"); LSTR MSG_INFO_PSU = _UxGT("Alimentatore"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Potenza drive"); LSTR MSG_DAC_PERCENT_N = _UxGT("Driver @ %"); LSTR MSG_ERROR_TMC = _UxGT("ERR.CONNESSIONE TMC"); @@ -698,8 +698,8 @@ namespace LanguageNarrow_it { LSTR MSG_RUNOUT_SENSOR = _UxGT("Sens.filo termin."); // Max 17 characters LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Dist mm filo term."); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Abil.filo termin."); - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore"); + LSTR MSG_RUNOUT_ENABLE = _UxGT("Abil.filo termin."); // ProUI + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore"); // ProUI LSTR MSG_FANCHECK = _UxGT("Verif.tacho vent."); // Max 17 characters LSTR MSG_KILL_HOMING_FAILED = _UxGT("Home fallito"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Sondaggio fallito"); @@ -879,9 +879,9 @@ namespace LanguageWide_it { LSTR MSG_MEDIA_MENU = _UxGT("Selez.da supporto"); LSTR MSG_TURN_OFF = _UxGT("Spegni la stampante"); LSTR MSG_END_LOOPS = _UxGT("Termina i cicli di ripetizione"); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nessun supporto inserito."); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Si prega di preriscaldare l'ugello."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Azzera i contatori di stampa"); + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nessun supporto inserito."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Si prega di preriscaldare l'ugello."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Azzera i contatori di stampa"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Contatori di stampa"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Tempo totale"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Lavoro più lungo"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 6882aff27f..e38207c8a8 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -775,6 +775,7 @@ namespace LanguageNarrow_ru { LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку"); LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?"); LSTR MSG_FAN_SPEED_FAULT = _UxGT("Сбой скорости кулера"); + LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); // ProUI LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); // ProUI LSTR MSG_COLORS_APPLIED = _UxGT("Цвета применены"); // ProUI @@ -794,6 +795,7 @@ namespace LanguageNarrow_ru { LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?"); // ProUI LSTR MSG_RUNOUT_ENABLE = _UxGT("Включить датч.филамента"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера."); // ProUI + LSTR MSG_FANCHECK = _UxGT("Пров.тахометра кулера"); LSTR MSG_MMU2_REMOVE_AND_CLICK = _UxGT("Уберите и кликните..."); LSTR MSG_REHEATDONE = _UxGT("Нагрето"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 70f2b8ec0f..31cea49da5 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -633,31 +633,31 @@ namespace LanguageNarrow_sk { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Jas svetla"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("Nesprávna tlačiareň"); - LSTR MSG_COLORS_GET = _UxGT("Zvoliť farbu"); - LSTR MSG_COLORS_SELECT = _UxGT("Zvoliť farby"); - LSTR MSG_COLORS_APPLIED = _UxGT("Farby aplikované"); - LSTR MSG_COLORS_RED = _UxGT("Červená"); - LSTR MSG_COLORS_GREEN = _UxGT("Zelená"); - LSTR MSG_COLORS_BLUE = _UxGT("Modrá"); - LSTR MSG_COLORS_WHITE = _UxGT("Biela"); - LSTR MSG_UI_LANGUAGE = _UxGT("Jazyk rozhrania"); - LSTR MSG_SOUND_ENABLE = _UxGT("Povoliť zvuky"); - LSTR MSG_LOCKSCREEN = _UxGT("Uzamknúť obrazovku"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Tlačiareň je uzamknutá,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("potiahnite pre odomknutie."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Prosím čakajte do reštartu."); + LSTR MSG_COLORS_GET = _UxGT("Zvoliť farbu"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Zvoliť farby"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Farby aplikované"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Červená"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Zelená"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Modrá"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Biela"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("Jazyk rozhrania"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Povoliť zvuky"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Uzamknúť obrazovku"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Tlačiareň je uzamknutá,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("potiahnite pre odomknutie."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Prosím čakajte do reštartu."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Žiadna karta"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte"); // ProUI - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Žiadna karta"); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Tlače"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Čas"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Najdlhšia"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Vytlačené"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Dokončené"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Teplota min"); LSTR MSG_INFO_MAX_TEMP = _UxGT("Teplota max"); LSTR MSG_INFO_PSU = _UxGT("Nap. zdroj"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Budenie motorov"); LSTR MSG_DAC_PERCENT_N = _UxGT("@ Motor %"); LSTR MSG_ERROR_TMC = _UxGT("CHYBA KOMUNIKÁ. TMC"); @@ -674,7 +674,7 @@ namespace LanguageNarrow_sk { LSTR MSG_RUNOUT_SENSOR = _UxGT("Senzor filamentu"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Vzd. mm fil. senz."); LSTR MSG_RUNOUT_ENABLE = _UxGT("Zapnúť senzor"); // ProUI - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud."); + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud."); // ProUI LSTR MSG_FANCHECK = _UxGT("Kontrola rýchl."); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Parkovanie zlyhalo"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Kalibrácia zlyhala"); @@ -810,9 +810,9 @@ namespace LanguageWide_sk { LSTR MSG_MEDIA_MENU = _UxGT("Vytlačiť z karty"); LSTR MSG_TURN_OFF = _UxGT("Vypnite tlačiareň"); LSTR MSG_END_LOOPS = _UxGT("Ukončiť opak. sluč."); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nie je vložená karta."); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte hotend."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Vynulovať počítadlo"); + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nie je vložená karta."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte hotend."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Vynulovať počítadlo"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Počet tlačí"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Celkový čas"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Najdlhšia tlač"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 92ef081e61..af67d89836 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -657,31 +657,31 @@ namespace LanguageNarrow_tr { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Işık Parlaklğı"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("HATALI YAZICI"); - LSTR MSG_COLORS_GET = _UxGT("Renk Al"); - LSTR MSG_COLORS_SELECT = _UxGT("Renkleri Seç"); - LSTR MSG_COLORS_APPLIED = _UxGT("Uygulanan renkler"); - LSTR MSG_COLORS_RED = _UxGT("Kırmızı"); - LSTR MSG_COLORS_GREEN = _UxGT("Yeşil"); - LSTR MSG_COLORS_BLUE = _UxGT("Mavi"); - LSTR MSG_COLORS_WHITE = _UxGT("Beyaz"); - LSTR MSG_UI_LANGUAGE = _UxGT("UI Dili"); - LSTR MSG_SOUND_ENABLE = _UxGT("Sesi etkinleştir"); - LSTR MSG_LOCKSCREEN = _UxGT("Kilit Ekranı"); - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Yazıcı Kilitlendi,"); - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Açmak için kaydırın."); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Y.Başlatma bekleyin."); + LSTR MSG_COLORS_GET = _UxGT("Renk Al"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Renkleri Seç"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Uygulanan renkler"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Kırmızı"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Yeşil"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Mavi"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("Beyaz"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("UI Dili"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Sesi etkinleştir"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Kilit Ekranı"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Yazıcı Kilitlendi,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Açmak için kaydırın."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Y.Başlatma bekleyin."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Medya Yok"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Ön Isıtma Lütfen"); // ProUI - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Medya Yok"); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Ön Isıtma Lütfen"); LSTR MSG_INFO_PRINT_COUNT = _UxGT("Baskı"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Süre"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("En Uzun"); LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Filaman"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Tamamlanan"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Sıc."); LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Sıc."); LSTR MSG_INFO_PSU = _UxGT("Güç Kaynağı"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Sürücü Gücü"); LSTR MSG_DAC_PERCENT_N = _UxGT("@ Sürücü %"); LSTR MSG_ERROR_TMC = _UxGT("TMC BAĞLANTI HATASI"); @@ -698,7 +698,7 @@ namespace LanguageNarrow_tr { LSTR MSG_RUNOUT_SENSOR = _UxGT("Fil. Sensörü"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Aşınma Farkı mm"); LSTR MSG_RUNOUT_ENABLE = _UxGT("Fil. Sens. Aç"); // ProUI - LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı"); + LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı"); // ProUI LSTR MSG_FANCHECK = _UxGT("Fan Takosu Kontrolü"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Sıfırlama Başarısız"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing Başarısız"); @@ -897,9 +897,9 @@ namespace LanguageWide_tr { LSTR MSG_MEDIA_MENU = _UxGT("SD Karttan Yazdır"); LSTR MSG_TURN_OFF = _UxGT("Yazıcıyı kapat"); LSTR MSG_END_LOOPS = _UxGT("Tekrr Döngüler Bitir"); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Ortam yerleştirilmedi."); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Lütfen önce hotend'i ısıtın."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Baskı Sayısını Sıfırla"); + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Ortam yerleştirilmedi."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Lütfen önce hotend'i ısıtın."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Baskı Sayısını Sıfırla"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Baskı Sayısı"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Toplam Baskı Süresi"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("En Uzun Baskı Süresi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index eb509e18d6..5010aff703 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -536,14 +536,6 @@ namespace LanguageNarrow_uk { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Яскравість світла"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("НЕ ТОЙ ПРИНТЕР"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено"); - LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано"); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд"); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія"); - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж..."); - LSTR MSG_INFO_PRINT_COUNT = _UxGT("Друків"); - LSTR MSG_INFO_PRINT_TIME = _UxGT("Загалом"); - LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовше"); LSTR MSG_COLORS_GET = _UxGT("Отримати колір"); // ProUI LSTR MSG_COLORS_SELECT = _UxGT("Кольори"); // ProUI LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос."); // ProUI @@ -551,13 +543,24 @@ namespace LanguageNarrow_uk { LSTR MSG_COLORS_GREEN = _UxGT("Зелений"); // ProUI / JyersUI LSTR MSG_COLORS_BLUE = _UxGT("Синій"); // ProUI / JyersUI LSTR MSG_COLORS_WHITE = _UxGT("Білий"); // ProUI - LSTR MSG_UI_LANGUAGE = _UxGT("Мова"); - LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук"); - LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран"); + LSTR MSG_UI_LANGUAGE = _UxGT("Мова"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран"); // ProUI + //MSG_LOCKSCREEN_LOCKED + //MSG_LOCKSCREEN_UNLOCK + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж..."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд"); // ProUI + LSTR MSG_INFO_PRINT_COUNT = _UxGT("Друків"); + LSTR MSG_INFO_PRINT_TIME = _UxGT("Загалом"); + LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовше"); + LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано"); + LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Мін. ") LCD_STR_THERMOMETER; LSTR MSG_INFO_MAX_TEMP = _UxGT("Макс. ") LCD_STR_THERMOMETER; LSTR MSG_INFO_PSU = _UxGT("Блок жив-ня"); + LSTR MSG_DRIVE_STRENGTH = _UxGT("Сила мотору"); LSTR MSG_DAC_PERCENT_N = _UxGT("Драйвер @, %"); LSTR MSG_ERROR_TMC = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC"); From 079acfd90dacb32090f7e966f638a038c0e3b912 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:20:37 -0500 Subject: [PATCH 09/19] "runout sensor" --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 4 ++-- Marlin/src/lcd/language/language_de.h | 1 - Marlin/src/lcd/language/language_en.h | 1 - Marlin/src/lcd/language/language_it.h | 1 - Marlin/src/lcd/language/language_ru.h | 1 - Marlin/src/lcd/language/language_sk.h | 1 - Marlin/src/lcd/language/language_tr.h | 1 - 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 5df25e3e28..142a5b39cf 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3324,7 +3324,7 @@ void drawFilSetMenu() { if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 9)) { BACK_ITEM(drawAdvancedSettingsMenu); #if HAS_FILAMENT_SENSOR - EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled); + EDIT_ITEM(ICON_Runout, MSG_RUNOUT_SENSOR, onDrawChkbMenu, setRunoutEnable, &runout.enabled); #endif #if HAS_FILAMENT_RUNOUT_DISTANCE EDIT_ITEM(ICON_Runout, MSG_RUNOUT_DISTANCE_MM, onDrawPFloatMenu, setRunoutDistance, &runout.runout_distance()); @@ -3415,7 +3415,7 @@ void drawTuneMenu() { MENU_ITEM(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, changeFilament); #endif #if HAS_FILAMENT_SENSOR - EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled); + EDIT_ITEM(ICON_Runout, MSG_RUNOUT_SENSOR, onDrawChkbMenu, setRunoutEnable, &runout.enabled); #endif #if ENABLED(PROUI_ITEM_PLR) EDIT_ITEM(ICON_Pwrlossr, MSG_OUTAGE_RECOVERY, onDrawChkbMenu, setPwrLossr, &recovery.enabled); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 3055d21ed0..828a44bf52 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -629,7 +629,6 @@ namespace LanguageNarrow_de { LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Düse: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout-Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout-Weg mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Runout aktivieren"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI LSTR MSG_FANCHECK = _UxGT("Lüftergeschw. prüfen"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing gescheitert"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index fe0c1f48b3..f4b3394d88 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -720,7 +720,6 @@ namespace LanguageNarrow_en { LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozzle: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout Sensor"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout Dist mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Enable Runout"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI LSTR MSG_FANCHECK = _UxGT("Fan Tacho Check"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing Failed"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index ed2c666504..d9c83ed415 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -698,7 +698,6 @@ namespace LanguageNarrow_it { LSTR MSG_RUNOUT_SENSOR = _UxGT("Sens.filo termin."); // Max 17 characters LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Dist mm filo term."); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Abil.filo termin."); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore"); // ProUI LSTR MSG_FANCHECK = _UxGT("Verif.tacho vent."); // Max 17 characters LSTR MSG_KILL_HOMING_FAILED = _UxGT("Home fallito"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index e38207c8a8..e30b1fb562 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -793,7 +793,6 @@ namespace LanguageNarrow_ru { LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрейте сопло."); // ProUI LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Сбросить счетчик"); // ProUI LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?"); // ProUI - LSTR MSG_RUNOUT_ENABLE = _UxGT("Включить датч.филамента"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера."); // ProUI LSTR MSG_FANCHECK = _UxGT("Пров.тахометра кулера"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 31cea49da5..9746329015 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -673,7 +673,6 @@ namespace LanguageNarrow_sk { LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Tryska: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Senzor filamentu"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Vzd. mm fil. senz."); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Zapnúť senzor"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud."); // ProUI LSTR MSG_FANCHECK = _UxGT("Kontrola rýchl."); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Parkovanie zlyhalo"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index af67d89836..3f925d04db 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -697,7 +697,6 @@ namespace LanguageNarrow_tr { LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozul: "); LSTR MSG_RUNOUT_SENSOR = _UxGT("Fil. Sensörü"); LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Aşınma Farkı mm"); - LSTR MSG_RUNOUT_ENABLE = _UxGT("Fil. Sens. Aç"); // ProUI LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı"); // ProUI LSTR MSG_FANCHECK = _UxGT("Fan Takosu Kontrolü"); LSTR MSG_KILL_HOMING_FAILED = _UxGT("Sıfırlama Başarısız"); From a2193f3f07e942c31d7f1754a72ee3d69f51a741 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:29:28 -0500 Subject: [PATCH 10/19] minimize allocation --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 142a5b39cf..328ab299a6 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3170,9 +3170,19 @@ void drawControlMenu() { updateMenu(controlMenu); } +constexpr int advItems = 3 + COUNT_ENABLED( \ + EEPROM_SETTINGS, HAS_MESH, HAS_BED_PROBE, HAS_HOME_OFFSET, HAS_TRINAMIC_CONFIG, HAS_ESDIAG, \ + HAS_LOCKSCREEN, EDITABLE_DISPLAY_TIMEOUT, SOUND_MENU_ITEM, POWER_LOSS_RECOVERY, HAS_GCODE_PREVIEW, \ + PROUI_MEDIASORT, BAUD_RATE_GCODE, HAS_CUSTOM_COLORS, REVERSIBLE_ENCODER) \ + + (2 * ENABLED(PRINTCOUNTER)) \ + + (2 * ENABLED(HAS_LCD_BRIGHTNESS)) \ + + (ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU)) \ + + ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) \ + + (ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU)) + void drawAdvancedSettingsMenu() { checkkey = ID_Menu; - if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, 25)) { + if (SET_MENU(advancedSettingsMenu, MSG_ADVANCED_SETTINGS, advItems)) { BACK_ITEM(gotoMainMenu); #if ENABLED(EEPROM_SETTINGS) MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, writeEEPROM); From 53041f2a1db68fce7507c5a2b0214e783debb075 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:34:00 -0500 Subject: [PATCH 11/19] more labels --- Marlin/src/lcd/language/language_en.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index f4b3394d88..cd81c77008 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -919,9 +919,9 @@ namespace LanguageWide_en { LSTR MSG_MEDIA_MENU = _UxGT("Select from ") MEDIA_TYPE_EN; LSTR MSG_TURN_OFF = _UxGT("Turn off the printer"); LSTR MSG_END_LOOPS = _UxGT("End Repeat Loops"); - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No media inserted."); - LSTR MSG_PLEASE_PREHEAT = _UxGT("Please preheat the hot end."); - LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count"); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No media inserted."); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Please preheat the hot end."); // ProUI + LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count"); // ProUI LSTR MSG_INFO_PRINT_COUNT = _UxGT("Print Count"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Print Time"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest Job Time"); From defd9271873598924ff339d64de62ec001adbd6f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:40:16 -0500 Subject: [PATCH 12/19] comment --- Marlin/src/lcd/marlinui.cpp | 2 +- Marlin/src/lcd/marlinui.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 617e576bb5..961d5ce795 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -67,7 +67,7 @@ MarlinUI ui; constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; #if ENABLED(REVERSIBLE_ENCODER) - bool MarlinUI::reverse_encoder = false; + bool MarlinUI::reverse_encoder; // = false #endif #if HAS_STATUS_MESSAGE diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index 40b1c348e0..c44c8ec2bf 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -204,7 +204,7 @@ public: } #if ENABLED(REVERSIBLE_ENCODER) - static bool reverse_encoder; + static bool reverse_encoder; // Flag to reverse the encoder direction #endif static void init(); From 2078568d13f3a8b36b13242e35e8c7cda45a37c8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 May 2024 17:49:23 -0500 Subject: [PATCH 13/19] just reverse menus should be set to "menu direction" for main menu buttons --- Marlin/src/lcd/e3v2/common/encoder.cpp | 3 +-- Marlin/src/lcd/marlinui.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp index 07e8043e22..889d1c61f3 100644 --- a/Marlin/src/lcd/e3v2/common/encoder.cpp +++ b/Marlin/src/lcd/e3v2/common/encoder.cpp @@ -75,8 +75,7 @@ EncoderState encoderReceiveAnalyze() { else return ENCODER_DIFF_NO; } - const int8_t delta = ui.get_encoder_delta(); - temp_diff += TERN0(REVERSIBLE_ENCODER, ui.reverse_encoder) ? -delta : delta; + temp_diff += ui.get_encoder_delta(); const int8_t abs_diff = ABS(temp_diff); if (abs_diff >= ENCODER_PULSES_PER_STEP) { diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index c44c8ec2bf..21a33787b3 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -854,20 +854,25 @@ public: #define ENCODERBASE (TERN(REVERSE_ENCODER_DIRECTION, -1, +1)) - #if ANY(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION) + #if ANY(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION, REVERSIBLE_ENCODER) static int8_t encoderDirection; #else static constexpr int8_t encoderDirection = ENCODERBASE; #endif FORCE_INLINE static void encoder_direction_normal() { - #if ANY(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION) + #if ANY(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION, REVERSIBLE_ENCODER) encoderDirection = ENCODERBASE; #endif } FORCE_INLINE static void encoder_direction_menus() { - TERN_(REVERSE_MENU_DIRECTION, encoderDirection = -(ENCODERBASE)); + constexpr int8_t dir = TERN(REVERSE_MENU_DIRECTION, -(ENCODERBASE), ENCODERBASE); + #if ENABLED(REVERSIBLE_ENCODER) + encoderDirection = reverse_encoder ? -dir : dir; + #elif ENABLED(REVERSE_MENU_DIRECTION) + encoderDirection = dir; + #endif } FORCE_INLINE static void encoder_direction_select() { From 34bfb2c2620da066077a3c857166ef9661d52634 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 23 May 2024 14:50:34 -0500 Subject: [PATCH 14/19] ExtUI PID / MPC cleanup --- Marlin/src/lcd/e3v2/proui/dwin.cpp | 2 +- Marlin/src/lcd/e3v2/proui/proui_extui.cpp | 12 +--- .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp | 3 + Marlin/src/lcd/extui/malyan/malyan_extui.cpp | 72 ++++++++++--------- Marlin/src/lcd/marlinui.h | 1 + 5 files changed, 47 insertions(+), 43 deletions(-) diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 328ab299a6..af3019a3d4 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3178,7 +3178,7 @@ constexpr int advItems = 3 + COUNT_ENABLED( \ + (2 * ENABLED(HAS_LCD_BRIGHTNESS)) \ + (ENABLED(PIDTEMP) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU)) \ + ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU) \ - + (ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU)) + + (ENABLED(PIDTEMPBED) && ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU)); void drawAdvancedSettingsMenu() { checkkey = ID_Menu; diff --git a/Marlin/src/lcd/e3v2/proui/proui_extui.cpp b/Marlin/src/lcd/e3v2/proui/proui_extui.cpp index ae85a5a60c..98d032df5f 100644 --- a/Marlin/src/lcd/e3v2/proui/proui_extui.cpp +++ b/Marlin/src/lcd/e3v2/proui/proui_extui.cpp @@ -195,15 +195,9 @@ namespace ExtUI { void onPIDTuning(const pidresult_t rst) { // Called for temperature PID tuning result switch (rst) { - #if ENABLED(PIDTEMP) - case PID_STARTED: dwinPIDTuning(PIDTEMP_START); break; - #endif - #if ENABLED(PIDTEMPBED) - case PID_BED_STARTED: dwinPIDTuning(PIDTEMPBED_START); break; - #endif - #if ENABLED(PIDTEMPCHAMBER) - case PID_CHAMBER_STARTED: dwinPIDTuning(PIDTEMPCHAMBER_START); break; - #endif + case PID_STARTED: TERN_(PIDTEMP, dwinPIDTuning(PIDTEMP_START)); break; + case PID_BED_STARTED: TERN_(PIDTEMPBED, dwinPIDTuning(PIDTEMPBED_START)); break; + case PID_CHAMBER_STARTED: TERN_(PIDTEMPCHAMBER, dwinPIDTuning(PIDTEMPCHAMBER_START)); break; case PID_BAD_HEATER_ID: dwinPIDTuning(tempcontrol_t(PID_BAD_HEATER_ID)); break; case PID_TEMP_TOO_HIGH: dwinPIDTuning(tempcontrol_t(PID_TEMP_TOO_HIGH)); break; case PID_TUNING_TIMEOUT: dwinPIDTuning(tempcontrol_t(PID_TUNING_TIMEOUT)); break; diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp index 93a83e21f8..823f055cbb 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp @@ -211,6 +211,9 @@ namespace ExtUI { case MPC_STARTED: StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MPC_AUTOTUNE)); break; + case MPC_TEMP_ERROR: break; + case MPC_INTERRUPTED: break; + case MPC_DONE: break; } GOTO_SCREEN(StatusScreen); } diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp index 3ed4678a41..20b4004433 100644 --- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp +++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp @@ -102,38 +102,6 @@ namespace ExtUI { set_lcd_error(error, component); } - #if HAS_PID_HEATING - - void onPIDTuning(const pidresult_t rst) { - // Called for temperature PID tuning result - //SERIAL_ECHOLNPGM("OnPIDTuning:", rst); - switch (rst) { - case PID_STARTED: - case PID_BED_STARTED: - case PID_CHAMBER_STARTED: - set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE)); - break; - case PID_BAD_HEATER_ID: - set_lcd_error(GET_TEXT_F(MSG_PID_BAD_HEATER_ID)); - break; - case PID_TEMP_TOO_HIGH: - set_lcd_error(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)); - break; - case PID_TUNING_TIMEOUT: - set_lcd_error(GET_TEXT_F(MSG_PID_TIMEOUT)); - break; - case PID_DONE: - set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)); - break; - } - } - - void onStartM303(const int count, const heater_id_t hid, const celsius_t temp) { - // Called by M303 to update the UI - } - - #endif - void onPrintTimerStarted() { write_to_lcd(F("{SYS:BUILD}")); } void onPrintTimerPaused() {} void onPrintTimerStopped() { write_to_lcd(F("{TQ:100}")); } @@ -207,9 +175,47 @@ namespace ExtUI { } #endif + #if HAS_PID_HEATING + + void onPIDTuning(const pidresult_t rst) { + // Called for temperature PID tuning result + //SERIAL_ECHOLNPGM("OnPIDTuning:", rst); + switch (rst) { + case PID_STARTED: + case PID_BED_STARTED: + case PID_CHAMBER_STARTED: + set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE)); + break; + case PID_BAD_HEATER_ID: + set_lcd_error(GET_TEXT_F(MSG_PID_BAD_HEATER_ID)); + break; + case PID_TEMP_TOO_HIGH: + set_lcd_error(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)); + break; + case PID_TUNING_TIMEOUT: + set_lcd_error(GET_TEXT_F(MSG_PID_TIMEOUT)); + break; + case PID_DONE: + set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)); + break; + } + } + + void onStartM303(const int count, const heater_id_t hid, const celsius_t temp) { + // Called by M303 to update the UI + } + + #endif // HAS_PID_HEATING + #if ENABLED(MPC_AUTOTUNE) void onMPCTuning(const mpcresult_t rst) { - // Called for temperature PID tuning result + // Called for temperature MPC tuning result + switch (rst) { + case MPC_STARTED: break; + case MPC_TEMP_ERROR: break; + case MPC_INTERRUPTED: break; + case MPC_DONE: break; + } } #endif diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index 21a33787b3..60669170f6 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -873,6 +873,7 @@ public: #elif ENABLED(REVERSE_MENU_DIRECTION) encoderDirection = dir; #endif + UNUSED(dir); } FORCE_INLINE static void encoder_direction_select() { From aa9c48253cd4b40b7828830921e86674d2ef308e Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Sun, 26 May 2024 07:04:09 -0400 Subject: [PATCH 15/19] settings comment --- Marlin/src/module/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 44c386c3f7..02bd03b57a 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -589,7 +589,7 @@ typedef struct SettingsDataStruct { #endif // - // Encoder Direction + // Encoder Reverse // #if ENABLED(REVERSIBLE_ENCODER) bool reverse_encoder; // ProUI From c0bed1df183fef023024103a26f67219e12598f1 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Sun, 6 Apr 2025 06:20:43 -0400 Subject: [PATCH 16/19] revert malyan_extui.cpp --- Marlin/src/lcd/extui/malyan/malyan_extui.cpp | 72 +++++++++----------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp index 20b4004433..3ed4678a41 100644 --- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp +++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp @@ -102,6 +102,38 @@ namespace ExtUI { set_lcd_error(error, component); } + #if HAS_PID_HEATING + + void onPIDTuning(const pidresult_t rst) { + // Called for temperature PID tuning result + //SERIAL_ECHOLNPGM("OnPIDTuning:", rst); + switch (rst) { + case PID_STARTED: + case PID_BED_STARTED: + case PID_CHAMBER_STARTED: + set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE)); + break; + case PID_BAD_HEATER_ID: + set_lcd_error(GET_TEXT_F(MSG_PID_BAD_HEATER_ID)); + break; + case PID_TEMP_TOO_HIGH: + set_lcd_error(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)); + break; + case PID_TUNING_TIMEOUT: + set_lcd_error(GET_TEXT_F(MSG_PID_TIMEOUT)); + break; + case PID_DONE: + set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)); + break; + } + } + + void onStartM303(const int count, const heater_id_t hid, const celsius_t temp) { + // Called by M303 to update the UI + } + + #endif + void onPrintTimerStarted() { write_to_lcd(F("{SYS:BUILD}")); } void onPrintTimerPaused() {} void onPrintTimerStopped() { write_to_lcd(F("{TQ:100}")); } @@ -175,47 +207,9 @@ namespace ExtUI { } #endif - #if HAS_PID_HEATING - - void onPIDTuning(const pidresult_t rst) { - // Called for temperature PID tuning result - //SERIAL_ECHOLNPGM("OnPIDTuning:", rst); - switch (rst) { - case PID_STARTED: - case PID_BED_STARTED: - case PID_CHAMBER_STARTED: - set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE)); - break; - case PID_BAD_HEATER_ID: - set_lcd_error(GET_TEXT_F(MSG_PID_BAD_HEATER_ID)); - break; - case PID_TEMP_TOO_HIGH: - set_lcd_error(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)); - break; - case PID_TUNING_TIMEOUT: - set_lcd_error(GET_TEXT_F(MSG_PID_TIMEOUT)); - break; - case PID_DONE: - set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)); - break; - } - } - - void onStartM303(const int count, const heater_id_t hid, const celsius_t temp) { - // Called by M303 to update the UI - } - - #endif // HAS_PID_HEATING - #if ENABLED(MPC_AUTOTUNE) void onMPCTuning(const mpcresult_t rst) { - // Called for temperature MPC tuning result - switch (rst) { - case MPC_STARTED: break; - case MPC_TEMP_ERROR: break; - case MPC_INTERRUPTED: break; - case MPC_DONE: break; - } + // Called for temperature PID tuning result } #endif From 581c98c7d2f7a843fc015f56b6b7196825fc3108 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Sun, 6 Apr 2025 06:21:15 -0400 Subject: [PATCH 17/19] revert ftdi_eve_extui.cpp --- Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp index ba30105165..c26a809037 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp @@ -222,9 +222,6 @@ namespace ExtUI { case MPC_STARTED: StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MPC_AUTOTUNE)); break; - case MPC_TEMP_ERROR: break; - case MPC_INTERRUPTED: break; - case MPC_DONE: break; } GOTO_SCREEN(StatusScreen); } From ab86073088cb74692f2e183d6e1fe8ea490f8e13 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Wed, 29 Oct 2025 07:58:19 -0400 Subject: [PATCH 18/19] add REVERSIBLE_ENCODER in Configuration.h --- Marlin/Configuration.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 40b8ba5f22..1111c00176 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2794,6 +2794,7 @@ // Set this option if CLOCKWISE causes values to DECREASE // //#define REVERSE_ENCODER_DIRECTION +//#define REVERSIBLE_ENCODER // Enable menu option to toggle direction // // This option reverses the encoder direction for navigating LCD menus. From ac0e0522bab52b99f736f4d5b4fab3491da0c66e Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Wed, 29 Oct 2025 08:00:00 -0400 Subject: [PATCH 19/19] remove proui comment --- Marlin/src/module/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index a4bcc56a37..2456200194 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -628,7 +628,7 @@ typedef struct SettingsDataStruct { // Encoder Reverse // #if ENABLED(REVERSIBLE_ENCODER) - bool reverse_encoder; // ProUI + bool reverse_encoder; #endif //