Browse Source

LED menu item bool (like Case Lights)

Scott Lahteine 7 years ago
parent
commit
2fd9ba56da

+ 1
- 2
Marlin/src/lcd/language/language_cz.h View File

148
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Postupně")
148
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Postupně")
149
 
149
 
150
 #define MSG_LED_CONTROL                     _UxGT("LED Nastavení")
150
 #define MSG_LED_CONTROL                     _UxGT("LED Nastavení")
151
-#define MSG_LEDS_ON                         _UxGT("Světla Zap")
152
-#define MSG_LEDS_OFF                        _UxGT("Světla Vyp")
151
+#define MSG_LEDS                            _UxGT("Světla")
153
 #define MSG_LED_PRESETS                     _UxGT("Světla Předvolby")
152
 #define MSG_LED_PRESETS                     _UxGT("Světla Předvolby")
154
 #define MSG_SET_LEDS_RED                    _UxGT("Červená")
153
 #define MSG_SET_LEDS_RED                    _UxGT("Červená")
155
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Oranžová")
154
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Oranžová")

+ 1
- 2
Marlin/src/lcd/language/language_de.h View File

309
 #define MSG_UBL_STEP_BY_STEP_MENU         _UxGT("Schrittweises UBL")
309
 #define MSG_UBL_STEP_BY_STEP_MENU         _UxGT("Schrittweises UBL")
310
 
310
 
311
 #define MSG_LED_CONTROL                     _UxGT("LED Kontrolle")
311
 #define MSG_LED_CONTROL                     _UxGT("LED Kontrolle")
312
-#define MSG_LEDS_ON                         _UxGT("Licht an")
313
-#define MSG_LEDS_OFF                        _UxGT("Licht aus")
312
+#define MSG_LEDS                            _UxGT("Licht")
314
 #define MSG_LED_PRESETS                     _UxGT("Licht Einstellungen")
313
 #define MSG_LED_PRESETS                     _UxGT("Licht Einstellungen")
315
 #define MSG_SET_LEDS_RED                    _UxGT("Rot")
314
 #define MSG_SET_LEDS_RED                    _UxGT("Rot")
316
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")
315
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")

+ 2
- 5
Marlin/src/lcd/language/language_en.h View File

371
 #ifndef MSG_LED_CONTROL
371
 #ifndef MSG_LED_CONTROL
372
   #define MSG_LED_CONTROL                     _UxGT("LED Control")
372
   #define MSG_LED_CONTROL                     _UxGT("LED Control")
373
 #endif
373
 #endif
374
-#ifndef MSG_LEDS_ON
375
-  #define MSG_LEDS_ON                         _UxGT("Lights On")
376
-#endif
377
-#ifndef MSG_LEDS_OFF
378
-  #define MSG_LEDS_OFF                        _UxGT("Lights Off")
374
+#ifndef MSG_LEDS   
375
+  #define MSG_LEDS                            _UxGT("Lights")
379
 #endif
376
 #endif
380
 #ifndef MSG_LED_PRESETS
377
 #ifndef MSG_LED_PRESETS
381
   #define MSG_LED_PRESETS                     _UxGT("Light Presets")
378
   #define MSG_LED_PRESETS                     _UxGT("Light Presets")

+ 1
- 2
Marlin/src/lcd/language/language_eu.h View File

142
 //#define MSG_UBL_Z_OFFSET_STOPPED          _UxGT("Z-Offset Stopped")
142
 //#define MSG_UBL_Z_OFFSET_STOPPED          _UxGT("Z-Offset Stopped")
143
 //#define MSG_UBL_STEP_BY_STEP_MENU         _UxGT("Step-By-Step UBL")
143
 //#define MSG_UBL_STEP_BY_STEP_MENU         _UxGT("Step-By-Step UBL")
144
 #define MSG_LED_CONTROL                     _UxGT("LED ezarpenak")
144
 #define MSG_LED_CONTROL                     _UxGT("LED ezarpenak")
145
-#define MSG_LEDS_ON                         _UxGT("Argiak piztu")
146
-#define MSG_LEDS_OFF                        _UxGT("Argiak itzali")
145
+#define MSG_LEDS                            _UxGT("Argiak")
147
 #define MSG_LED_PRESETS                     _UxGT("Argi aurrehautaketak")
146
 #define MSG_LED_PRESETS                     _UxGT("Argi aurrehautaketak")
148
 #define MSG_SET_LEDS_RED                    _UxGT("Gorria")
147
 #define MSG_SET_LEDS_RED                    _UxGT("Gorria")
149
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Laranja")
148
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Laranja")

+ 1
- 2
Marlin/src/lcd/language/language_fr.h View File

144
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Pas à pas")
144
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Pas à pas")
145
 
145
 
146
 #define MSG_LED_CONTROL                     _UxGT("Contrôle LED")
146
 #define MSG_LED_CONTROL                     _UxGT("Contrôle LED")
147
-#define MSG_LEDS_ON                         _UxGT("Lumière ON")
148
-#define MSG_LEDS_OFF                        _UxGT("Lumière OFF")
147
+#define MSG_LEDS                            _UxGT("Lumière")
149
 #define MSG_LED_PRESETS                     _UxGT("Préregl. LED")
148
 #define MSG_LED_PRESETS                     _UxGT("Préregl. LED")
150
 #define MSG_SET_LEDS_RED                    _UxGT("Rouge")
149
 #define MSG_SET_LEDS_RED                    _UxGT("Rouge")
151
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")
150
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")

+ 1
- 2
Marlin/src/lcd/language/language_it.h View File

143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL passo passo")
143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL passo passo")
144
 
144
 
145
 #define MSG_LED_CONTROL                     _UxGT("Controllo LED")
145
 #define MSG_LED_CONTROL                     _UxGT("Controllo LED")
146
-#define MSG_LEDS_ON                         _UxGT("Luci On")
147
-#define MSG_LEDS_OFF                        _UxGT("Luci Off")
146
+#define MSG_LEDS                            _UxGT("Luci")
148
 #define MSG_LED_PRESETS                     _UxGT("Preset luci")
147
 #define MSG_LED_PRESETS                     _UxGT("Preset luci")
149
 #define MSG_SET_LEDS_RED                    _UxGT("Rosso")
148
 #define MSG_SET_LEDS_RED                    _UxGT("Rosso")
150
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Arancione")
149
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Arancione")

+ 1
- 2
Marlin/src/lcd/language/language_pt-br.h View File

148
 #define MSG_UBL_Z_OFFSET_STOPPED            _UxGT("Compensação Z parou")
148
 #define MSG_UBL_Z_OFFSET_STOPPED            _UxGT("Compensação Z parou")
149
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL passo a passo")
149
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL passo a passo")
150
 #define MSG_LED_CONTROL                     _UxGT("Controle do LED")
150
 #define MSG_LED_CONTROL                     _UxGT("Controle do LED")
151
-#define MSG_LEDS_ON                         _UxGT("Luz Acesa")
152
-#define MSG_LEDS_OFF                        _UxGT("Luz Apagada")
151
+#define MSG_LEDS                            _UxGT("Luz")
153
 #define MSG_LED_PRESETS                     _UxGT("Configuração da Luz")
152
 #define MSG_LED_PRESETS                     _UxGT("Configuração da Luz")
154
 #define MSG_SET_LEDS_RED                    _UxGT("Luz Vermelha")
153
 #define MSG_SET_LEDS_RED                    _UxGT("Luz Vermelha")
155
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Luz Laranja")
154
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Luz Laranja")

+ 1
- 2
Marlin/src/lcd/language/language_ru.h View File

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

+ 1
- 2
Marlin/src/lcd/language/language_sk.h View File

153
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Postupne")
153
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("UBL Postupne")
154
 
154
 
155
 #define MSG_LED_CONTROL                     _UxGT("Nastavenie LED")
155
 #define MSG_LED_CONTROL                     _UxGT("Nastavenie LED")
156
-#define MSG_LEDS_ON                         _UxGT("Zapnúť svetlo")
157
-#define MSG_LEDS_OFF                        _UxGT("Vypnúť svetlo")
156
+#define MSG_LEDS                            _UxGT("Svetlo")
158
 #define MSG_LED_PRESETS                     _UxGT("Prednastavené farby")
157
 #define MSG_LED_PRESETS                     _UxGT("Prednastavené farby")
159
 #define MSG_SET_LEDS_RED                    _UxGT("Červená")
158
 #define MSG_SET_LEDS_RED                    _UxGT("Červená")
160
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Oranžová")
159
 #define MSG_SET_LEDS_ORANGE                 _UxGT("Oranžová")

+ 1
- 2
Marlin/src/lcd/language/language_zh_CN.h View File

143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("一步步UBL") // "Step-By-Step UBL"
143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("一步步UBL") // "Step-By-Step UBL"
144
 
144
 
145
 #define MSG_LED_CONTROL                     _UxGT("灯管控制") // "LED Control")
145
 #define MSG_LED_CONTROL                     _UxGT("灯管控制") // "LED Control")
146
-#define MSG_LEDS_ON                         _UxGT("灯亮") // "Lights On")
147
-#define MSG_LEDS_OFF                        _UxGT("灯灭") // "Lights Off")
146
+#define MSG_LEDS                            _UxGT("灯") // "Lights")
148
 #define MSG_LED_PRESETS                     _UxGT("灯预置") // "Light Presets")
147
 #define MSG_LED_PRESETS                     _UxGT("灯预置") // "Light Presets")
149
 #define MSG_SET_LEDS_RED                    _UxGT("红") // "Red")
148
 #define MSG_SET_LEDS_RED                    _UxGT("红") // "Red")
150
 #define MSG_SET_LEDS_ORANGE                 _UxGT("橙") // "Orange")
149
 #define MSG_SET_LEDS_ORANGE                 _UxGT("橙") // "Orange")

+ 1
- 2
Marlin/src/lcd/language/language_zh_TW.h View File

143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("一步步UBL") // "Step-By-Step UBL"
143
 #define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("一步步UBL") // "Step-By-Step UBL"
144
 
144
 
145
 #define MSG_LED_CONTROL                     _UxGT("灯管控制") // "LED Control")
145
 #define MSG_LED_CONTROL                     _UxGT("灯管控制") // "LED Control")
146
-#define MSG_LEDS_ON                         _UxGT("灯亮") // "Lights On")
147
-#define MSG_LEDS_OFF                        _UxGT("灯灭") // "Lights Off")
146
+#define MSG_LEDS                            _UxGT("灯") // "Lights")
148
 #define MSG_LED_PRESETS                     _UxGT("灯预置") // "Light Presets")
147
 #define MSG_LED_PRESETS                     _UxGT("灯预置") // "Light Presets")
149
 #define MSG_SET_LEDS_RED                    _UxGT("红") // "Red")
148
 #define MSG_SET_LEDS_RED                    _UxGT("红") // "Red")
150
 #define MSG_SET_LEDS_ORANGE                 _UxGT("橙") // "Orange")
149
 #define MSG_SET_LEDS_ORANGE                 _UxGT("橙") // "Orange")

+ 2
- 4
Marlin/src/lcd/ultralcd.cpp View File

4255
     void lcd_led_menu() {
4255
     void lcd_led_menu() {
4256
       START_MENU();
4256
       START_MENU();
4257
       MENU_BACK(MSG_MAIN);
4257
       MENU_BACK(MSG_MAIN);
4258
-      if (leds.lights_on)
4259
-        MENU_ITEM(function, MSG_LEDS_OFF, leds.toggle);
4260
-      else
4261
-        MENU_ITEM(function, MSG_LEDS_ON, leds.toggle);
4258
+      bool led_on = leds.lights_on;
4259
+      MENU_ITEM_EDIT_CALLBACK(bool, MSG_LEDS, &led_on, leds.toggle);
4262
       MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default);
4260
       MENU_ITEM(function, MSG_SET_LEDS_DEFAULT, leds.set_default);
4263
       #if ENABLED(LED_COLOR_PRESETS)
4261
       #if ENABLED(LED_COLOR_PRESETS)
4264
         MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu);
4262
         MENU_ITEM(submenu, MSG_LED_PRESETS, lcd_led_presets_menu);

Loading…
Cancel
Save