Apply LEDColor, language fixes

Marlin/src/Marlin.cpp

@@ -775,8 +775,8 @@ void setup() {
     OUT_WRITE(STAT_LED_BLUE_PIN, LOW); // turn it off
   #endif
 
-  #if ENABLED(NEOPIXEL_LED)
+  #if HAS_COLOR_LEDS
-    setup_neopixel();
+    leds.setup();
   #endif
 
   #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)

Marlin/src/feature/leds/blinkm.cpp

@@ -21,8 +21,7 @@
  */
 
 /**
- * blinkm.cpp - Library for controlling a BlinkM over i2c
+ * blinkm.cpp - Control a BlinkM over i2c
- * Created by Tim Koster, August 21 2013.
  */
 
 #include "../../inc/MarlinConfig.h"
@@ -30,17 +29,18 @@
 #if ENABLED(BLINKM)
 
 #include "blinkm.h"
+#include "leds.h"
+#include <Wire.h>
 
-void blinkm_set_led_color(const byte r, const byte g, const byte b) {
+void blinkm_set_led_color(const LEDColor &color) {
   Wire.begin();
   Wire.beginTransmission(0x09);
   Wire.write('o');                    //to disable ongoing script, only needs to be used once
   Wire.write('n');
-  Wire.write(r);
+  Wire.write(color.r);
-  Wire.write(g);
+  Wire.write(color.g);
-  Wire.write(b);
+  Wire.write(color.b);
   Wire.endTransmission();
 }
 
 #endif // BLINKM
-

Marlin/src/feature/leds/blinkm.h

@@ -21,16 +21,15 @@
  */
 
 /**
- * blinkm.h - Library for controlling a BlinkM over i2c
+ * blinkm.h - Control a BlinkM over i2c
- * Created by Tim Koster, August 21 2013.
  */
 
-#ifndef __BLINKM_H__
+#ifndef _BLINKM_H_
-#define __BLINKM_H__
+#define _BLINKM_H_
 
-#include <Arduino.h>
+struct LEDColor;
-#include <Wire.h>
+typedef LEDColor LEDColor;
 
-void blinkm_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b);
+void blinkm_set_led_color(const LEDColor &color);
 
-#endif // __BLINKM_H__
+#endif // _BLINKM_H_

Marlin/src/feature/leds/leds.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * Marlin RGB LED general support
+ * leds.cpp - Marlin RGB LED general support
  */
 
 #include "../../inc/MarlinConfig.h"
@@ -30,102 +30,111 @@
 
 #include "leds.h"
 
+#if ENABLED(BLINKM)
+  #include "blinkm.h"
+#endif
+
+#if ENABLED(PCA9632)
+  #include "pca9632.h"
+#endif
+
+#if ENABLED(LED_COLOR_PRESETS)
+  const LEDColor LEDLights::defaultLEDColor = MakeLEDColor(
+    LED_USER_PRESET_RED,
+    LED_USER_PRESET_GREEN,
+    LED_USER_PRESET_BLUE,
+    LED_USER_PRESET_WHITE,
+    LED_USER_PRESET_BRIGHTNESS
+  );
+#endif
+
 #if ENABLED(LED_CONTROL_MENU)
-  #if ENABLED(LED_COLOR_PRESETS)
+  LEDColor LEDLights::color;
-uint8_t led_intensity_red = LED_USER_PRESET_RED,
+  bool LEDLights::lights_on;
-        led_intensity_green = LED_USER_PRESET_GREEN,
-        led_intensity_blue = LED_USER_PRESET_BLUE
-        #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
-          , led_intensity_white = LED_USER_PRESET_WHITE
-        #endif
-        #if ENABLED(NEOPIXEL_LED)
-          , led_intensity = NEOPIXEL_BRIGHTNESS
-        #endif
-        ;
-  #else
-    uint8_t led_intensity_red = 255,
-            led_intensity_green = 255,
-            led_intensity_blue = 255
-            #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
-              , led_intensity_white = 0
-            #endif
-            #if ENABLED(NEOPIXEL_LED)
-              , led_intensity = NEOPIXEL_BRIGHTNESS
-            #endif
-            ;
-  #endif
 #endif
 
-void set_led_color(
+LEDLights leds;
-  const uint8_t r, const uint8_t g, const uint8_t b
+
-    #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+void LEDLights::setup() {
-      , const uint8_t w // = 0
+  #if ENABLED(NEOPIXEL_LED)
-      #if ENABLED(NEOPIXEL_LED)
+    setup_neopixel();
-        , const uint8_t p // = NEOPIXEL_BRIGHTNESS
+  #endif
-        , const bool isSequence // = false
+  #if ENABLED(LED_USER_PRESET_STARTUP)
-      #endif
+    set_default();
-    #endif
+  #endif
+}
+
+void LEDLights::set_color(const LEDColor &incol
+  #if ENABLED(NEOPIXEL_LED)
+    , bool isSequence/*=false*/
+  #endif
 ) {
 
   #if ENABLED(NEOPIXEL_LED)
-    if ((w == 255) || ((r == 255) && (g == 255) && (b == 255))) {
+
-      neopixel_set_led_color(NEO_WHITE, p);
+    const uint32_t neocolor = pixels.Color(incol.r, incol.g, incol.b, incol.w);
+    static uint16_t nextLed = 0;
+
+    pixels.setBrightness(incol.i);
+    if (!isSequence)
+      set_neopixel_color(neocolor);
+    else {
+      pixels.setPixelColor(nextLed, neocolor);
+      pixels.show();
+      if (++nextLed >= pixels.numPixels()) nextLed = 0;
+      return;
     }
-    else
+
-      neopixel_set_led_color(r, g, b, w, p);
   #endif
 
   #if ENABLED(BLINKM)
-    blinkm_set_led_color(r, g, b); // Use i2c to send the RGB components to the device.
+
+    // This variant uses i2c to send the RGB components to the device.
+    blinkm_set_led_color(incol);
+
   #endif
 
   #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
-    // This variant uses 3 separate pins for the RGB components.
+
+    // This variant uses 3-4 separate pins for the RGB(W) components.
     // If the pins can do PWM then their intensity will be set.
-    WRITE(RGB_LED_R_PIN, r ? HIGH : LOW);
+    WRITE(RGB_LED_R_PIN, incol.r ? HIGH : LOW);
-    WRITE(RGB_LED_G_PIN, g ? HIGH : LOW);
+    WRITE(RGB_LED_G_PIN, incol.g ? HIGH : LOW);
-    WRITE(RGB_LED_B_PIN, b ? HIGH : LOW);
+    WRITE(RGB_LED_B_PIN, incol.b ? HIGH : LOW);
-    analogWrite(RGB_LED_R_PIN, r);
+    analogWrite(RGB_LED_R_PIN, incol.r);
-    analogWrite(RGB_LED_G_PIN, g);
+    analogWrite(RGB_LED_G_PIN, incol.g);
-    analogWrite(RGB_LED_B_PIN, b);
+    analogWrite(RGB_LED_B_PIN, incol.b);
 
     #if ENABLED(RGBW_LED)
-      WRITE(RGB_LED_W_PIN, w ? HIGH : LOW);
+      WRITE(RGB_LED_W_PIN, incol.w ? HIGH : LOW);
-      analogWrite(RGB_LED_W_PIN, w);
+      analogWrite(RGB_LED_W_PIN, incol.w);
     #endif
+
   #endif
 
   #if ENABLED(PCA9632)
-    pca9632_set_led_color(r, g, b); // Update I2C LED driver
+    // Update I2C LED driver
+    pca9632_set_led_color(incol);
   #endif
 
   #if ENABLED(LED_CONTROL_MENU)
-    if ((r + g + b
+    // Don't update the color when OFF
-      #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+    lights_on = !incol.is_off();
-        + w
+    if (lights_on) color = incol;
-      #endif
-    ) >= 3) {
-      led_intensity_red = r;
-      led_intensity_green = g;
-      led_intensity_blue = b;
-      #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
-        led_intensity_white = w;
-      #endif
-      #if ENABLED(NEOPIXEL_LED)
-        led_intensity = p;
-      #endif
-    }
   #endif
 }
 
-void set_led_white(){
+void LEDLights::set_white() {
+  #if ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(BLINKM) || ENABLED(PCA9632)
+    set_color(LEDColorWhite());
+  #endif
   #if ENABLED(NEOPIXEL_LED)
-    neopixel_set_led_color(NEO_WHITE, pixels.getBrightness());
+    set_neopixel_color(pixels.Color(NEO_WHITE));
-  #elif (RGBW_LED)
-    set_led_color(0, 0, 0, 255);
-  #else
-    set_led_color(255, 255, 255);
   #endif
 }
 
+#if ENABLED(LED_CONTROL_MENU)
+  void LEDLights::toggle() { if (lights_on) set_off(); else update(); }
+#endif
+
 #endif // HAS_COLOR_LEDS

Marlin/src/feature/leds/leds.h

@@ -21,7 +21,7 @@
  */
 
 /**
- * Marlin general RGB LED support
+ * leds.h - Marlin general RGB LED support
  */
 
 #ifndef __LEDS_H__
@@ -30,41 +30,140 @@
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(NEOPIXEL_LED)
-  #include <Adafruit_NeoPixel.h>
   #include "neopixel.h"
 #endif
 
-#if ENABLED(BLINKM)
+#define HAS_WHITE_LED (ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED))
-  #include "blinkm.h"
-#endif
-
-#if ENABLED(PCA9632)
-  #include "pca9632.h"
-#endif
 
-#if ENABLED(RGB_LED) || ENABLED(BLINKM) || ENABLED(PCA9632)
+/**
-  #define LED_WHITE 255, 255, 255
+ * LEDcolor type for use with leds.set_color
-#elif ENABLED(RGBW_LED)
+ */
-  #define LED_WHITE 0, 0, 0, 255
+typedef struct LEDColor {
-#endif
+  uint8_t r, g, b
+    #if HAS_WHITE_LED
+      , w
+      #if ENABLED(NEOPIXEL_LED)
+        , i
+      #endif
+    #endif
+  ;
+  LEDColor() : r(255), g(255), b(255)
+    #if HAS_WHITE_LED
+      , w(255)
+      #if ENABLED(NEOPIXEL_LED)
+        , i(NEOPIXEL_BRIGHTNESS)
+      #endif
+    #endif
+  {}
+  LEDColor(uint8_t r, uint8_t g, uint8_t b
+    #if HAS_WHITE_LED
+      , uint8_t w=0
+      #if ENABLED(NEOPIXEL_LED)
+        , uint8_t i=NEOPIXEL_BRIGHTNESS
+      #endif
+    #endif
+    ) : r(r), g(g), b(b)
+    #if HAS_WHITE_LED
+      , w(w)
+      #if ENABLED(NEOPIXEL_LED)
+        , i(i)
+      #endif
+    #endif
+  {}
+  LEDColor& operator=(const LEDColor &right) {
+    if (this != &right) memcpy(this, &right, sizeof(LEDColor));
+    return *this;
+  }
+  bool operator==(const LEDColor &right) {
+    if (this == &right) return true;
+    return 0 == memcmp(this, &right, sizeof(LEDColor));
+  }
+  bool operator!=(const LEDColor &right) { return !operator==(right); }
+  bool is_off() const {
+    return 3 > r + g + b
+      #if HAS_WHITE_LED
+        + w
+      #endif
+    ;
+  }
+} LEDColor;
 
-#if ENABLED(NEOPIXEL_LED)
+/**
-  #define LED_BRIGHTNESS pixels.getBrightness()
+ * Color helpers and presets
+ */
+#if HAS_WHITE_LED
+  #define LEDColorWhite() LEDColor(0, 0, 0, 255)
+  #if ENABLED(NEOPIXEL_LED)
+    #define MakeLEDColor(R,G,B,W,I) LEDColor(R, G, B, W, I)
+  #else
+    #define MakeLEDColor(R,G,B,W,I) LEDColor(R, G, B, W)
+  #endif
 #else
-  #define LED_BRIGHTNESS 255
+  #define MakeLEDColor(R,G,B,W,I) LEDColor(R, G, B)
+  #define LEDColorWhite() LEDColor(255, 255, 255)
 #endif
+#define LEDColorOff()     LEDColor(  0,   0,   0)
+#define LEDColorRed()     LEDColor(255,   0,   0)
+#define LEDColorOrange()  LEDColor(255,  80,   0)
+#define LEDColorYellow()  LEDColor(255, 255,   0)
+#define LEDColorGreen()   LEDColor(  0, 255,   0)
+#define LEDColorBlue()    LEDColor(  0,   0, 255)
+#define LEDColorIndigo()  LEDColor(  0, 255, 255)
+#define LEDColorViolet()  LEDColor(255,   0, 255)
+
+class LEDLights {
+public:
+  LEDLights() {} // ctor
+
+  static void setup(); // init()
 
-void set_led_color(
+  static void set_color(const LEDColor &color
-  const uint8_t r, const uint8_t g, const uint8_t b
+    #if ENABLED(NEOPIXEL_LED)
-    #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+      , bool isSequence=false
-      , const uint8_t w = 0
+    #endif
+  );
+
+  FORCE_INLINE void set_color(uint8_t r, uint8_t g, uint8_t b
+    #if HAS_WHITE_LED
+      , uint8_t w=0
       #if ENABLED(NEOPIXEL_LED)
-        , const uint8_t p = NEOPIXEL_BRIGHTNESS
+        , uint8_t i=NEOPIXEL_BRIGHTNESS
-        , const bool isSequence = false
       #endif
     #endif
-);
+    #if ENABLED(NEOPIXEL_LED)
+      , bool isSequence=false
+    #endif
+  ) {
+    set_color(MakeLEDColor(r, g, b, w, i)
+      #if ENABLED(NEOPIXEL_LED)
+        , isSequence
+      #endif
+    );
+  }
+
+  static void set_white();
+  FORCE_INLINE static void set_off()   { set_color(LEDColorOff()); }
+  FORCE_INLINE static void set_green() { set_color(LEDColorGreen()); }
+
+  #if ENABLED(LED_COLOR_PRESETS)
+    static const LEDColor defaultLEDColor;
+    FORCE_INLINE static void set_default()  { set_color(defaultLEDColor); }
+    FORCE_INLINE static void set_red()      { set_color(LEDColorRed()); }
+    FORCE_INLINE static void set_orange()   { set_color(LEDColorOrange()); }
+    FORCE_INLINE static void set_yellow()   { set_color(LEDColorYellow()); }
+    FORCE_INLINE static void set_blue()     { set_color(LEDColorBlue()); }
+    FORCE_INLINE static void set_indigo()   { set_color(LEDColorIndigo()); }
+    FORCE_INLINE static void set_violet()   { set_color(LEDColorViolet()); }
+  #endif
+
+  #if ENABLED(LED_CONTROL_MENU)
+    static LEDColor color; // last non-off color
+    static bool lights_on; // the last set color was "on"
+    static void toggle();  // swap "off" with color
+    FORCE_INLINE static void update() { set_color(color); }
+  #endif
+};
 
-void set_led_white();
+extern LEDLights leds;
 
 #endif // __LEDS_H__

Marlin/src/feature/leds/neopixel.cpp

@@ -61,6 +61,7 @@ void setup_neopixel() {
   #endif
 }
 
+#if 0
 bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p) {
   const uint32_t color = pixels.Color(r, g, b, w);
   pixels.setBrightness(p);
@@ -75,5 +76,6 @@ bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, c
     return true;
   #endif
 }
+#endif
 
 #endif // NEOPIXEL_LED

Marlin/src/feature/leds/neopixel.h

@@ -43,7 +43,7 @@
 
 void setup_neopixel();
 void set_neopixel_color(const uint32_t color);
-bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p);
+//bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p);
 
 extern Adafruit_NeoPixel pixels;
 

Marlin/src/feature/leds/pca9632.cpp

@@ -30,6 +30,8 @@
 #if ENABLED(PCA9632)
 
 #include "pca9632.h"
+#include "leds.h"
+#include <Wire.h>
 
 #define PCA9632_MODE1_VALUE   0b00000001 //(ALLCALL)
 #define PCA9632_MODE2_VALUE   0b00010101 //(DIMMING, INVERT, CHANGE ON STOP,TOTEM)
@@ -97,7 +99,7 @@ static void PCA9632_WriteAllRegisters(const byte addr, const byte regadd, const
   }
 #endif
 
-void pca9632_set_led_color(const byte r, const byte g, const byte b) {
+void pca9632_set_led_color(const LEDColor &color) {
   if (!PCA_init) {
     PCA_init = 1;
     Wire.begin();
@@ -105,11 +107,11 @@ void pca9632_set_led_color(const byte r, const byte g, const byte b) {
     PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_MODE2, PCA9632_MODE2_VALUE);
   }
 
-  const byte LEDOUT = (r ? LED_PWM << PCA9632_RED : 0)
+  const byte LEDOUT = (color.r ? LED_PWM << PCA9632_RED : 0)
-                    | (g ? LED_PWM << PCA9632_GRN : 0)
+                    | (color.g ? LED_PWM << PCA9632_GRN : 0)
-                    | (b ? LED_PWM << PCA9632_BLU : 0);
+                    | (color.b ? LED_PWM << PCA9632_BLU : 0);
 
-  PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, r, g, b);
+  PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, color.r, color.g, color.b);
   PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_LEDOUT, LEDOUT);
 }
 

Marlin/src/feature/leds/pca9632.h

@@ -20,7 +20,7 @@
  *
  */
 
-/*
+/**
  * Driver for the Philips PCA9632 LED driver.
  * Written by Robert Mendon Feb 2017.
  */
@@ -28,9 +28,9 @@
 #ifndef __PCA9632_H__
 #define __PCA9632_H__
 
-#include <Arduino.h>
+struct LEDColor;
-#include <Wire.h>
+typedef LEDColor LEDColor;
 
-void pca9632_set_led_color(const byte r, const byte g, const byte b);
+void pca9632_set_led_color(const LEDColor &color);
 
 #endif // __PCA9632_H__

Marlin/src/gcode/feature/leds/M150.cpp

@@ -45,17 +45,13 @@
  *   M150 P          ; Set LED full brightness
  */
 void GcodeSuite::M150() {
-  set_led_color(
+  leds.set_color(MakeLEDColor(
     parser.seen('R') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
     parser.seen('U') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
-    parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0
+    parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
-    #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+    parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
-      , parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0
+    parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : pixels.getBrightness()
-      #if ENABLED(NEOPIXEL_LED)
+  ));
-        , parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : pixels.getBrightness()
-      #endif
-    #endif
-  );
 }
 
 #endif // HAS_COLOR_LEDS

Marlin/src/gcode/queue.cpp

@@ -370,13 +370,13 @@ inline void get_serial_commands() {
             SERIAL_PROTOCOLLNPGM(MSG_FILE_PRINTED);
             #if ENABLED(PRINTER_EVENT_LEDS)
               LCD_MESSAGEPGM(MSG_INFO_COMPLETED_PRINTS);
-              set_led_color(0, 255, 0); // Green
+              leds.set_green();
               #if HAS_RESUME_CONTINUE
                 enqueue_and_echo_commands_P(PSTR("M0")); // end of the queue!
               #else
                 safe_delay(1000);
               #endif
-              set_led_color(0, 0, 0);   // OFF
+              leds.set_off();
             #endif
             card.checkautostart(true);
           }

Marlin/src/gcode/temperature/M104_M109.cpp

@@ -190,12 +190,10 @@ void GcodeSuite::M109() {
         const uint8_t blue = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 255, 0);
         if (blue != old_blue) {
           old_blue = blue;
-          set_led_color(255, 0, blue
+          leds.set_color(
-            #if ENABLED(NEOPIXEL_LED)
+            MakeLEDColor(255, 0, blue, 0, pixels.getBrightness())
-              , 0, pixels.getBrightness()
+            #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
-              #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
+              , true
-                , true
-              #endif
             #endif
           );
         }
@@ -233,12 +231,7 @@ void GcodeSuite::M109() {
   if (wait_for_heatup) {
     LCD_MESSAGEPGM(MSG_HEATING_COMPLETE);
     #if ENABLED(PRINTER_EVENT_LEDS)
-      #if ENABLED(RGB_LED) || ENABLED(BLINKM) || ENABLED(PCA9632) || ENABLED(RGBW_LED)
+      leds.set_white();
-        set_led_color(LED_WHITE);
-      #endif
-      #if ENABLED(NEOPIXEL_LED)
-        set_neopixel_color(pixels.Color(NEO_WHITE));
-      #endif
     #endif
   }
 

Marlin/src/gcode/temperature/M140_M190.cpp

@@ -132,12 +132,10 @@ void GcodeSuite::M190() {
         const uint8_t red = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 0, 255);
         if (red != old_red) {
           old_red = red;
-          set_led_color(red, 0, 255
+          leds.set_color(
-            #if ENABLED(NEOPIXEL_LED)
+            MakeLEDColor(red, 0, 255, 0, pixels.getBrightness())
-              , 0, pixels.getBrightness()
+            #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
-              #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
+              , true
-                , true
-              #endif
             #endif
           );
         }

Marlin/src/lcd/language/language_en.h

@@ -360,60 +360,65 @@
 #ifndef MSG_UBL_STEP_BY_STEP_MENU
   #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("Step-By-Step UBL")
 #endif
+
 #ifndef MSG_LED_CONTROL
   #define MSG_LED_CONTROL                     _UxGT("LED Control")
 #endif
+#ifndef MSG_LEDS_ON
+  #define MSG_LEDS_ON                         _UxGT("Lights On")
+#endif
 #ifndef MSG_LEDS_OFF
-  #define MSG_LEDS_OFF                        _UxGT("Turn Off Lights")
+  #define MSG_LEDS_OFF                        _UxGT("Lights Off")
 #endif
-#ifndef MSG_LED_ON
+#ifndef MSG_LED_PRESETS
-  #define MSG_LED_ON                          _UxGT("Turn on ")
+  #define MSG_LED_PRESETS                     _UxGT("Light Presets")
 #endif
-#ifndef MSG_RED
+#ifndef MSG_SET_LEDS_RED
-  #define MSG_RED                             _UxGT("Red ")
+  #define MSG_SET_LEDS_RED                    _UxGT("Red")
 #endif
-#ifndef MSG_ORANGE
+#ifndef MSG_SET_LEDS_ORANGE
-  #define MSG_ORANGE                          _UxGT("Orange ")
+  #define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")
 #endif
-#ifndef MSG_YELLOW
+#ifndef MSG_SET_LEDS_YELLOW
-  #define MSG_YELLOW                          _UxGT("Yellow ")
+  #define MSG_SET_LEDS_YELLOW                 _UxGT("Yellow")
 #endif
-#ifndef MSG_GREEN
+#ifndef MSG_SET_LEDS_GREEN
-  #define MSG_GREEN                           _UxGT("Green ")
+  #define MSG_SET_LEDS_GREEN                  _UxGT("Green")
 #endif
-#ifndef MSG_BLUE
+#ifndef MSG_SET_LEDS_BLUE
-  #define MSG_BLUE                            _UxGT("Blue ")
+  #define MSG_SET_LEDS_BLUE                   _UxGT("Blue")
 #endif
-#ifndef MSG_PURPLE
+#ifndef MSG_SET_LEDS_INDIGO
-  #define MSG_PURPLE                          _UxGT("Purple ")
+  #define MSG_SET_LEDS_INDIGO                 _UxGT("Indigo")
 #endif
-#ifndef MSG_WHITE
+#ifndef MSG_SET_LEDS_VIOLET
-  #define MSG_WHITE                           _UxGT("White ")
+  #define MSG_SET_LEDS_VIOLET                 _UxGT("Violet")
 #endif
-#ifndef MSG_CUSTOM
+#ifndef MSG_SET_LEDS_WHITE
-  #define MSG_CUSTOM                          _UxGT("Custom ")
+  #define MSG_SET_LEDS_WHITE                  _UxGT("White")
 #endif
-#ifndef MSG_LED_PRESET
+#ifndef MSG_SET_LEDS_DEFAULT
-  #define MSG_LED_PRESET                      _UxGT("Preset ")
+  #define MSG_SET_LEDS_DEFAULT                _UxGT("Default")
 #endif
-#ifndef MSG_LED_DEFAULT
+#ifndef MSG_CUSTOM_LEDS
-  #define MSG_LED_DEFAULT                     _UxGT("Default ")
+  #define MSG_CUSTOM_LEDS                     _UxGT("Custom Lights")
 #endif
-#ifndef MSG_LIGHTS
+#ifndef MSG_INTENSITY_R
-  #define MSG_LIGHTS                          _UxGT("Lights ")
+  #define MSG_INTENSITY_R                     _UxGT("Red Intensity")
 #endif
-#ifndef MSG_LED_INTENSITY
+#ifndef MSG_INTENSITY_G
-  #define MSG_LED_INTENSITY                   _UxGT("Intensity ")
+  #define MSG_INTENSITY_G                     _UxGT("Green Intensity")
 #endif
-#ifndef MSG_LED_CUSTOM
+#ifndef MSG_INTENSITY_B
-  #define MSG_LED_CUSTOM                      _UxGT("Custom LED")
+  #define MSG_INTENSITY_B                     _UxGT("Blue Intensity")
 #endif
-#ifndef MSG_LED_SAVE
+#ifndef MSG_INTENSITY_W
-  #define MSG_LED_SAVE                        _UxGT("Save ")
+  #define MSG_INTENSITY_W                     _UxGT("White Intensity")
 #endif
-#ifndef MSG_LED_LOAD
+#ifndef MSG_LED_BRIGHTNESS
-  #define MSG_LED_LOAD                        _UxGT("Load ")
+  #define MSG_LED_BRIGHTNESS                  _UxGT("Brightness")
 #endif
+
 #ifndef MSG_MOVING
   #define MSG_MOVING                          _UxGT("Moving...")
 #endif

Marlin/src/lcd/ultralcd.cpp

@@ -191,7 +191,6 @@ uint16_t max_display_update_time = 0;
 
   #if ENABLED(LED_CONTROL_MENU)
     void lcd_led_menu();
-    void lcd_led_custom_menu();
   #endif
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -1024,8 +1023,9 @@ void kill_screen(const char* lcd_msg) {
     #endif
 
     #if ENABLED(LED_CONTROL_MENU)
-      MENU_ITEM(submenu, "LED Control", lcd_led_menu);
+      MENU_ITEM(submenu, MSG_LED_CONTROL, lcd_led_menu);
     #endif
+
     END_MENU();
   }
 
@@ -3951,105 +3951,37 @@ void kill_screen(const char* lcd_msg) {
 
   #if ENABLED(LED_CONTROL_MENU)
 
-    bool led_restore_color =
+    #if ENABLED(LED_COLOR_PRESETS)
-      #if ENABLED(LED_USER_PRESET_STARTUP)
-        false;
-      #else
-        true;
-      #endif
 
-    extern uint8_t led_intensity_red,
+      void lcd_led_presets_menu() {
-           led_intensity_green,
+        START_MENU();
-           led_intensity_blue
+        #if LCD_HEIGHT > 2
-           #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+          STATIC_ITEM(MSG_LED_PRESETS, true, true);
-             , led_intensity_white
-           #endif
-           #if ENABLED(NEOPIXEL_LED)
-             , led_intensity
-           #endif
-           ;
-
-    void update_leds() {
-      if (led_restore_color) {
-        #if ENABLED(LED_COLOR_PRESETS)
-          led_intensity_red = LED_USER_PRESET_RED;
-          led_intensity_green = LED_USER_PRESET_GREEN;
-          led_intensity_blue = LED_USER_PRESET_BLUE;
-          #if ENABLED(RGBW_LED)
-            led_intensity_white = LED_USER_PRESET_WHITE;
-          #endif
-          #if ENABLED(NEOPIXEL_LED)
-            led_intensity = LED_USER_PRESET_INTENSITY;
-          #endif
-        #else
-          led_intensity_red = 255;
-          led_intensity_green = 255;
-          led_intensity_blue = 255;
-          #if ENABLED(RGBW_LED)
-            led_intensity_white = 0;
-          #endif
-          #if ENABLED(NEOPIXEL_LED)
-            led_intensity = LED_USER_PRESET_INTENSITY;
-          #endif
         #endif
-        led_restore_color = false;
+        MENU_BACK(MSG_LED_CONTROL);
+        MENU_ITEM(function, MSG_SET_LEDS_WHITE, leds.set_white);
+        MENU_ITEM(function, MSG_SET_LEDS_RED, leds.set_red);
+        MENU_ITEM(function, MSG_SET_LEDS_ORANGE, leds.set_orange);
+        MENU_ITEM(function, MSG_SET_LEDS_YELLOW,leds.set_yellow);
+        MENU_ITEM(function, MSG_SET_LEDS_GREEN, leds.set_green);
+        MENU_ITEM(function, MSG_SET_LEDS_BLUE, leds.set_blue);
+        MENU_ITEM(function, MSG_SET_LEDS_INDIGO, leds.set_indigo);
+        MENU_ITEM(function, MSG_SET_LEDS_VIOLET, leds.set_violet);
+        END_MENU();
       }
-
+    #endif // LED_COLOR_PRESETS
-      set_led_color(led_intensity_red, led_intensity_green, led_intensity_blue
-        #if ENABLED(RGBW_LED)
-          , led_intensity_white
-        #endif
-        #if ENABLED(NEOPIXEL_LED)
-          , 0, led_intensity
-        #endif
-        );
-      led_restore_color = false;
-    }
-
-    void led_restore_default() {
-      led_restore_color = true;
-      update_leds();
-    }
-
-    void set_leds_off() {
-      set_led_color(0, 0, 0
-        #if ENABLED(RGBW) || ENABLED(NEOPIXEL_LED)
-        , 0
-        #endif
-        );
-    }
-
-    void lcd_led_red()    { set_led_color(255, 0, 0); }
-    void lcd_led_orange() { set_led_color(150, 60, 0); }
-    void lcd_led_yellow() { set_led_color(255, 255, 0); }
-    void lcd_led_green()  { set_led_color(0, 255, 0); }
-    void lcd_led_blue()   { set_led_color(0, 0, 255); }
-    void lcd_led_purple() { set_led_color(255, 0, 255); }
-
-    void lcd_led_presets_menu() {
-      START_MENU();
-      MENU_BACK(MSG_LED_CONTROL);
-      MENU_ITEM(function, MSG_LED_ON MSG_RED MSG_LIGHTS, lcd_led_red);
-      MENU_ITEM(function, MSG_LED_ON MSG_ORANGE MSG_LIGHTS, lcd_led_orange);
-      MENU_ITEM(function, MSG_LED_ON MSG_YELLOW MSG_LIGHTS,lcd_led_yellow);
-      MENU_ITEM(function, MSG_LED_ON MSG_GREEN MSG_LIGHTS, lcd_led_green);
-      MENU_ITEM(function, MSG_LED_ON MSG_BLUE MSG_LIGHTS, lcd_led_blue);
-      MENU_ITEM(function, MSG_LED_ON MSG_PURPLE MSG_LIGHTS, lcd_led_purple);
-      MENU_ITEM(function, MSG_LED_ON MSG_WHITE MSG_LIGHTS, set_led_white);
-      END_MENU();
-    }
 
     void lcd_led_custom_menu() {
       START_MENU();
       MENU_BACK(MSG_LED_CONTROL);
-      MENU_ITEM_EDIT_CALLBACK(int8, MSG_RED MSG_LED_INTENSITY, &led_intensity_red, 0, 255, update_leds, true);
+      MENU_ITEM_EDIT_CALLBACK(int8, MSG_INTENSITY_R, &leds.color.r, 0, 255, leds.update, true);
-      MENU_ITEM_EDIT_CALLBACK(int8, MSG_GREEN MSG_LED_INTENSITY, &led_intensity_green, 0, 255, update_leds, true);
+      MENU_ITEM_EDIT_CALLBACK(int8, MSG_INTENSITY_G, &leds.color.g, 0, 255, leds.update, true);
-      MENU_ITEM_EDIT_CALLBACK(int8, MSG_BLUE MSG_LED_INTENSITY, &led_intensity_blue, 0, 255, update_leds, true);
+      MENU_ITEM_EDIT_CALLBACK(int8, MSG_INTENSITY_B, &leds.color.b, 0, 255, leds.update, true);
       #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
-        MENU_ITEM_EDIT_CALLBACK(int8, MSG_WHITE MSG_LED_INTENSITY, &led_intensity_white, 0, 255, update_leds, true);
+        MENU_ITEM_EDIT_CALLBACK(int8, MSG_INTENSITY_W, &leds.color.w, 0, 255, leds.update, true);
-      #endif
+        #if ENABLED(NEOPIXEL_LED)
-      #if ENABLED(NEOPIXEL_LED)
+          MENU_ITEM_EDIT_CALLBACK(int8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
-        MENU_ITEM_EDIT_CALLBACK(int8, MSG_LED_INTENSITY, &led_intensity, 0, 255, update_leds, true);
+        #endif
       #endif
       END_MENU();
     }
@@ -4057,13 +3989,15 @@ void kill_screen(const char* lcd_msg) {
     void lcd_led_menu() {
       START_MENU();
       MENU_BACK(MSG_MAIN);
-      MENU_ITEM(function, MSG_LIGHTS MSG_OFF, set_leds_off); // works
+      if (leds.lights_on)
-      MENU_ITEM(function, MSG_LIGHTS MSG_ON, update_leds); // works
+        MENU_ITEM(function, MSG_LEDS_OFF, leds.toggle);
-      MENU_ITEM(function, MSG_LED_LOAD MSG_LED_DEFAULT MSG_LIGHTS, led_restore_default); // works
+      else
+        MENU_ITEM(function, MSG_LEDS_ON, leds.toggle);
+      MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default);
       #if ENABLED(LED_COLOR_PRESETS)
-        MENU_ITEM(submenu, MSG_LED_PRESET MSG_LIGHTS, lcd_led_presets_menu);
+        MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu);
       #endif
-      MENU_ITEM(submenu, MSG_CUSTOM MSG_LIGHTS, lcd_led_custom_menu);
+      MENU_ITEM(submenu, MSG_CUSTOM_LEDS, lcd_led_custom_menu);
       END_MENU();
     }