MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LED menu item bool (like Case Lights)

Browse Source
This commit is contained in:
Scott Lahteine 2018-06-02 19:11:25 -05:00
parent 9641bae325
commit 7d39bcfcce
15 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/language_cz.h
View File

@ -146,8 +146,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne")
#define MSG_LED_CONTROL _UxGT("LED Nastaveni") #define MSG_LED_CONTROL _UxGT("LED Nastaveni")
#define MSG_LEDS_ON _UxGT("Svetla Zap") #define MSG_LEDS _UxGT("Svetla")
#define MSG_LEDS_OFF _UxGT("Svetla Vyp")
#define MSG_LED_PRESETS _UxGT("Svetla Predvolby") #define MSG_LED_PRESETS _UxGT("Svetla Predvolby")
#define MSG_SET_LEDS_RED _UxGT("Cervena") #define MSG_SET_LEDS_RED _UxGT("Cervena")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranzova") #define MSG_SET_LEDS_ORANGE _UxGT("Oranzova")

3
Marlin/language_cz_utf8.h
View File

@ -149,8 +149,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupně") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupně")
#define MSG_LED_CONTROL _UxGT("LED Nastavení") #define MSG_LED_CONTROL _UxGT("LED Nastavení")
#define MSG_LEDS_ON _UxGT("Světla Zap") #define MSG_LEDS _UxGT("Světla")
#define MSG_LEDS_OFF _UxGT("Světla Vyp")
#define MSG_LED_PRESETS _UxGT("Světla Předvolby") #define MSG_LED_PRESETS _UxGT("Světla Předvolby")
#define MSG_SET_LEDS_RED _UxGT("Červená") #define MSG_SET_LEDS_RED _UxGT("Červená")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranžová") #define MSG_SET_LEDS_ORANGE _UxGT("Oranžová")

3
Marlin/language_de.h
View File

@ -311,8 +311,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Schrittweises UBL") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Schrittweises UBL")
#define MSG_LED_CONTROL _UxGT("LED Kontrolle") #define MSG_LED_CONTROL _UxGT("LED Kontrolle")
#define MSG_LEDS_ON _UxGT("Licht an") #define MSG_LEDS _UxGT("Licht")
#define MSG_LEDS_OFF _UxGT("Licht aus")
#define MSG_LED_PRESETS _UxGT("Licht Einstellungen") #define MSG_LED_PRESETS _UxGT("Licht Einstellungen")
#define MSG_SET_LEDS_RED _UxGT("Rot") #define MSG_SET_LEDS_RED _UxGT("Rot")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

7
Marlin/language_en.h
View File

@ -371,11 +371,8 @@
#ifndef MSG_LED_CONTROL #ifndef MSG_LED_CONTROL
#define MSG_LED_CONTROL _UxGT("LED Control") #define MSG_LED_CONTROL _UxGT("LED Control")
#endif #endif
#ifndef MSG_LEDS_ON #ifndef MSG_LEDS
#define MSG_LEDS_ON _UxGT("Lights On") #define MSG_LEDS _UxGT("Lights")
#endif
#ifndef MSG_LEDS_OFF
#define MSG_LEDS_OFF _UxGT("Lights Off")
#endif #endif
#ifndef MSG_LED_PRESETS #ifndef MSG_LED_PRESETS
#define MSG_LED_PRESETS _UxGT("Light Presets") #define MSG_LED_PRESETS _UxGT("Light Presets")

3
Marlin/language_eu.h
View File

@ -142,8 +142,7 @@
//#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Offset Stopped") //#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Offset Stopped")
//#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL") //#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Step-By-Step UBL")
#define MSG_LED_CONTROL _UxGT("LED ezarpenak") #define MSG_LED_CONTROL _UxGT("LED ezarpenak")
#define MSG_LEDS_ON _UxGT("Argiak piztu") #define MSG_LEDS _UxGT("Argiak")
#define MSG_LEDS_OFF _UxGT("Argiak itzali")
#define MSG_LED_PRESETS _UxGT("Argi aurrehautaketak") #define MSG_LED_PRESETS _UxGT("Argi aurrehautaketak")
#define MSG_SET_LEDS_RED _UxGT("Gorria") #define MSG_SET_LEDS_RED _UxGT("Gorria")
#define MSG_SET_LEDS_ORANGE _UxGT("Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Laranja")

3
Marlin/language_fr.h
View File

@ -144,8 +144,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas a pas") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas a pas")
#define MSG_LED_CONTROL _UxGT("Controle LED") #define MSG_LED_CONTROL _UxGT("Controle LED")
#define MSG_LEDS_ON _UxGT("Lumiere ON") #define MSG_LEDS _UxGT("Lumiere")
#define MSG_LEDS_OFF _UxGT("Lumiere OFF")
#define MSG_LED_PRESETS _UxGT("Preregl. LED.") #define MSG_LED_PRESETS _UxGT("Preregl. LED.")
#define MSG_SET_LEDS_RED _UxGT("Rouge") #define MSG_SET_LEDS_RED _UxGT("Rouge")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

3
Marlin/language_fr_utf8.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas à pas") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Pas à pas")
#define MSG_LED_CONTROL _UxGT("Contrôle LED") #define MSG_LED_CONTROL _UxGT("Contrôle LED")
#define MSG_LEDS_ON _UxGT("Lumière ON") #define MSG_LEDS _UxGT("Lumière")
#define MSG_LEDS_OFF _UxGT("Lumière OFF")
#define MSG_LED_PRESETS _UxGT("Préregl. LED") #define MSG_LED_PRESETS _UxGT("Préregl. LED")
#define MSG_SET_LEDS_RED _UxGT("Rouge") #define MSG_SET_LEDS_RED _UxGT("Rouge")
#define MSG_SET_LEDS_ORANGE _UxGT("Orange") #define MSG_SET_LEDS_ORANGE _UxGT("Orange")

3
Marlin/language_it.h
View File

@ -144,8 +144,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo passo")
#define MSG_LED_CONTROL _UxGT("Controllo LED") #define MSG_LED_CONTROL _UxGT("Controllo LED")
#define MSG_LEDS_ON _UxGT("Luci On") #define MSG_LEDS _UxGT("Luci")
#define MSG_LEDS_OFF _UxGT("Luci Off")
#define MSG_LED_PRESETS _UxGT("Preset luci") #define MSG_LED_PRESETS _UxGT("Preset luci")
#define MSG_SET_LEDS_RED _UxGT("Rosso") #define MSG_SET_LEDS_RED _UxGT("Rosso")
#define MSG_SET_LEDS_ORANGE _UxGT("Arancione") #define MSG_SET_LEDS_ORANGE _UxGT("Arancione")

3
Marlin/language_pt-br.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensacao Z parou") #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensacao Z parou")
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo")
#define MSG_LED_CONTROL _UxGT("Controle do LED") #define MSG_LED_CONTROL _UxGT("Controle do LED")
#define MSG_LEDS_ON _UxGT("Luz Acesa") #define MSG_LEDS _UxGT("Luz")
#define MSG_LEDS_OFF _UxGT("Luz Apagada")
#define MSG_LED_PRESETS _UxGT("Configuracao da Luz") #define MSG_LED_PRESETS _UxGT("Configuracao da Luz")
#define MSG_SET_LEDS_RED _UxGT("Luz Vermelha") #define MSG_SET_LEDS_RED _UxGT("Luz Vermelha")
#define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja")

3
Marlin/language_pt-br_utf8.h
View File

@ -147,8 +147,7 @@
#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensação Z parou") #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Compensação Z parou")
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL passo a passo")
#define MSG_LED_CONTROL _UxGT("Controle do LED") #define MSG_LED_CONTROL _UxGT("Controle do LED")
#define MSG_LEDS_ON _UxGT("Luz Acesa") #define MSG_LEDS _UxGT("Luz")
#define MSG_LEDS_OFF _UxGT("Luz Apagada")
#define MSG_LED_PRESETS _UxGT("Configuração da Luz") #define MSG_LED_PRESETS _UxGT("Configuração da Luz")
#define MSG_SET_LEDS_RED _UxGT("Luz Vermelha") #define MSG_SET_LEDS_RED _UxGT("Luz Vermelha")
#define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja") #define MSG_SET_LEDS_ORANGE _UxGT("Luz Laranja")

3
Marlin/language_ru.h
View File

@ -145,8 +145,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Пошаговое UBL") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("Пошаговое UBL")
#define MSG_LED_CONTROL _UxGT("Настройки LED") #define MSG_LED_CONTROL _UxGT("Настройки LED")
#define MSG_LEDS_ON _UxGT("Включить подсветку") #define MSG_LEDS _UxGT("Подсветку")
#define MSG_LEDS_OFF _UxGT("Выключить подсветку")
#define MSG_LED_PRESETS _UxGT("Предустановки света") #define MSG_LED_PRESETS _UxGT("Предустановки света")
#define MSG_SET_LEDS_RED _UxGT("Красный свет") #define MSG_SET_LEDS_RED _UxGT("Красный свет")
#define MSG_SET_LEDS_ORANGE _UxGT("Оранжевый свет") #define MSG_SET_LEDS_ORANGE _UxGT("Оранжевый свет")

3
Marlin/language_sk_utf8.h
View File

@ -148,8 +148,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne") #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("UBL Postupne")
#define MSG_LED_CONTROL _UxGT("Nastavenie LED") #define MSG_LED_CONTROL _UxGT("Nastavenie LED")
#define MSG_LEDS_ON _UxGT("Zapnúť svetlo") #define MSG_LEDS _UxGT("Svetlo")
#define MSG_LEDS_OFF _UxGT("Vypnúť svetlo")
#define MSG_LED_PRESETS _UxGT("Prednastavené farby") #define MSG_LED_PRESETS _UxGT("Prednastavené farby")
#define MSG_SET_LEDS_RED _UxGT("Červená") #define MSG_SET_LEDS_RED _UxGT("Červená")
#define MSG_SET_LEDS_ORANGE _UxGT("Oranžová") #define MSG_SET_LEDS_ORANGE _UxGT("Oranžová")

3
Marlin/language_zh_CN.h
View File

@ -141,8 +141,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL" #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL"
#define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control") #define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control")
#define MSG_LEDS_ON _UxGT("灯亮") // "Lights On") #define MSG_LEDS _UxGT("灯") // "Lights")
#define MSG_LEDS_OFF _UxGT("灯灭") // "Lights Off")
#define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets") #define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets")
#define MSG_SET_LEDS_RED _UxGT("红") // "Red") #define MSG_SET_LEDS_RED _UxGT("红") // "Red")
#define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange") #define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange")

3
Marlin/language_zh_TW.h
View File

@ -141,8 +141,7 @@
#define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL" #define MSG_UBL_STEP_BY_STEP_MENU _UxGT("一步步UBL") // "Step-By-Step UBL"
#define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control") #define MSG_LED_CONTROL _UxGT("灯管控制") // "LED Control")
#define MSG_LEDS_ON _UxGT("灯亮") // "Lights On") #define MSG_LEDS _UxGT("灯") // "Lights")
#define MSG_LEDS_OFF _UxGT("灯灭") // "Lights Off")
#define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets") #define MSG_LED_PRESETS _UxGT("灯预置") // "Light Presets")
#define MSG_SET_LEDS_RED _UxGT("红") // "Red") #define MSG_SET_LEDS_RED _UxGT("红") // "Red")
#define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange") #define MSG_SET_LEDS_ORANGE _UxGT("橙") // "Orange")

6
Marlin/ultralcd.cpp
View File

@ -4244,10 +4244,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
void lcd_led_menu() { void lcd_led_menu() {
START_MENU(); START_MENU();
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
if (leds.lights_on) bool led_on = leds.lights_on;
MENU_ITEM(function, MSG_LEDS_OFF, leds.toggle); MENU_ITEM_EDIT_CALLBACK(bool, MSG_LEDS, &led_on, leds.toggle);
else
MENU_ITEM(function, MSG_LEDS_ON, leds.toggle);
MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default); MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default);
#if ENABLED(LED_COLOR_PRESETS) #if ENABLED(LED_COLOR_PRESETS)
MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu); MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu);