|
31 | 31 |
|
32 | 32 | #if ENABLED(DWIN_LCD_PROUI)
|
33 | 33 |
|
| 34 | +#include "dwin.h" |
| 35 | +#include "menus.h" |
| 36 | +#include "dwin_popup.h" |
| 37 | + |
34 | 38 | #include "../../utf8.h"
|
35 | 39 | #include "../../marlinui.h"
|
36 | 40 | #include "../../../MarlinCore.h"
|
|
105 | 109 | #include "../../../feature/tmc_util.h"
|
106 | 110 | #endif
|
107 | 111 |
|
108 |
| -#include "dwin.h" |
109 |
| -#include "menus.h" |
110 |
| -#include "dwin_popup.h" |
111 |
| - |
112 | 112 | #if HAS_GCODE_PREVIEW
|
113 | 113 | #include "gcode_preview.h"
|
114 | 114 | #endif
|
@@ -268,7 +268,7 @@ Menu *stepsMenu = nullptr;
|
268 | 268 | #endif
|
269 | 269 | #if HAS_MESH
|
270 | 270 | Menu *meshMenu = nullptr;
|
271 |
| - #if ENABLED(MESH_EDIT_MENU) |
| 271 | + #if ENABLED(PROUI_MESH_EDIT) |
272 | 272 | Menu *editMeshMenu = nullptr;
|
273 | 273 | #endif
|
274 | 274 | #endif
|
@@ -847,7 +847,7 @@ void updateVariable() {
|
847 | 847 |
|
848 | 848 | bool DWIN_lcd_sd_status = false;
|
849 | 849 |
|
850 |
| -#if ENABLED(MEDIASORT_MENU_ITEM) |
| 850 | +#if ENABLED(PROUI_MEDIASORT) |
851 | 851 | void setMediaSort() {
|
852 | 852 | toggleCheckboxLine(hmiData.mediaSort);
|
853 | 853 | card.setSortOn(hmiData.mediaSort ? TERN(SDSORT_REVERSE, AS_REV, AS_FWD) : AS_OFF);
|
@@ -985,9 +985,8 @@ void drawPrintFileMenu() {
|
985 | 985 | if (card.isMounted()) {
|
986 | 986 | if (SET_MENU(fileMenu, MSG_MEDIA_MENU, nr_sd_menu_items() + 1)) {
|
987 | 987 | BACK_ITEM(gotoMainMenu);
|
988 |
| - for (uint8_t i = 0; i < nr_sd_menu_items(); ++i) { |
| 988 | + for (uint8_t i = 0; i < nr_sd_menu_items(); ++i) |
989 | 989 | menuItemAdd(onDrawFileName, onClickSDItem);
|
990 |
| - } |
991 | 990 | }
|
992 | 991 | updateMenu(fileMenu);
|
993 | 992 | TERN_(DASH_REDRAW, dwinRedrawDash());
|
@@ -1022,7 +1021,6 @@ void hmiSDCardUpdate() {
|
1022 | 1021 | */
|
1023 | 1022 |
|
1024 | 1023 | void dwinDrawDashboard() {
|
1025 |
| - |
1026 | 1024 | dwinDrawRectangle(1, hmiData.colorBackground, 0, STATUS_Y + 21, DWIN_WIDTH, DWIN_HEIGHT - 1);
|
1027 | 1025 | dwinDrawRectangle(1, hmiData.colorSplitLine, 0, 449, DWIN_WIDTH, 451);
|
1028 | 1026 |
|
@@ -1067,7 +1065,7 @@ void dwinDrawDashboard() {
|
1067 | 1065 | void drawInfoMenu() {
|
1068 | 1066 | DWINUI::clearMainArea();
|
1069 | 1067 | if (hmiIsChinese())
|
1070 |
| - title.frameCopy(30, 17, 28, 13); // "Info" |
| 1068 | + title.frameCopy(30, 17, 28, 13); // "Info" |
1071 | 1069 | else
|
1072 | 1070 | title.showCaption(GET_TEXT_F(MSG_INFO_SCREEN));
|
1073 | 1071 | drawMenuLine(0, ICON_Back, GET_TEXT_F(MSG_BACK), false, true);
|
@@ -1124,7 +1122,7 @@ void hmiMainMenu() {
|
1124 | 1122 | if (hmiData.mediaAutoMount) {
|
1125 | 1123 | card.mount();
|
1126 | 1124 | safe_delay(800);
|
1127 |
| - }; |
| 1125 | + } |
1128 | 1126 | drawPrintFileMenu();
|
1129 | 1127 | break;
|
1130 | 1128 | case PAGE_PREPARE: drawPrepareMenu(); break;
|
@@ -1759,7 +1757,7 @@ void dwinSetDataDefaults() {
|
1759 | 1757 | #if ALL(LCD_BED_TRAMMING, HAS_BED_PROBE)
|
1760 | 1758 | hmiData.fullManualTramming = DISABLED(BED_TRAMMING_USE_PROBE);
|
1761 | 1759 | #endif
|
1762 |
| - #if ENABLED(MEDIASORT_MENU_ITEM) |
| 1760 | + #if ENABLED(PROUI_MEDIASORT) |
1763 | 1761 | hmiData.mediaSort = true;
|
1764 | 1762 | card.setSortOn(TERN(SDSORT_REVERSE, AS_REV, AS_FWD));
|
1765 | 1763 | #endif
|
@@ -2710,7 +2708,7 @@ void onDrawGetColorItem(MenuItem* menuitem, int8_t line) {
|
2710 | 2708 | dwinDrawRectangle(0, hmiData.colorHighlight, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
|
2711 | 2709 | dwinDrawRectangle(1, color, ICOX + 2, MBASE(line) - 1 + 2, ICOX + 17, MBASE(line) - 1 + 17);
|
2712 | 2710 | DWINUI::drawString(LBLX, MBASE(line) - 1, menuitem->caption);
|
2713 |
| - drawMenuIntValue(hmiData.colorBackground, line, 4, hmiValue.Color[i]); |
| 2711 | + drawMenuIntValue(hmiData.colorBackground, line, 4, hmiValue.color[i]); |
2714 | 2712 | dwinDrawHLine(hmiData.colorSplitLine, 16, MYPOS(line + 1), 240);
|
2715 | 2713 | }
|
2716 | 2714 |
|
@@ -2976,10 +2974,6 @@ void onDrawAcc(MenuItem* menuitem, int8_t line) {
|
2976 | 2974 |
|
2977 | 2975 | #endif
|
2978 | 2976 |
|
2979 |
| -#if HAS_ONESTEP_LEVELING |
2980 |
| - void onDrawManualTramming(MenuItem* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, hmiData.fullManualTramming); } |
2981 |
| -#endif |
2982 |
| - |
2983 | 2977 | // Menu Creation and Drawing functions ======================================================
|
2984 | 2978 |
|
2985 | 2979 | frame_rect_t selrect(frame_rect_t) {
|
@@ -3130,7 +3124,7 @@ void drawAdvancedSettingsMenu() {
|
3130 | 3124 | #if HAS_GCODE_PREVIEW
|
3131 | 3125 | EDIT_ITEM(ICON_File, MSG_HAS_PREVIEW, onDrawChkbMenu, setPreview, &hmiData.enablePreview);
|
3132 | 3126 | #endif
|
3133 |
| - #if ENABLED(MEDIASORT_MENU_ITEM) |
| 3127 | + #if ENABLED(PROUI_MEDIASORT) |
3134 | 3128 | EDIT_ITEM(ICON_File, MSG_MEDIA_SORT, onDrawChkbMenu, setMediaSort, &hmiData.mediaSort);
|
3135 | 3129 | #endif
|
3136 | 3130 | EDIT_ITEM(ICON_File, MSG_MEDIA_UPDATE, onDrawChkbMenu, setMediaAutoMount, &hmiData.mediaAutoMount);
|
@@ -3323,16 +3317,16 @@ void drawTuneMenu() {
|
3323 | 3317 | #if HAS_FILAMENT_SENSOR
|
3324 | 3318 | EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
|
3325 | 3319 | #endif
|
3326 |
| - #if ENABLED(PLR_TUNE_ITEM) |
| 3320 | + #if ENABLED(PROUI_ITEM_PLR) |
3327 | 3321 | EDIT_ITEM(ICON_Pwrlossr, MSG_OUTAGE_RECOVERY, onDrawChkbMenu, setPwrLossr, &recovery.enabled);
|
3328 | 3322 | #endif
|
3329 | 3323 | #if ENABLED(FWRETRACT)
|
3330 | 3324 | MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu);
|
3331 | 3325 | #endif
|
3332 |
| - #if ENABLED(JD_TUNE_ITEM) |
| 3326 | + #if ENABLED(PROUI_ITEM_JD) |
3333 | 3327 | EDIT_ITEM(ICON_JDmm, MSG_JUNCTION_DEVIATION, onDrawPFloat3Menu, setJDmm, &planner.junction_deviation_mm);
|
3334 | 3328 | #endif
|
3335 |
| - #if ENABLED(ADVK_TUNE_ITEM) |
| 3329 | + #if ENABLED(PROUI_ITEM_ADVK) |
3336 | 3330 | EDIT_ITEM(ICON_MaxAccelerated, MSG_ADVANCE_K, onDrawPFloat3Menu, setLA_K, &planner.extruder_advance_K[0]);
|
3337 | 3331 | #endif
|
3338 | 3332 | #if HAS_LOCKSCREEN
|
@@ -3669,24 +3663,24 @@ void drawStepsMenu() {
|
3669 | 3663 |
|
3670 | 3664 | void selColor() {
|
3671 | 3665 | menuData.intPtr = (int16_t*)static_cast<MenuItemPtr*>(currentMenu->selectedItem())->value;
|
3672 |
| - hmiValue.Color[0] = GetRColor(*menuData.intPtr); // Red |
3673 |
| - hmiValue.Color[1] = GetGColor(*menuData.intPtr); // Green |
3674 |
| - hmiValue.Color[2] = GetBColor(*menuData.intPtr); // Blue |
| 3666 | + hmiValue.color.r = GetRColor(*menuData.intPtr); // Red |
| 3667 | + hmiValue.color.g = GetGColor(*menuData.intPtr); // Green |
| 3668 | + hmiValue.color.b = GetBColor(*menuData.intPtr); // Blue |
3675 | 3669 | drawGetColorMenu();
|
3676 | 3670 | }
|
3677 | 3671 |
|
3678 | 3672 | void liveRGBColor() {
|
3679 |
| - hmiValue.Color[currentMenu->line() - 2] = menuData.value; |
3680 |
| - uint16_t color = RGB(hmiValue.Color[0], hmiValue.Color[1], hmiValue.Color[2]); |
| 3673 | + hmiValue.color[currentMenu->line() - 2] = menuData.value; |
| 3674 | + const uint16_t color = RGB(hmiValue.color.r, hmiValue.color.g, hmiValue.color.b); |
3681 | 3675 | dwinDrawRectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
|
3682 | 3676 | }
|
3683 | 3677 | void setRGBColor() {
|
3684 | 3678 | const uint8_t color = static_cast<MenuItem*>(currentMenu->selectedItem())->icon;
|
3685 |
| - setIntOnClick(0, (color == 1) ? 63 : 31, hmiValue.Color[color], nullptr, liveRGBColor); |
| 3679 | + setIntOnClick(0, (color == 1) ? 63 : 31, hmiValue.color[color], nullptr, liveRGBColor); |
3686 | 3680 | }
|
3687 | 3681 |
|
3688 | 3682 | void dwinApplyColor() {
|
3689 |
| - *menuData.intPtr = RGB(hmiValue.Color[0], hmiValue.Color[1], hmiValue.Color[2]); |
| 3683 | + *menuData.intPtr = RGB(hmiValue.color.r, hmiValue.color.g, hmiValue.color.b); |
3690 | 3684 | DWINUI::setColors(hmiData.colorText, hmiData.colorBackground, hmiData.colorStatusBg);
|
3691 | 3685 | drawSelectColorsMenu();
|
3692 | 3686 | hash_changed = true;
|
@@ -3952,16 +3946,13 @@ void drawStepsMenu() {
|
3952 | 3946 | void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
|
3953 | 3947 | #endif
|
3954 | 3948 |
|
3955 |
| - #if ENABLED(MESH_EDIT_MENU) |
3956 |
| - #define Z_OFFSET_MIN -3 |
3957 |
| - #define Z_OFFSET_MAX 3 |
3958 |
| - |
3959 |
| - void LiveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } |
| 3949 | + #if ENABLED(PROUI_MESH_EDIT) |
| 3950 | + void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); } |
3960 | 3951 | void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; }
|
3961 | 3952 | void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; }
|
3962 |
| - void ResetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } |
3963 |
| - void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, LiveEditMesh); } |
3964 |
| - void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, LiveEditMesh); } |
| 3953 | + void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); } |
| 3954 | + void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); } |
| 3955 | + void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); } |
3965 | 3956 | void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
|
3966 | 3957 | #endif
|
3967 | 3958 |
|
@@ -4029,16 +4020,16 @@ void drawStepsMenu() {
|
4029 | 4020 | MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt);
|
4030 | 4021 | MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh);
|
4031 | 4022 | #endif
|
4032 |
| - #if ENABLED(MESH_EDIT_MENU) |
4033 |
| - MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, ResetMesh); |
| 4023 | + #if ENABLED(PROUI_MESH_EDIT) |
| 4024 | + MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh); |
4034 | 4025 | MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu);
|
4035 | 4026 | #endif
|
4036 | 4027 | MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer);
|
4037 | 4028 | }
|
4038 | 4029 | updateMenu(meshMenu);
|
4039 | 4030 | }
|
4040 | 4031 |
|
4041 |
| - #if ENABLED(MESH_EDIT_MENU) |
| 4032 | + #if ENABLED(PROUI_MESH_EDIT) |
4042 | 4033 | void drawEditMeshMenu() {
|
4043 | 4034 | if (!leveling_is_valid()) { LCD_MESSAGE(MSG_UBL_MESH_INVALID); return; }
|
4044 | 4035 | set_bed_leveling_enabled(false);
|
|
0 commit comments