Skip to content

Commit 2f98954

Browse files
GHGiampyLCh-77
authored andcommitted
🩹 Fix ProUI LED compile (MarlinFirmware#24473)
1 parent 43e7b35 commit 2f98954

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -1843,10 +1843,10 @@ void DWIN_CopySettingsFrom(const char * const buff) {
18431843
TERN_(BAUD_RATE_GCODE, HMI_SetBaudRate());
18441844
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
18451845
leds.set_color(
1846-
(HMI_data.LED_Color >> 16) & 0xFF,
1847-
(HMI_data.LED_Color >> 8) & 0xFF,
1848-
(HMI_data.LED_Color >> 0) & 0xFF
1849-
OPTARG(HAS_WHITE_LED, (HMI_data.LED_Color >> 24) & 0xFF)
1846+
HMI_data.Led_Color.r,
1847+
HMI_data.Led_Color.g,
1848+
HMI_data.Led_Color.b
1849+
OPTARG(HAS_WHITE_LED, HMI_data.Led_Color.w)
18501850
);
18511851
leds.update();
18521852
#endif
@@ -2267,7 +2267,11 @@ void SetPID(celsius_t t, heater_id_t h) {
22672267
}
22682268
#endif
22692269
#if HAS_COLOR_LEDS
2270-
void ApplyLEDColor() { HMI_data.LED_Color = TERN0(HAS_WHITE_LED, (leds.color.w << 24)) | (leds.color.r << 16) | (leds.color.g << 8) | leds.color.b; }
2270+
void ApplyLEDColor() {
2271+
HMI_data.Led_Color = LEDColor(
2272+
TERN(HAS_WHITE_LED, { 0, 0, 0, leds.color.w }, { leds.color.r, leds.color.g, leds.color.b })
2273+
);
2274+
}
22712275
void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); }
22722276
void LiveLEDColorR() { LiveLEDColor(&leds.color.r); }
22732277
void LiveLEDColorG() { LiveLEDColor(&leds.color.g); }

Marlin/src/lcd/e3v2/proui/dwin_defines.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@
6464
#define Def_Coordinate_Color Color_White
6565
#define Def_Button_Color RGB( 0, 23, 16)
6666
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
67-
#define Def_Leds_Color 0xFFFFFFFF
68-
#endif
69-
#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
70-
#define Def_CaseLight_Brightness 255
67+
#define Def_Leds_Color LEDColorWhite()
7168
#endif
7269

7370
typedef struct {
@@ -110,12 +107,12 @@ typedef struct {
110107
bool Baud115K = false;
111108
#endif
112109
bool FullManualTramming = false;
113-
// Led
114110
#if ENABLED(MESH_BED_LEVELING)
115111
float ManualZOffset = 0;
116112
#endif
113+
// Led
117114
#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
118-
uint32_t LED_Color = Def_Leds_Color;
115+
LEDColor Led_Color = Def_Leds_Color;
119116
#endif
120117
} HMI_data_t;
121118

0 commit comments

Comments
 (0)