SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New Feature: LED_CONTROL_MENU

Browse source
This commit is contained in:
Tannoo 2017-11-09 16:39:01 -07:00 committed by Scott Lahteine
parent 23e45fa3c4
commit cf0f78336b
40 changed files with 752 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/Configuration_adv.h
View file

@ -482,6 +482,21 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/default/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View file

@ -483,6 +483,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Cartesio/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Felix/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
View file

@ -483,6 +483,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/RigidBot/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/SCARA/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
View file

@ -471,6 +471,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
View file

@ -495,6 +495,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
View file

@ -483,6 +483,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
View file

@ -484,6 +484,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
View file

@ -484,6 +484,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/generic/Configuration_adv.h
View file

@ -484,6 +484,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
View file

@ -484,6 +484,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
View file

@ -489,6 +489,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
View file

@ -484,6 +484,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/makibox/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
View file

@ -482,6 +482,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

14
Marlin/src/config/examples/wt150/Configuration_adv.h
View file

@ -483,6 +483,20 @@
// The timeout (in ms) to return to the status screen from sub-menus // The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
//#define LED_CONTROL_MENU // Uncomment to enable the LED control menu option.
#if ENABLED(LED_CONTROL_MENU)
#define LED_COLOR_PRESETS // Uncomment to enable the preset color menu option.
#if ENABLED(LED_COLOR_PRESETS)
#define LED_USER_PRESET_RED 255 // User defined RED value
#define LED_USER_PRESET_GREEN 128 // User defined GREEN value
#define LED_USER_PRESET_BLUE 0 // User defined BLUE value
#define LED_USER_PRESET_WHITE 255 // User defined WHITE value
#define LED_USER_PRESET_INTENSITY 255 // User defined intensity
#endif
//#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

71
Marlin/src/feature/leds/leds.cpp
View file

@ -30,6 +30,32 @@
#include "leds.h" #include "leds.h"
#if ENABLED(LED_CONTROL_MENU)
#if ENABLED(LED_COLOR_PRESETS)
uint8_t 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) || 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( void set_led_color(
const uint8_t r, const uint8_t g, const uint8_t b const uint8_t r, const uint8_t g, const uint8_t b
#if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED) #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
@ -42,20 +68,11 @@ void set_led_color(
) { ) {
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
if ((w == 255) || ((r == 255) && (g == 255) && (b == 255))) {
const uint32_t color = pixels.Color(r, g, b, w); neopixel_set_led_color(NEO_WHITE, p);
static uint16_t nextLed = 0;
pixels.setBrightness(p);
if (!isSequence)
set_neopixel_color(color);
else {
pixels.setPixelColor(nextLed, color);
pixels.show();
if (++nextLed >= pixels.numPixels()) nextLed = 0;
return;
} }
else
neopixel_set_led_color(r, g, b, w, p);
#endif #endif
#if ENABLED(BLINKM) #if ENABLED(BLINKM)
@ -81,6 +98,34 @@ void set_led_color(
#if ENABLED(PCA9632) #if ENABLED(PCA9632)
pca9632_set_led_color(r, g, b); // Update I2C LED driver pca9632_set_led_color(r, g, b); // Update I2C LED driver
#endif #endif
#if ENABLED(LED_CONTROL_MENU)
if ((r + g + b
#if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
+ w
#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(){
#if ENABLED(NEOPIXEL_LED)
neopixel_set_led_color(NEO_WHITE, pixels.getBrightness());
#elif (RGBW_LED)
set_led_color(0, 0, 0, 255);
#else
set_led_color(255, 255, 255);
#endif
} }
#endif // HAS_COLOR_LEDS #endif // HAS_COLOR_LEDS

2
Marlin/src/feature/leds/leds.h
View file

@ -65,4 +65,6 @@ void set_led_color(
#endif #endif
); );
void set_led_white();
#endif // __LEDS_H__ #endif // __LEDS_H__

22
Marlin/src/feature/leds/neopixel.cpp
View file

@ -53,7 +53,27 @@ void setup_neopixel() {
set_neopixel_color(pixels.Color(0, 0, 255, 0)); // blue set_neopixel_color(pixels.Color(0, 0, 255, 0)); // blue
safe_delay(1000); safe_delay(1000);
#endif #endif
set_neopixel_color(pixels.Color(NEO_WHITE)); // white
#if ENABLED(LED_USER_PRESET_STARTUP)
set_neopixel_color(pixels.Color(LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE, LED_USER_PRESET_WHITE));
#else
set_neopixel_color(pixels.Color(0, 0, 0, 0));
#endif
}
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);
#if !ENABLED(NEOPIXEL_IS_SEQUENTIAL)
set_neopixel_color(color);
return false;
#else
static uint16_t nextLed = 0;
pixels.setPixelColor(nextLed, color);
pixels.show();
if (++nextLed >= pixels.numPixels()) nextLed = 0;
return true;
#endif
} }
#endif // NEOPIXEL_LED #endif // NEOPIXEL_LED

3
Marlin/src/feature/leds/neopixel.h
View file

@ -36,13 +36,14 @@
#define NEOPIXEL_IS_RGBW !NEOPIXEL_IS_RGB #define NEOPIXEL_IS_RGBW !NEOPIXEL_IS_RGB
#if NEOPIXEL_IS_RGB #if NEOPIXEL_IS_RGB
#define NEO_WHITE 255, 255, 255 #define NEO_WHITE 255, 255, 255, 0
#else #else
#define NEO_WHITE 0, 0, 0, 255 #define NEO_WHITE 0, 0, 0, 255
#endif #endif
void setup_neopixel(); void setup_neopixel();
void set_neopixel_color(const uint32_t color); 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);
extern Adafruit_NeoPixel pixels; extern Adafruit_NeoPixel pixels;

57
Marlin/src/lcd/language/language_en.h
View file

@ -174,7 +174,6 @@
#ifndef MSG_USER_MENU #ifndef MSG_USER_MENU
#define MSG_USER_MENU _UxGT("Custom Commands") #define MSG_USER_MENU _UxGT("Custom Commands")
#endif #endif
#ifndef MSG_UBL_DOING_G29 #ifndef MSG_UBL_DOING_G29
#define MSG_UBL_DOING_G29 _UxGT("Doing G29") #define MSG_UBL_DOING_G29 _UxGT("Doing G29")
#endif #endif
@ -361,7 +360,60 @@
#ifndef MSG_UBL_STEP_BY_STEP_MENU #ifndef MSG_UBL_STEP_BY_STEP_MENU
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL")
#endif #endif
#ifndef MSG_LED_CONTROL
#define MSG_LED_CONTROL _UxGT("LED Control")
#endif
#ifndef MSG_LEDS_OFF
#define MSG_LEDS_OFF _UxGT("Turn Off Lights")
#endif
#ifndef MSG_LED_ON
#define MSG_LED_ON _UxGT("Turn on ")
#endif
#ifndef MSG_RED
#define MSG_RED _UxGT("Red ")
#endif
#ifndef MSG_ORANGE
#define MSG_ORANGE _UxGT("Orange ")
#endif
#ifndef MSG_YELLOW
#define MSG_YELLOW _UxGT("Yellow ")
#endif
#ifndef MSG_GREEN
#define MSG_GREEN _UxGT("Green ")
#endif
#ifndef MSG_BLUE
#define MSG_BLUE _UxGT("Blue ")
#endif
#ifndef MSG_PURPLE
#define MSG_PURPLE _UxGT("Purple ")
#endif
#ifndef MSG_WHITE
#define MSG_WHITE _UxGT("White ")
#endif
#ifndef MSG_CUSTOM
#define MSG_CUSTOM _UxGT("Custom ")
#endif
#ifndef MSG_LED_PRESET
#define MSG_LED_PRESET _UxGT("Preset ")
#endif
#ifndef MSG_LED_DEFAULT
#define MSG_LED_DEFAULT _UxGT("Default ")
#endif
#ifndef MSG_LIGHTS
#define MSG_LIGHTS _UxGT("Lights ")
#endif
#ifndef MSG_LED_INTENSITY
#define MSG_LED_INTENSITY _UxGT("Intensity ")
#endif
#ifndef MSG_LED_CUSTOM
#define MSG_LED_CUSTOM _UxGT("Custom LED")
#endif
#ifndef MSG_LED_SAVE
#define MSG_LED_SAVE _UxGT("Save ")
#endif
#ifndef MSG_LED_LOAD
#define MSG_LED_LOAD _UxGT("Load ")
#endif
#ifndef MSG_MOVING #ifndef MSG_MOVING
#define MSG_MOVING _UxGT("Moving...") #define MSG_MOVING _UxGT("Moving...")
#endif #endif
@ -839,7 +891,6 @@
#define MSG_INFO_PRINT_FILAMENT _UxGT("Extruded") #define MSG_INFO_PRINT_FILAMENT _UxGT("Extruded")
#endif #endif
#endif #endif
#ifndef MSG_INFO_MIN_TEMP #ifndef MSG_INFO_MIN_TEMP
#define MSG_INFO_MIN_TEMP _UxGT("Min Temp") #define MSG_INFO_MIN_TEMP _UxGT("Min Temp")
#endif #endif

138
Marlin/src/lcd/ultralcd.cpp
View file

@ -55,6 +55,10 @@
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"
#endif #endif
#if ENABLED(LED_CONTROL_MENU)
#include "../feature/leds/leds.h"
#endif
// For i2c define BUZZ to use lcd_buzz // For i2c define BUZZ to use lcd_buzz
#if DISABLED(LCD_USE_I2C_BUZZER) #if DISABLED(LCD_USE_I2C_BUZZER)
#include "../libs/buzzer.h" #include "../libs/buzzer.h"
@ -185,6 +189,11 @@ uint16_t max_display_update_time = 0;
void lcd_info_menu(); void lcd_info_menu();
#endif // LCD_INFO_MENU #endif // LCD_INFO_MENU
#if ENABLED(LED_CONTROL_MENU)
void lcd_led_menu();
void lcd_led_custom_menu();
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
void lcd_advanced_pause_toocold_menu(); void lcd_advanced_pause_toocold_menu();
void lcd_advanced_pause_option_menu(); void lcd_advanced_pause_option_menu();
@ -1014,6 +1023,9 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu); MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu);
#endif #endif
#if ENABLED(LED_CONTROL_MENU)
MENU_ITEM(submenu, "LED Control", lcd_led_menu);
#endif
END_MENU(); END_MENU();
} }
@ -3931,6 +3943,132 @@ void kill_screen(const char* lcd_msg) {
} }
#endif // LCD_INFO_MENU #endif // LCD_INFO_MENU
/**
*
* LED Menu
*
*/
#if ENABLED(LED_CONTROL_MENU)
bool led_restore_color =
#if ENABLED(LED_USER_PRESET_STARTUP)
false;
#else
true;
#endif
extern uint8_t led_intensity_red,
led_intensity_green,
led_intensity_blue
#if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
, 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;
}
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_GREEN MSG_LED_INTENSITY, &led_intensity_green, 0, 255, update_leds, true);
MENU_ITEM_EDIT_CALLBACK(int8, MSG_BLUE MSG_LED_INTENSITY, &led_intensity_blue, 0, 255, update_leds, 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);
#endif
#if ENABLED(NEOPIXEL_LED)
MENU_ITEM_EDIT_CALLBACK(int8, MSG_LED_INTENSITY, &led_intensity, 0, 255, update_leds, true);
#endif
END_MENU();
}
void lcd_led_menu() {
START_MENU();
MENU_BACK(MSG_MAIN);
MENU_ITEM(function, MSG_LIGHTS MSG_OFF, set_leds_off); // works
MENU_ITEM(function, MSG_LIGHTS MSG_ON, update_leds); // works
MENU_ITEM(function, MSG_LED_LOAD MSG_LED_DEFAULT MSG_LIGHTS, led_restore_default); // works
#if ENABLED(LED_COLOR_PRESETS)
MENU_ITEM(submenu, MSG_LED_PRESET MSG_LIGHTS, lcd_led_presets_menu);
#endif
MENU_ITEM(submenu, MSG_CUSTOM MSG_LIGHTS, lcd_led_custom_menu);
END_MENU();
}
#endif // LED_CONTROL_MENU
/** /**
* *
* Filament Change Feature Screens * Filament Change Feature Screens