|
@@ -54,9 +54,33 @@
|
54
|
54
|
|
55
|
55
|
#endif
|
56
|
56
|
|
|
57
|
+ #if ENABLED(NEO2_COLOR_PRESETS)
|
|
58
|
+
|
|
59
|
+ void menu_leds2_presets() {
|
|
60
|
+ START_MENU();
|
|
61
|
+ #if LCD_HEIGHT > 2
|
|
62
|
+ STATIC_ITEM(MSG_NEO2_PRESETS, SS_DEFAULT|SS_INVERT);
|
|
63
|
+ #endif
|
|
64
|
+ BACK_ITEM(MSG_LED_CONTROL);
|
|
65
|
+ ACTION_ITEM(MSG_SET_LEDS_WHITE, leds2.set_white);
|
|
66
|
+ ACTION_ITEM(MSG_SET_LEDS_RED, leds2.set_red);
|
|
67
|
+ ACTION_ITEM(MSG_SET_LEDS_ORANGE, leds2.set_orange);
|
|
68
|
+ ACTION_ITEM(MSG_SET_LEDS_YELLOW, leds2.set_yellow);
|
|
69
|
+ ACTION_ITEM(MSG_SET_LEDS_GREEN, leds2.set_green);
|
|
70
|
+ ACTION_ITEM(MSG_SET_LEDS_BLUE, leds2.set_blue);
|
|
71
|
+ ACTION_ITEM(MSG_SET_LEDS_INDIGO, leds2.set_indigo);
|
|
72
|
+ ACTION_ITEM(MSG_SET_LEDS_VIOLET, leds2.set_violet);
|
|
73
|
+ END_MENU();
|
|
74
|
+ }
|
|
75
|
+
|
|
76
|
+ #endif
|
|
77
|
+
|
57
|
78
|
void menu_led_custom() {
|
58
|
79
|
START_MENU();
|
59
|
80
|
BACK_ITEM(MSG_LED_CONTROL);
|
|
81
|
+ #if ENABLED(NEOPIXEL2_SEPARATE)
|
|
82
|
+ STATIC_ITEM_N(MSG_LED_CHANNEL_N, 1, SS_DEFAULT|SS_INVERT);
|
|
83
|
+ #endif
|
60
|
84
|
EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds.color.r, 0, 255, leds.update, true);
|
61
|
85
|
EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds.color.g, 0, 255, leds.update, true);
|
62
|
86
|
EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds.color.b, 0, 255, leds.update, true);
|
|
@@ -66,6 +90,14 @@
|
66
|
90
|
EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
|
67
|
91
|
#endif
|
68
|
92
|
#endif
|
|
93
|
+ #if ENABLED(NEOPIXEL2_SEPARATE)
|
|
94
|
+ STATIC_ITEM_N(MSG_LED_CHANNEL_N, 2, SS_DEFAULT|SS_INVERT);
|
|
95
|
+ EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds2.color.r, 0, 255, leds2.update, true);
|
|
96
|
+ EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds2.color.g, 0, 255, leds2.update, true);
|
|
97
|
+ EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds2.color.b, 0, 255, leds2.update, true);
|
|
98
|
+ EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds2.color.w, 0, 255, leds2.update, true);
|
|
99
|
+ EDIT_ITEM(uint8, MSG_NEO2_BRIGHTNESS, &leds2.color.i, 0, 255, leds2.update, true);
|
|
100
|
+ #endif
|
69
|
101
|
END_MENU();
|
70
|
102
|
}
|
71
|
103
|
#endif
|
|
@@ -89,12 +121,20 @@ void menu_led() {
|
89
|
121
|
BACK_ITEM(MSG_MAIN);
|
90
|
122
|
|
91
|
123
|
#if ENABLED(LED_CONTROL_MENU)
|
92
|
|
- bool led_on = leds.lights_on;
|
93
|
|
- EDIT_ITEM(bool, MSG_LEDS, &led_on, leds.toggle);
|
|
124
|
+ editable.state = leds.lights_on;
|
|
125
|
+ EDIT_ITEM(bool, MSG_LEDS, &editable.state, leds.toggle);
|
94
|
126
|
ACTION_ITEM(MSG_SET_LEDS_DEFAULT, leds.set_default);
|
|
127
|
+ #if ENABLED(NEOPIXEL2_SEPARATE)
|
|
128
|
+ editable.state = leds2.lights_on;
|
|
129
|
+ EDIT_ITEM(bool, MSG_LEDS2, &editable.state, leds2.toggle);
|
|
130
|
+ ACTION_ITEM(MSG_SET_LEDS_DEFAULT, leds2.set_default);
|
|
131
|
+ #endif
|
95
|
132
|
#if ENABLED(LED_COLOR_PRESETS)
|
96
|
133
|
SUBMENU(MSG_LED_PRESETS, menu_led_presets);
|
97
|
134
|
#endif
|
|
135
|
+ #if ENABLED(NEO2_COLOR_PRESETS)
|
|
136
|
+ SUBMENU(MSG_NEO2_PRESETS, menu_leds2_presets);
|
|
137
|
+ #endif
|
98
|
138
|
SUBMENU(MSG_CUSTOM_LEDS, menu_led_custom);
|
99
|
139
|
#endif
|
100
|
140
|
|