Skip to content

Commit cc8f7c8

Browse files
classicrocker883thinkyhead
classicrocker883
and
thinkyhead
authored
🚸 Fix, clean up ProUI (MarlinFirmware#26434)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 20445b8 commit cc8f7c8

14 files changed

+141
-99
lines changed

‎Marlin/src/inc/Conditionals_post.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2491,15 +2491,9 @@
24912491
// PID heating
24922492
#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
24932493
#define HAS_PID_HEATING 1
2494-
#endif
2495-
2496-
#if ENABLED(DWIN_LCD_PROUI)
2497-
#if ANY(PIDTEMP, PIDTEMPBED)
2494+
#if ENABLED(DWIN_LCD_PROUI) && ANY(PIDTEMP, PIDTEMPBED)
24982495
#define PROUI_PID_TUNE 1
24992496
#endif
2500-
#if ANY(PROUI_PID_TUNE, MPC_AUTOTUNE) && DISABLED(DISABLE_TUNING_GRAPH)
2501-
#define PROUI_TUNING_GRAPH 1
2502-
#endif
25032497
#endif
25042498

25052499
// Thermal protection

‎Marlin/src/inc/SanityCheck.h

+3-13
Original file line numberDiff line numberDiff line change
@@ -1533,15 +1533,15 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
15331533
* Allow only one bed leveling option to be defined
15341534
*/
15351535
#if MANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
1536-
#error "Select only one of: MESH_BED_LEVELING, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
1536+
#error "Select only one of: MESH_BED_LEVELING, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
15371537
#endif
15381538

15391539
/**
15401540
* Bed Leveling Requirements
15411541
*/
15421542

15431543
#if IS_SCARA && ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
1544-
#error "SCARA machines can only use AUTO_BED_LEVELING_BILINEAR or MESH_BED_LEVELING leveling."
1544+
#error "SCARA machines can only use AUTO_BED_LEVELING_BILINEAR or MESH_BED_LEVELING."
15451545
#elif ENABLED(AUTO_BED_LEVELING_LINEAR) && !(WITHIN(GRID_MAX_POINTS_X, 2, 255) && WITHIN(GRID_MAX_POINTS_Y, 2, 255))
15461546
#error "GRID_MAX_POINTS_[XY] must be between 2 and 255 with AUTO_BED_LEVELING_LINEAR."
15471547
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) && !(WITHIN(GRID_MAX_POINTS_X, 3, 255) && WITHIN(GRID_MAX_POINTS_Y, 3, 255))
@@ -1610,7 +1610,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
16101610
#elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
16111611
#error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
16121612
#elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
1613-
#error "MESH_EDIT_MENU requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
1613+
#error "MESH_EDIT_MENU requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
16141614
#endif
16151615
#endif
16161616

@@ -2746,16 +2746,6 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
27462746
#error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
27472747
#elif ALL(LCD_BED_LEVELING, PROBE_MANUALLY)
27482748
#error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2749-
#elif ENABLED(MEDIASORT_MENU_ITEM) && DISABLED(SDCARD_SORT_ALPHA)
2750-
#error "MEDIASORT_MENU_ITEM requires SDCARD_SORT_ALPHA."
2751-
#elif ENABLED(RUNOUT_TUNE_ITEM) && DISABLED(HAS_FILAMENT_SENSOR)
2752-
#error "RUNOUT_TUNE_ITEM requires HAS_FILAMENT_SENSOR."
2753-
#elif ENABLED(PLR_TUNE_ITEM) && DISABLED(POWER_LOSS_RECOVERY)
2754-
#error "PLR_TUNE_ITEM requires POWER_LOSS_RECOVERY."
2755-
#elif ENABLED(JD_TUNE_ITEM) && DISABLED(HAS_JUNCTION_DEVIATION)
2756-
#error "JD_TUNE_ITEM requires HAS_JUNCTION_DEVIATION."
2757-
#elif ENABLED(ADVK_TUNE_ITEM) && DISABLED(LIN_ADVANCE)
2758-
#error "ADVK_TUNE_ITEM requires LIN_ADVANCE."
27592749
#endif
27602750
#endif
27612751

‎Marlin/src/lcd/e3v2/jyersui/dwin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ class TextScroller {
389389

390390
// Draw value text on
391391
if (viewer_print_value) {
392-
xy_int8_t offset { 0, cell_height_px / 2 - 6 };
392+
xy_int_t offset { 0, cell_height_px / 2 - 6 };
393393
if (isnan(bedlevel.z_values[x][y])) { // undefined
394394
dwinDrawString(false, font6x12, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset.y, F("X"));
395395
}

‎Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ float BedLevelTools::getMinValue() {
200200
bool BedLevelTools::meshValidate() {
201201
GRID_LOOP(x, y) {
202202
const float v = bedlevel.z_values[x][y];
203-
if (isnan(v) || !WITHIN(v, UBL_Z_OFFSET_MIN, UBL_Z_OFFSET_MAX)) return false;
203+
if (isnan(v) || !WITHIN(v, Z_OFFSET_MIN, Z_OFFSET_MAX)) return false;
204204
}
205205
return true;
206206
}
@@ -247,7 +247,7 @@ bool BedLevelTools::meshValidate() {
247247
// Draw value text on
248248
const uint8_t fs = DWINUI::fontWidth(meshfont);
249249
if (viewer_print_value) {
250-
xy_int8_t offset { 0, cell_height_px / 2 - fs };
250+
xy_int_t offset { 0, cell_height_px / 2 - fs };
251251
if (isnan(bedlevel.z_values[x][y])) { // undefined
252252
dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset.y, F("X"));
253253
}

‎Marlin/src/lcd/e3v2/proui/bedlevel_tools.h

-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747

4848
#include "../../../inc/MarlinConfigPre.h"
4949

50-
#define UBL_Z_OFFSET_MIN -3.0
51-
#define UBL_Z_OFFSET_MAX 3.0
52-
5350
class BedLevelTools {
5451
public:
5552
#if ENABLED(USE_GRID_MESHVIEWER)

‎Marlin/src/lcd/e3v2/proui/dwin.cpp

+30-39
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131

3232
#if ENABLED(DWIN_LCD_PROUI)
3333

34+
#include "dwin.h"
35+
#include "menus.h"
36+
#include "dwin_popup.h"
37+
3438
#include "../../utf8.h"
3539
#include "../../marlinui.h"
3640
#include "../../../MarlinCore.h"
@@ -105,10 +109,6 @@
105109
#include "../../../feature/tmc_util.h"
106110
#endif
107111

108-
#include "dwin.h"
109-
#include "menus.h"
110-
#include "dwin_popup.h"
111-
112112
#if HAS_GCODE_PREVIEW
113113
#include "gcode_preview.h"
114114
#endif
@@ -268,7 +268,7 @@ Menu *stepsMenu = nullptr;
268268
#endif
269269
#if HAS_MESH
270270
Menu *meshMenu = nullptr;
271-
#if ENABLED(MESH_EDIT_MENU)
271+
#if ENABLED(PROUI_MESH_EDIT)
272272
Menu *editMeshMenu = nullptr;
273273
#endif
274274
#endif
@@ -847,7 +847,7 @@ void updateVariable() {
847847

848848
bool DWIN_lcd_sd_status = false;
849849

850-
#if ENABLED(MEDIASORT_MENU_ITEM)
850+
#if ENABLED(PROUI_MEDIASORT)
851851
void setMediaSort() {
852852
toggleCheckboxLine(hmiData.mediaSort);
853853
card.setSortOn(hmiData.mediaSort ? TERN(SDSORT_REVERSE, AS_REV, AS_FWD) : AS_OFF);
@@ -985,9 +985,8 @@ void drawPrintFileMenu() {
985985
if (card.isMounted()) {
986986
if (SET_MENU(fileMenu, MSG_MEDIA_MENU, nr_sd_menu_items() + 1)) {
987987
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)
989989
menuItemAdd(onDrawFileName, onClickSDItem);
990-
}
991990
}
992991
updateMenu(fileMenu);
993992
TERN_(DASH_REDRAW, dwinRedrawDash());
@@ -1022,7 +1021,6 @@ void hmiSDCardUpdate() {
10221021
*/
10231022

10241023
void dwinDrawDashboard() {
1025-
10261024
dwinDrawRectangle(1, hmiData.colorBackground, 0, STATUS_Y + 21, DWIN_WIDTH, DWIN_HEIGHT - 1);
10271025
dwinDrawRectangle(1, hmiData.colorSplitLine, 0, 449, DWIN_WIDTH, 451);
10281026

@@ -1067,7 +1065,7 @@ void dwinDrawDashboard() {
10671065
void drawInfoMenu() {
10681066
DWINUI::clearMainArea();
10691067
if (hmiIsChinese())
1070-
title.frameCopy(30, 17, 28, 13); // "Info"
1068+
title.frameCopy(30, 17, 28, 13); // "Info"
10711069
else
10721070
title.showCaption(GET_TEXT_F(MSG_INFO_SCREEN));
10731071
drawMenuLine(0, ICON_Back, GET_TEXT_F(MSG_BACK), false, true);
@@ -1124,7 +1122,7 @@ void hmiMainMenu() {
11241122
if (hmiData.mediaAutoMount) {
11251123
card.mount();
11261124
safe_delay(800);
1127-
};
1125+
}
11281126
drawPrintFileMenu();
11291127
break;
11301128
case PAGE_PREPARE: drawPrepareMenu(); break;
@@ -1759,7 +1757,7 @@ void dwinSetDataDefaults() {
17591757
#if ALL(LCD_BED_TRAMMING, HAS_BED_PROBE)
17601758
hmiData.fullManualTramming = DISABLED(BED_TRAMMING_USE_PROBE);
17611759
#endif
1762-
#if ENABLED(MEDIASORT_MENU_ITEM)
1760+
#if ENABLED(PROUI_MEDIASORT)
17631761
hmiData.mediaSort = true;
17641762
card.setSortOn(TERN(SDSORT_REVERSE, AS_REV, AS_FWD));
17651763
#endif
@@ -2710,7 +2708,7 @@ void onDrawGetColorItem(MenuItem* menuitem, int8_t line) {
27102708
dwinDrawRectangle(0, hmiData.colorHighlight, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
27112709
dwinDrawRectangle(1, color, ICOX + 2, MBASE(line) - 1 + 2, ICOX + 17, MBASE(line) - 1 + 17);
27122710
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]);
27142712
dwinDrawHLine(hmiData.colorSplitLine, 16, MYPOS(line + 1), 240);
27152713
}
27162714

@@ -2976,10 +2974,6 @@ void onDrawAcc(MenuItem* menuitem, int8_t line) {
29762974

29772975
#endif
29782976

2979-
#if HAS_ONESTEP_LEVELING
2980-
void onDrawManualTramming(MenuItem* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, hmiData.fullManualTramming); }
2981-
#endif
2982-
29832977
// Menu Creation and Drawing functions ======================================================
29842978

29852979
frame_rect_t selrect(frame_rect_t) {
@@ -3130,7 +3124,7 @@ void drawAdvancedSettingsMenu() {
31303124
#if HAS_GCODE_PREVIEW
31313125
EDIT_ITEM(ICON_File, MSG_HAS_PREVIEW, onDrawChkbMenu, setPreview, &hmiData.enablePreview);
31323126
#endif
3133-
#if ENABLED(MEDIASORT_MENU_ITEM)
3127+
#if ENABLED(PROUI_MEDIASORT)
31343128
EDIT_ITEM(ICON_File, MSG_MEDIA_SORT, onDrawChkbMenu, setMediaSort, &hmiData.mediaSort);
31353129
#endif
31363130
EDIT_ITEM(ICON_File, MSG_MEDIA_UPDATE, onDrawChkbMenu, setMediaAutoMount, &hmiData.mediaAutoMount);
@@ -3323,16 +3317,16 @@ void drawTuneMenu() {
33233317
#if HAS_FILAMENT_SENSOR
33243318
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
33253319
#endif
3326-
#if ENABLED(PLR_TUNE_ITEM)
3320+
#if ENABLED(PROUI_ITEM_PLR)
33273321
EDIT_ITEM(ICON_Pwrlossr, MSG_OUTAGE_RECOVERY, onDrawChkbMenu, setPwrLossr, &recovery.enabled);
33283322
#endif
33293323
#if ENABLED(FWRETRACT)
33303324
MENU_ITEM(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, drawFWRetractMenu);
33313325
#endif
3332-
#if ENABLED(JD_TUNE_ITEM)
3326+
#if ENABLED(PROUI_ITEM_JD)
33333327
EDIT_ITEM(ICON_JDmm, MSG_JUNCTION_DEVIATION, onDrawPFloat3Menu, setJDmm, &planner.junction_deviation_mm);
33343328
#endif
3335-
#if ENABLED(ADVK_TUNE_ITEM)
3329+
#if ENABLED(PROUI_ITEM_ADVK)
33363330
EDIT_ITEM(ICON_MaxAccelerated, MSG_ADVANCE_K, onDrawPFloat3Menu, setLA_K, &planner.extruder_advance_K[0]);
33373331
#endif
33383332
#if HAS_LOCKSCREEN
@@ -3669,24 +3663,24 @@ void drawStepsMenu() {
36693663

36703664
void selColor() {
36713665
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
36753669
drawGetColorMenu();
36763670
}
36773671

36783672
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);
36813675
dwinDrawRectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
36823676
}
36833677
void setRGBColor() {
36843678
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);
36863680
}
36873681

36883682
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);
36903684
DWINUI::setColors(hmiData.colorText, hmiData.colorBackground, hmiData.colorStatusBg);
36913685
drawSelectColorsMenu();
36923686
hash_changed = true;
@@ -3952,16 +3946,13 @@ void drawStepsMenu() {
39523946
void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
39533947
#endif
39543948

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(); }
39603951
void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; }
39613952
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); }
39653956
void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
39663957
#endif
39673958

@@ -4029,16 +4020,16 @@ void drawStepsMenu() {
40294020
MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt);
40304021
MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh);
40314022
#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);
40344025
MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu);
40354026
#endif
40364027
MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer);
40374028
}
40384029
updateMenu(meshMenu);
40394030
}
40404031

4041-
#if ENABLED(MESH_EDIT_MENU)
4032+
#if ENABLED(PROUI_MESH_EDIT)
40424033
void drawEditMeshMenu() {
40434034
if (!leveling_is_valid()) { LCD_MESSAGE(MSG_UBL_MESH_INVALID); return; }
40444035
set_bed_leveling_enabled(false);

‎Marlin/src/lcd/e3v2/proui/dwin.h

+29-9
Original file line numberDiff line numberDiff line change
@@ -134,30 +134,50 @@ typedef struct {
134134
#if ENABLED(BAUD_RATE_GCODE)
135135
bool baud115K = false;
136136
#endif
137-
138-
bool fullManualTramming = false;
139-
bool mediaSort = true;
137+
#if ALL(LCD_BED_TRAMMING, HAS_BED_PROBE)
138+
bool fullManualTramming = false;
139+
#endif
140+
#if ENABLED(PROUI_MEDIASORT)
141+
bool mediaSort = true;
142+
#endif
140143
bool mediaAutoMount = ENABLED(HAS_SD_EXTENDER);
141144
#if ALL(INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
142145
uint8_t zAfterHoming = DEF_Z_AFTER_HOMING;
143146
#endif
144147
#if ALL(LED_CONTROL_MENU, HAS_COLOR_LEDS)
145148
LEDColor ledColor = defColorLeds;
146149
#endif
147-
bool adaptiveStepSmoothing = true;
148-
bool enablePreview = true;
150+
#if ENABLED(ADAPTIVE_STEP_SMOOTHING)
151+
bool adaptiveStepSmoothing = true;
152+
#endif
153+
#if HAS_GCODE_PREVIEW
154+
bool enablePreview = true;
155+
#endif
149156
} hmi_data_t;
150157

151158
extern hmi_data_t hmiData;
152159
static constexpr size_t eeprom_data_size = sizeof(hmi_data_t);
153160

154161
typedef struct {
155-
int8_t Color[3]; // Color components
162+
int8_t r, g, b;
163+
void set(int8_t _r, int8_t _g, int8_t _b) { r = _r; g = _g; b = _b; }
164+
int8_t& operator[](const int i) {
165+
switch (i) {
166+
default:
167+
case 0: return r;
168+
case 1: return g;
169+
case 2: return b;
170+
}
171+
}
172+
} rgb_t;
173+
174+
typedef struct {
175+
rgb_t color; // Color
156176
#if ANY(PROUI_PID_TUNE, MPCTEMP)
157177
tempcontrol_t tempControl = AUTOTUNE_DONE;
158178
#endif
159-
uint8_t select = 0; // Auxiliary selector variable
160-
AxisEnum axis = X_AXIS; // Axis Select
179+
uint8_t select = 0; // Auxiliary selector variable
180+
AxisEnum axis = X_AXIS; // Axis Select
161181
} hmi_value_t;
162182

163183
typedef struct {
@@ -336,7 +356,7 @@ void drawStepsMenu();
336356
#endif
337357
#if HAS_MESH
338358
void drawMeshSetMenu();
339-
#if ENABLED(MESH_EDIT_MENU)
359+
#if ENABLED(PROUI_MESH_EDIT)
340360
void drawEditMeshMenu();
341361
#endif
342362
#endif

0 commit comments

Comments
 (0)