Sfoglia il codice sorgente

🩹 Fix ProUI LED compile (#24473)

GHGiampy 3 anni fa
parent
commit
30ec700a1d
Nessun account collegato all'indirizzo email del committer

+ 9
- 5
Marlin/src/lcd/e3v2/proui/dwin.cpp Vedi File

@@ -1843,10 +1843,10 @@ void DWIN_CopySettingsFrom(const char * const buff) {
1843 1843
   TERN_(BAUD_RATE_GCODE, HMI_SetBaudRate());
1844 1844
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
1845 1845
     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)
1850 1850
     );
1851 1851
     leds.update();
1852 1852
   #endif
@@ -2267,7 +2267,11 @@ void SetPID(celsius_t t, heater_id_t h) {
2267 2267
     }
2268 2268
   #endif
2269 2269
   #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
+    }
2271 2275
     void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); }
2272 2276
     void LiveLEDColorR() { LiveLEDColor(&leds.color.r); }
2273 2277
     void LiveLEDColorG() { LiveLEDColor(&leds.color.g); }

+ 3
- 6
Marlin/src/lcd/e3v2/proui/dwin_defines.h Vedi File

@@ -64,10 +64,7 @@
64 64
 #define Def_Coordinate_Color  Color_White
65 65
 #define Def_Button_Color      RGB( 0, 23, 16)
66 66
 #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()
71 68
 #endif
72 69
 
73 70
 typedef struct {
@@ -110,12 +107,12 @@ typedef struct {
110 107
     bool Baud115K = false;
111 108
   #endif
112 109
   bool FullManualTramming = false;
113
-  // Led
114 110
   #if ENABLED(MESH_BED_LEVELING)
115 111
     float ManualZOffset = 0;
116 112
   #endif
113
+  // Led
117 114
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
118
-    uint32_t LED_Color = Def_Leds_Color;
115
+    LEDColor Led_Color = Def_Leds_Color;
119 116
   #endif
120 117
 } HMI_data_t;
121 118
 

Loading…
Annulla
Salva