3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-19 16:16:13 +00:00
Code Issues Releases Wiki Activity

🎨 Language / menu cleanup

Browse source
This commit is contained in:
Scott Lahteine 2023-01-15 06:48:17 -06:00
parent 212167b140
commit d94defc545
30 changed files with 102 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
Marlin/src/lcd/e3v2/proui/dwin.cpp
View file

@ -550,10 +550,10 @@ void DWIN_DrawStatusMessage() {
// If the string fits the status line do not scroll it
if (slen <= LCD_WIDTH) {
if (hash_changed) {
DWIN_DrawStatusLine(ui.status_message);
hash_changed = false;
}
if (hash_changed) {
DWIN_DrawStatusLine(ui.status_message);
hash_changed = false;
}
}
else {
// String is larger than the available line space
@ -676,14 +676,18 @@ void Draw_PrintDone() {
Title.ShowCaption(GET_TEXT_F(MSG_PRINT_DONE));
DWINUI::ClearMainArea();
DWIN_Print_Header(nullptr);
#if HAS_GCODE_PREVIEW
if (Preview_Valid()) {
const bool isvalid = Preview_Valid();
if (isvalid) {
DWIN_ICON_Show(0, 0, 1, 21, 100, 0x00);
DWINUI::Draw_Button(BTN_Continue, 86, 300);
}
else
#else
constexpr bool isvalid = false;
#endif
{
if (!isvalid) {
Draw_Print_ProgressBar();
Draw_Print_Labels();
DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
@ -731,11 +735,7 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
// Check for a position change
static xyz_pos_t oldpos = { -1, -1, -1 };
#if ENABLED(SHOW_REAL_POS)
const float p = stepper.position(axis) / planner.settings.axis_steps_per_mm[axis];
#else
const float p = current_position[axis];
#endif
const float p = TERN(SHOW_REAL_POS, stepper.position(axis) / planner.settings.axis_steps_per_mm[axis], current_position[axis]);
const bool changed = oldpos[axis] != p;
if (changed) oldpos[axis] = p;
@ -811,15 +811,9 @@ void update_variable() {
if (IsMenu(TuneMenu) || IsMenu(TemperatureMenu)) {
// Tune page temperature update
#if HAS_HOTEND
if (_new_hotend_target) HotendTargetItem->redraw();
#endif
#if HAS_HEATED_BED
if (_new_bed_target) BedTargetItem->redraw();
#endif
#if HAS_FAN
if (_new_fanspeed) FanSpeedItem->redraw();
#endif
TERN_(HAS_HOTEND, if (_new_hotend_target) HotendTargetItem->redraw());
TERN_(HAS_HEATED_BED, if (_new_bed_target) BedTargetItem->redraw());
TERN_(HAS_FAN, if (_new_fanspeed) FanSpeedItem->redraw());
}
// Bottom temperature update
@ -956,8 +950,7 @@ void onClickSDItem() {
void FileMenuIdle(bool reset=false) {
static bool hasUpDir = false;
static uint8_t last_itemselected = 0;
static int8_t shift_amt = 0;
static int8_t shift_len = 0;
static int8_t shift_amt = 0, shift_len = 0;
if (reset) {
last_itemselected = 0;
hasUpDir = !card.flag.workDirIsRoot; // is a SubDir
@ -1715,7 +1708,6 @@ void DWIN_CopySettingsFrom(const char * const buff) {
);
leds.update();
#endif
}
// Initialize or re-initialize the LCD
@ -1839,6 +1831,7 @@ void DWIN_RedrawScreen() {
#endif // ADVANCED_PAUSE_FEATURE
#if HAS_MESH
void DWIN_MeshViewer() {
if (!leveling_is_valid())
DWIN_Popup_Continue(ICON_BLTouch, GET_TEXT_F(MSG_MESH_VIEWER), GET_TEXT_F(MSG_NO_VALID_MESH));
@ -1847,8 +1840,8 @@ void DWIN_RedrawScreen() {
MeshViewer.Draw();
}
}
#endif // HAS_MESH
#endif // HAS_MESH
#if HAS_LOCKSCREEN
@ -1874,7 +1867,7 @@ void DWIN_RedrawScreen() {
if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
}
#endif // HAS_LOCKSCREEN
#endif // HAS_LOCKSCREEN
#if HAS_GCODE_PREVIEW
@ -1886,20 +1879,21 @@ void DWIN_RedrawScreen() {
Goto_Main_Menu();
return card.openAndPrintFile(card.filename);
}
else HMI_ReturnScreen();
else
HMI_ReturnScreen();
}
void Goto_ConfirmToPrint() {
#endif
void Goto_ConfirmToPrint() {
#if HAS_GCODE_PREVIEW
Goto_Popup(Preview_DrawFromSD, onClick_ConfirmToPrint);
}
#else
void Goto_ConfirmToPrint() {
#else
// Print SD file
HMI_flag.heat_flag = true;
card.openAndPrintFile(card.filename);
}
#endif
#endif
}
#if HAS_ESDIAG
void Draw_EndStopDiag() {
@ -1915,6 +1909,7 @@ void DWIN_RedrawScreen() {
// Tool functions
#if ENABLED(EEPROM_SETTINGS)
void WriteEeprom() {
DWIN_DrawStatusLine(GET_TEXT_F(MSG_STORE_EEPROM));
DWIN_UpdateLCD();
@ -1934,8 +1929,9 @@ void DWIN_RedrawScreen() {
}
#if HAS_MESH
void SaveMesh() { TERN(AUTO_BED_LEVELING_UBL, UBLSaveMesh(), WriteEeprom()); }
void SaveMesh() { TERN(AUTO_BED_LEVELING_UBL, UBLMeshSave(), WriteEeprom()); }
#endif
#endif
// Reset Printer
@ -2404,9 +2400,9 @@ void TramC () { Tram(4); }
MeshViewer.DrawMesh(zval, 2, 2);
ui.reset_status();
if (ABS(MeshViewer.max - MeshViewer.min) < 0.05) {
DWINUI::Draw_CenteredString(140,F("Corners leveled"));
DWINUI::Draw_CenteredString(160,F("Tolerance achieved!"));
if (ABS(MeshViewer.max - MeshViewer.min) < 0.05f) {
DWINUI::Draw_CenteredString(140, F("Corners leveled"));
DWINUI::Draw_CenteredString(160, F("Tolerance achieved!"));
}
else {
uint8_t p = 0;
@ -2698,7 +2694,6 @@ void onDrawGetColorItem(MenuItemClass* menuitem, int8_t line) {
DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
}
#if EITHER(PIDTEMP, PIDTEMPBED)
void onDrawPIDi(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_i(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
void onDrawPIDd(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_d(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
@ -2891,6 +2886,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
}
#if HAS_HOTEND
void onDrawMaxJerkE(MenuItemClass* menuitem, int8_t line) {
if (HMI_IsChinese()) {
menuitem->SetFrame(1, 173, 133, 200, 147);
@ -2900,6 +2896,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
}
onDrawPFloatMenu(menuitem, line);
}
#endif
#endif // HAS_CLASSIC_JERK
@ -2929,6 +2926,7 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
}
#if HAS_HOTEND
void onDrawStepsE(MenuItemClass* menuitem, int8_t line) {
if (HMI_IsChinese()) {
menuitem->SetFrame(1, 153, 148, 194, 161);
@ -2936,6 +2934,7 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
}
onDrawPFloatMenu(menuitem, line);
}
#endif
#if HAS_ONESTEP_LEVELING
@ -3106,6 +3105,7 @@ void Draw_Move_Menu() {
}
#if HAS_HOME_OFFSET
void Draw_HomeOffset_Menu() {
checkkey = Menu;
if (SET_MENU(HomeOffMenu, MSG_SET_HOME_OFFSETS, 4)) {
@ -3116,9 +3116,11 @@ void Draw_Move_Menu() {
}
UpdateMenu(HomeOffMenu);
}
#endif
#if HAS_BED_PROBE
void Draw_ProbeSet_Menu() {
checkkey = Menu;
if (SET_MENU(ProbeSetMenu, MSG_ZPROBE_SETTINGS, 9)) {
@ -3138,6 +3140,7 @@ void Draw_Move_Menu() {
}
UpdateMenu(ProbeSetMenu);
}
#endif
void Draw_FilSet_Menu() {
@ -3205,6 +3208,7 @@ void Draw_GetColor_Menu() {
}
#if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
void Draw_CaseLight_Menu() {
checkkey = Menu;
if (SET_MENU(CaseLightMenu, MSG_CASE_LIGHT, 3)) {
@ -3214,9 +3218,11 @@ void Draw_GetColor_Menu() {
}
UpdateMenu(CaseLightMenu);
}
#endif
#if ENABLED(LED_CONTROL_MENU)
void Draw_LedControl_Menu() {
checkkey = Menu;
if (SET_MENU(LedControlMenu, MSG_LED_CONTROL, 10)) {
@ -3246,7 +3252,8 @@ void Draw_GetColor_Menu() {
}
UpdateMenu(LedControlMenu);
}
#endif
#endif // LED_CONTROL_MENU
void Draw_Tune_Menu() {
checkkey = Menu;
@ -3309,6 +3316,7 @@ void Draw_Motion_Menu() {
}
#if ENABLED(ADVANCED_PAUSE_FEATURE)
void Draw_FilamentMan_Menu() {
checkkey = Menu;
if (SET_MENU(FilamentMenu, MSG_FILAMENT_MAN, 5)) {
@ -3324,9 +3332,11 @@ void Draw_Motion_Menu() {
}
UpdateMenu(FilamentMenu);
}
#endif
#if ENABLED(MESH_BED_LEVELING)
void Draw_ManualMesh_Menu() {
checkkey = Menu;
if (SET_MENU(ManualMesh, MSG_UBL_MANUAL_MESH, 6)) {
@ -3339,7 +3349,8 @@ void Draw_Motion_Menu() {
}
UpdateMenu(ManualMesh);
}
#endif
#endif // MESH_BED_LEVELING
#if HAS_PREHEAT
@ -3422,6 +3433,7 @@ void Draw_MaxAccel_Menu() {
}
#if HAS_CLASSIC_JERK
void Draw_MaxJerk_Menu() {
checkkey = Menu;
if (SET_MENU_R(MaxJerkMenu, selrect({1, 16, 28, 13}), MSG_JERK, 5)) {
@ -3435,7 +3447,8 @@ void Draw_MaxAccel_Menu() {
}
UpdateMenu(MaxJerkMenu);
}
#endif
#endif // HAS_CLASSIC_JERK
void Draw_Steps_Menu() {
checkkey = Menu;
@ -3452,6 +3465,7 @@ void Draw_Steps_Menu() {
}
#if ENABLED(PIDTEMP)
void Draw_HotendPID_Menu() {
checkkey = Menu;
if (SET_MENU_F(HotendPIDMenu, STR_HOTEND_PID " Settings", 8)) {
@ -3468,9 +3482,11 @@ void Draw_Steps_Menu() {
}
UpdateMenu(HotendPIDMenu);
}
#endif
#if ENABLED(PIDTEMPBED)
void Draw_BedPID_Menu() {
checkkey = Menu;
if (SET_MENU_F(BedPIDMenu, STR_BED_PID " Settings", 8)) {
@ -3487,9 +3503,11 @@ void Draw_Steps_Menu() {
}
UpdateMenu(BedPIDMenu);
}
#endif
#endif // PIDTEMPBED
#if HAS_BED_PROBE
void Draw_ZOffsetWiz_Menu() {
checkkey = Menu;
if (SET_MENU(ZOffsetWizMenu, MSG_PROBE_WIZARD, 4)) {
@ -3501,9 +3519,11 @@ void Draw_Steps_Menu() {
UpdateMenu(ZOffsetWizMenu);
if (!axis_is_trusted(Z_AXIS)) LCD_MESSAGE_F("WARNING: Z position unknown, move Z to home");
}
#endif
#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
void Draw_Homing_Menu() {
checkkey = Menu;
if (SET_MENU(HomingMenu, MSG_HOMING, 6)) {
@ -3518,9 +3538,11 @@ void Draw_Steps_Menu() {
}
UpdateMenu(HomingMenu);
}
#endif
#if ENABLED(FWRETRACT)
void Draw_FWRetract_Menu() {
checkkey = Menu;
if (SET_MENU(FWRetractMenu, MSG_FWRETRACT, 6)) {
@ -3533,6 +3555,7 @@ void Draw_Steps_Menu() {
}
UpdateMenu(FWRetractMenu);
}
#endif
//=============================================================================
@ -3565,22 +3588,23 @@ void Draw_Steps_Menu() {
void SetEditMeshY() { HMI_value.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
#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(MenuItemClass* menuitem, int8_t line) {
if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
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 UBLTiltMesh() {
if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
void UBLMeshTilt() {
NOLESS(bedlevel.storage_slot, 0);
char buf[15];
if (bedLevelTools.tilt_grid > 1) {
sprintf_P(buf, PSTR("G28O\nG29 J%i"), bedLevelTools.tilt_grid);
@ -3596,15 +3620,15 @@ void Draw_Steps_Menu() {
LCD_MESSAGE(MSG_UBL_MESH_FILLED);
}
void UBLSaveMesh() {
if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
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 UBLLoadMesh() {
if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
void UBLMeshLoad() {
NOLESS(bedlevel.storage_slot, 0);
settings.load_mesh(bedlevel.storage_slot);
}
@ -3626,10 +3650,10 @@ void Draw_Steps_Menu() {
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL)
EDIT_ITEM(ICON_UBLSlot, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, SetUBLSlot, &bedlevel.storage_slot);
MENU_ITEM(ICON_UBLSaveMesh, MSG_UBL_SAVE_MESH, onDrawMenuItem, UBLSaveMesh);
MENU_ITEM(ICON_UBLLoadMesh, MSG_UBL_LOAD_MESH, onDrawMenuItem, UBLLoadMesh);
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, UBLTiltMesh);
MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, UBLMeshTilt);
MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, UBLSmartFillMesh);
#endif
#if ENABLED(MESH_EDIT_MENU)

23
Marlin/src/lcd/e3v2/proui/dwin.h
View file

@ -141,7 +141,9 @@ static constexpr size_t eeprom_data_size = sizeof(HMI_data_t);
typedef struct {
int8_t Color[3]; // Color components
TERN_(HAS_PID_HEATING, pidresult_t pidresult = PID_DONE);
#if HAS_PID_HEATING
tempcontrol_t pidresult = PID_DONE;
#endif
uint8_t Select = 0; // Auxiliary selector variable
AxisEnum axis = X_AXIS; // Axis Select
} HMI_value_t;
@ -213,10 +215,10 @@ void ParkHead();
void ApplyLEDColor();
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL)
void UBLTiltMesh();
void UBLMeshTilt();
bool UBLValidMesh();
void UBLSaveMesh();
void UBLLoadMesh();
void UBLMeshSave();
void UBLMeshLoad();
#endif
#if ENABLED(HOST_SHUTDOWN_MENU_ITEM) && defined(SHUTDOWN_ACTION)
void HostShutDown();
@ -356,10 +358,13 @@ void Draw_Steps_Menu();
#endif
// PID
void DWIN_PidTuning(pidresult_t result);
#if ENABLED(PIDTEMP)
void Draw_HotendPID_Menu();
#if HAS_PID_HEATING
void DWIN_PidTuning(tempcontrol_t result);
#if ENABLED(PIDTEMP)
void Draw_HotendPID_Menu();
#endif
#if ENABLED(PIDTEMPBED)
void Draw_BedPID_Menu();
#endif
#endif
#if ENABLED(PIDTEMPBED)
void Draw_BedPID_Menu();
#endif

6
Marlin/src/lcd/e3v2/proui/dwinui.h
View file

@ -138,14 +138,12 @@
#define ICON_UBLActive ICON_HotendTemp
#define ICON_UBLActive ICON_HotendTemp
#define ICON_UBLSlot ICON_ResumeEEPROM
#define ICON_UBLSaveMesh ICON_WriteEEPROM
#define ICON_UBLLoadMesh ICON_ReadEEPROM
#define ICON_UBLMeshSave ICON_WriteEEPROM
#define ICON_UBLMeshLoad ICON_ReadEEPROM
#define ICON_UBLTiltGrid ICON_PrintSize
#define ICON_UBLSmartFill ICON_StockConfiguration
#define ICON_ZAfterHome ICON_SetEndTemp
#define ICON_CaseLight ICON_Motion
#define ICON_LedControl ICON_Motion

1
Marlin/src/lcd/language/language_an.h
View file

@ -103,7 +103,6 @@ namespace Language_an {
LSTR MSG_FLOW_N = _UxGT("Fluxo ~");
LSTR MSG_CONTROL = _UxGT("Control");
LSTR MSG_AUTOTEMP = _UxGT("Temperatura Auto.");
LSTR MSG_SELECT = _UxGT("Trigar");
LSTR MSG_SELECT_E = _UxGT("Trigar *");
LSTR MSG_ACC = _UxGT("Aceleracion");
LSTR MSG_VTRAV_MIN = _UxGT("Vel. viache min");

1
Marlin/src/lcd/language/language_cz.h
View file

@ -264,7 +264,6 @@ namespace Language_cz {
LSTR MSG_LCD_OFF = _UxGT("Vyp");
LSTR MSG_PID_AUTOTUNE = _UxGT("PID automatika");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID automatika *");
LSTR MSG_SELECT = _UxGT("Vybrat");
LSTR MSG_SELECT_E = _UxGT("Vybrat *");
LSTR MSG_ACC = _UxGT("Zrychl");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_da.h
View file

@ -98,7 +98,6 @@ namespace Language_da {
LSTR MSG_AUTOTEMP = _UxGT("Autotemp");
LSTR MSG_LCD_ON = _UxGT("Til");
LSTR MSG_LCD_OFF = _UxGT("Fra");
LSTR MSG_SELECT = _UxGT("Vælg");
LSTR MSG_SELECT_E = _UxGT("Vælg *");
LSTR MSG_A_RETRACT = _UxGT("A-retract");
LSTR MSG_A_TRAVEL = _UxGT("A-rejse");

1
Marlin/src/lcd/language/language_de.h
View file

@ -357,7 +357,6 @@ namespace Language_de {
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Sensor res *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("Ambient h *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("Amb. h fan *");
LSTR MSG_SELECT = _UxGT("Auswählen");
LSTR MSG_SELECT_E = _UxGT("Auswählen *");
LSTR MSG_ACC = _UxGT("Beschleunigung");
LSTR MSG_JERK = _UxGT("Jerk");

7
Marlin/src/lcd/language/language_en.h
View file

@ -378,7 +378,6 @@ namespace Language_en {
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Sensor res *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("Ambient h *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("Amb. h fan *");
LSTR MSG_SELECT = _UxGT("Select");
LSTR MSG_SELECT_E = _UxGT("Select *");
LSTR MSG_ACC = _UxGT("Accel");
LSTR MSG_JERK = _UxGT("Jerk");
@ -553,11 +552,11 @@ namespace Language_en {
LSTR MSG_TOOL_MIGRATION_END = _UxGT("Last Extruder");
LSTR MSG_TOOL_MIGRATION_SWAP = _UxGT("Migrate to *");
LSTR MSG_FILAMENTCHANGE = _UxGT("Change Filament");
LSTR MSG_FILAMENTCHANGE_E = _UxGT("Change Filament *");
LSTR MSG_FILAMENTCHANGE_E = _UxGT("Change * Filament");
LSTR MSG_FILAMENTLOAD = _UxGT("Load Filament");
LSTR MSG_FILAMENTLOAD_E = _UxGT("Load *");
LSTR MSG_FILAMENTLOAD_E = _UxGT("Load * Filament");
LSTR MSG_FILAMENTUNLOAD = _UxGT("Unload Filament");
LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload *");
LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload * Filament");
LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All");
#if ENABLED(MULTI_VOLUME)
LSTR MSG_ATTACH_MEDIA = _UxGT("Attach SD Card");

1
Marlin/src/lcd/language/language_es.h
View file

@ -265,7 +265,6 @@ namespace Language_es {
LSTR MSG_LCD_OFF = _UxGT("Apg");
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Auto-ajuste");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Auto-ajuste *");
LSTR MSG_SELECT = _UxGT("Seleccionar");
LSTR MSG_SELECT_E = _UxGT("Seleccionar *");
LSTR MSG_ACC = _UxGT("Aceleración");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_eu.h
View file

@ -161,7 +161,6 @@ namespace Language_eu {
LSTR MSG_MAX = " " LCD_STR_THERMOMETER _UxGT(" Max");
LSTR MSG_FACTOR = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
LSTR MSG_AUTOTEMP = _UxGT("Auto tenperatura");
LSTR MSG_SELECT = _UxGT("Aukeratu");
LSTR MSG_SELECT_E = _UxGT("Aukeratu *");
LSTR MSG_ACC = _UxGT("Azelerazioa");
LSTR MSG_JERK = _UxGT("Astindua");

1
Marlin/src/lcd/language/language_fr.h
View file

@ -272,7 +272,6 @@ namespace Language_fr {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Echec Autotune! E incorrect");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Echec Autotune! Temp. trop haute");
LSTR MSG_PID_TIMEOUT = _UxGT("Echec Autotune! Opér. expirée");
LSTR MSG_SELECT = _UxGT("Sélectionner");
LSTR MSG_SELECT_E = _UxGT("Sélectionner *");
LSTR MSG_ACC = _UxGT("Accélération");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_gl.h
View file

@ -266,7 +266,6 @@ namespace Language_gl {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Auto-Sint. fallida! Extrusor danado.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Auto-Sint. fallida! Temperatura moi alta.");
LSTR MSG_PID_TIMEOUT = _UxGT("Auto-Sint. fallida! Tempo excedido.");
LSTR MSG_SELECT = _UxGT("Escolla");
LSTR MSG_SELECT_E = _UxGT("Escolla *");
LSTR MSG_ACC = _UxGT("Acel");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_hr.h
View file

@ -95,7 +95,6 @@ namespace Language_hr {
LSTR MSG_BED = _UxGT("Bed");
LSTR MSG_FAN_SPEED = _UxGT("Brzina ventilatora");
LSTR MSG_FAN_SPEED_N = _UxGT("Brzina ventilatora ~");
LSTR MSG_SELECT = _UxGT("Odaberi");
LSTR MSG_SELECT_E = _UxGT("Odaberi *");
LSTR MSG_TEMPERATURE = _UxGT("Temperature");
LSTR MSG_MOTION = _UxGT("Gibanje");

1
Marlin/src/lcd/language/language_hu.h
View file

@ -309,7 +309,6 @@ namespace Language_hu {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Hangolási hiba! Rossz adagoló.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Hangolási hiba! Magas hömérséklet.");
LSTR MSG_PID_TIMEOUT = _UxGT("Hangolási hiba! Idötúllépés.");
LSTR MSG_SELECT = _UxGT("Kiválaszt");
LSTR MSG_SELECT_E = _UxGT("Kiválaszt *");
LSTR MSG_ACC = _UxGT("Gyorsítás");
LSTR MSG_JERK = _UxGT("Rántás");

1
Marlin/src/lcd/language/language_it.h
View file

@ -370,7 +370,6 @@ namespace Language_it {
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Reattiv.Sens. *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("H ambiente *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("H Amb. vent. *");
LSTR MSG_SELECT = _UxGT("Seleziona");
LSTR MSG_SELECT_E = _UxGT("Seleziona *");
LSTR MSG_ACC = _UxGT("Accel");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_jp_kana.h
View file

@ -114,7 +114,6 @@ namespace Language_jp_kana {
LSTR MSG_AUTOTEMP = _UxGT("ジドウオンドセイギョ"); // "Autotemp"
LSTR MSG_LCD_ON = _UxGT("オン"); // "On"
LSTR MSG_LCD_OFF = _UxGT("オフ"); // "Off"
LSTR MSG_SELECT = _UxGT("センタク"); // "Select"
LSTR MSG_SELECT_E = _UxGT("センタク *");
LSTR MSG_ACC = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO; // "Accel"
LSTR MSG_JERK = _UxGT("ヤクドウ mm/s"); // "Jerk"

1
Marlin/src/lcd/language/language_nl.h
View file

@ -108,7 +108,6 @@ namespace Language_nl {
LSTR MSG_AUTOTEMP = _UxGT("Autotemp");
LSTR MSG_LCD_ON = _UxGT("Aan");
LSTR MSG_LCD_OFF = _UxGT("Uit");
LSTR MSG_SELECT = _UxGT("Selecteer");
LSTR MSG_SELECT_E = _UxGT("Selecteer *");
LSTR MSG_ACC = _UxGT("Versn");
LSTR MSG_TEMPERATURE = _UxGT("Temperatuur");

1
Marlin/src/lcd/language/language_pl.h
View file

@ -269,7 +269,6 @@ namespace Language_pl {
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Autostrojenie");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Autostrojenie *");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("Strojenie PID zakończone");
LSTR MSG_SELECT = _UxGT("Wybierz");
LSTR MSG_SELECT_E = _UxGT("Wybierz *");
LSTR MSG_ACC = _UxGT("Przyspieszenie");
LSTR MSG_JERK = _UxGT("Zryw");

1
Marlin/src/lcd/language/language_pt_br.h
View file

@ -236,7 +236,6 @@ namespace Language_pt_br {
LSTR MSG_AUTOTEMP = _UxGT("Temp. Automática");
LSTR MSG_LCD_ON = _UxGT("Ligado");
LSTR MSG_LCD_OFF = _UxGT("Desligado");
LSTR MSG_SELECT = _UxGT("Selecionar");
LSTR MSG_SELECT_E = _UxGT("Selecionar *");
LSTR MSG_ACC = _UxGT("Acel.");
LSTR MSG_JERK = _UxGT("Arrancada");

1
Marlin/src/lcd/language/language_ro.h
View file

@ -264,7 +264,6 @@ namespace Language_ro {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune failed! Bad extruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed! Temperature too high.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune failed! Timeout.");
LSTR MSG_SELECT = _UxGT("Select");
LSTR MSG_SELECT_E = _UxGT("Select *");
LSTR MSG_ACC = _UxGT("Accel");
LSTR MSG_JERK = _UxGT("Jerk");

1
Marlin/src/lcd/language/language_ru.h
View file

@ -386,7 +386,6 @@ namespace Language_ru {
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Сбой автоподбора! Температура повышена.");
LSTR MSG_PID_TIMEOUT = _UxGT("Сбой автоподбора! Завершение времени.");
LSTR MSG_SELECT = _UxGT("Выбор");
LSTR MSG_SELECT_E = _UxGT("Выбор *");
LSTR MSG_ACC = _UxGT("Ускорение");
LSTR MSG_JERK = _UxGT("Рывок");

1
Marlin/src/lcd/language/language_sk.h
View file

@ -368,7 +368,6 @@ namespace Language_sk {
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Rozliš. senz. *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("H okolia *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("H vent. okolia *");
LSTR MSG_SELECT = _UxGT("Vybrať");
LSTR MSG_SELECT_E = _UxGT("Vybrať *");
LSTR MSG_ACC = _UxGT("Zrýchlenie");
LSTR MSG_JERK = _UxGT("Skok");

1
Marlin/src/lcd/language/language_sv.h
View file

@ -294,7 +294,6 @@ namespace Language_sv {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autojustera misslyckad! Dålig extruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autojustera misslyckad! Temperatur för hög.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autojustera misslyckad! Tidsgräns.");
LSTR MSG_SELECT = _UxGT("Välj");
LSTR MSG_SELECT_E = _UxGT("Välj *");
LSTR MSG_ACC = _UxGT("Accel");
LSTR MSG_JERK = _UxGT("Ryck");

1
Marlin/src/lcd/language/language_tr.h
View file

@ -256,7 +256,6 @@ namespace Language_tr {
LSTR MSG_LCD_OFF = _UxGT("Kapalı");
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Kalibrasyon");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Kalibrasyon *");
LSTR MSG_SELECT = _UxGT("Seç");
LSTR MSG_SELECT_E = _UxGT("Seç *");
LSTR MSG_ACC = _UxGT("İvme");

1
Marlin/src/lcd/language/language_uk.h
View file

@ -391,7 +391,6 @@ namespace Language_uk {
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Збій автопідбору! Температура завищена.");
LSTR MSG_PID_TIMEOUT = _UxGT("Збій автопідбору! Вичерпан час.");
LSTR MSG_SELECT = _UxGT("Вибрати");
LSTR MSG_SELECT_E = _UxGT("Вибрати *");
LSTR MSG_ACC = _UxGT("Прискорорення");
LSTR MSG_JERK = _UxGT("Ривок");

1
Marlin/src/lcd/language/language_vi.h
View file

@ -224,7 +224,6 @@ namespace Language_vi {
LSTR MSG_AUTOTEMP = _UxGT("Nhiệt độ tự động"); // Autotemp
LSTR MSG_LCD_ON = _UxGT("Bật"); // on
LSTR MSG_LCD_OFF = _UxGT("Tắt"); // off
LSTR MSG_SELECT = _UxGT("Lựa"); // Select
LSTR MSG_SELECT_E = _UxGT("Lựa *");
LSTR MSG_ACC = _UxGT("Tăng Tốc");
LSTR MSG_JERK = _UxGT("Giật");

1
Marlin/src/lcd/language/language_zh_CN.h
View file

@ -264,7 +264,6 @@ namespace Language_zh_CN {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("自动调失败! 坏的挤出机");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("自动调失败! 温度太高");
LSTR MSG_PID_TIMEOUT = _UxGT("自动调失败! 超时");
LSTR MSG_SELECT = _UxGT("选择"); // "Select"
LSTR MSG_SELECT_E = _UxGT("选择 *");
LSTR MSG_ACC = _UxGT("加速度"); // "Accel" acceleration
LSTR MSG_JERK = _UxGT("抖动速率"); // "Jerk"

1
Marlin/src/lcd/language/language_zh_TW.h
View file

@ -249,7 +249,6 @@ namespace Language_zh_TW {
LSTR MSG_LCD_ON = _UxGT("開 "); // "On"
LSTR MSG_LCD_OFF = _UxGT("關 "); // "Off"
LSTR MSG_SELECT = _UxGT("選擇"); // "Select"
LSTR MSG_SELECT_E = _UxGT("選擇 *");
LSTR MSG_ACC = _UxGT("加速度"); // "Accel" acceleration
LSTR MSG_JERK = _UxGT("抖動速率"); // "Jerk"

18
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -246,25 +246,15 @@ void menu_move() {
#endif
}
#elif EXTRUDERS == 3
if (active_extruder < 2) {
if (active_extruder)
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
else
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
}
if (active_extruder < 2)
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
#else
if (active_extruder)
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
else
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
#endif
#elif ENABLED(DUAL_X_CARRIAGE)
if (active_extruder)
GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
else
GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
GCODES_ITEM_N(1 - active_extruder, MSG_SELECT_E, active_extruder ? F("T0") : F("T1"));
#endif

2
Marlin/src/module/probe.h
View file

@ -50,7 +50,7 @@
#endif
#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
#define Z_POST_CLEARANCE HMI_data.z_after_homing;
#define Z_POST_CLEARANCE HMI_data.z_after_homing
#elif defined(Z_AFTER_HOMING)
#define Z_POST_CLEARANCE Z_AFTER_HOMING
#elif defined(Z_HOMING_HEIGHT)