add new kitchen sink lights and add wakeup option to all-off button.

include/ui.h

@@ -31,6 +31,7 @@ struct ui_status {
     bool light_amp;
     bool light_box;
     enum bathroom_light_states bathroom_lights;
+    bool light_sink;
 };
 
 extern struct ui_status ui_status;

src/mqtt.cpp

@@ -174,6 +174,10 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         }
         prev_status.bathroom_lights = ui_status.bathroom_lights;
         ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/light_sink/cmnd/POWER") {
+        ui_status.light_sink = state ? true : false;
+        prev_status.light_sink = ui_status.light_sink;
+        ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
 
@@ -247,6 +251,7 @@ static void mqttReconnect() {
         mqtt.subscribe("livingroom/workbench/cmnd/POWER");
         mqtt.subscribe("livingroom/amp/cmnd/POWER");
         mqtt.subscribe("bathroom/force_light");
+        mqtt.subscribe("livingroom/light_sink/cmnd/POWER");
 #endif // FEATURE_UI
     }
 }
@@ -321,6 +326,9 @@ void writeMQTT_UI(void) {
             mqttPublish("bathroom/force_light", "none", true);
         }
     }
+    if (curr_status.light_sink != prev_status.light_sink) {
+        mqttPublish("livingroom/light_sink/cmnd/POWER", curr_status.light_sink ? "on" : "off", true);
+    }
 
     prev_status = curr_status;
 }

src/ui.cpp

@@ -112,10 +112,10 @@ static void draw_livingroom1(void) {
                 ui_status.light_workspace ? TFT_GREEN : TFT_RED);
 
     // 3
-    draw_button("Lights Kitchen",
+    draw_button("Lights Sink",
                 BTNS_OFF_X + BTN_W / 2,
                 BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2,
-                ui_status.light_kitchen ? TFT_GREEN : TFT_RED);
+                ui_status.light_sink ? TFT_GREEN : TFT_RED);
 
     // 4
     draw_button("Sound Amp.",
@@ -124,7 +124,10 @@ static void draw_livingroom1(void) {
                 ui_status.sound_amplifier ? TFT_GREEN : TFT_RED);
 
     // 5
-    draw_button("All Lights Off",
+    bool on = ui_status.light_corner || ui_status.light_sink || ui_status.light_workspace
+            || ui_status.light_amp || ui_status.light_bench || ui_status.light_box
+            || ui_status.light_kitchen || ui_status.light_pc;
+    draw_button(on ? "All Lights Off" : "Wake Up Lights",
                 BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
                 BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
                 TFT_MAGENTA);
@@ -143,6 +146,12 @@ static void draw_livingroom2(void) {
                 BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
                 ui_status.light_bench ? TFT_GREEN : TFT_RED);
 
+    // 3
+    draw_button("Lights Kitchen",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2,
+                ui_status.light_kitchen ? TFT_GREEN : TFT_RED);
+
     // 4
     draw_button("Lights Amp.",
                 BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
@@ -371,6 +380,8 @@ void ui_run(void) {
         } else if ((p.x >= BTNS_OFF_X) && (p.x <= BTNS_OFF_X + BTN_W) && (p.y >= (BTNS_OFF_Y + BTN_H * 2 + BTN_GAP * 2)) && (p.y <= (BTNS_OFF_Y + BTN_H * 2 + BTN_GAP * 2 + BTN_H))) {
             // 3
             if (ui_page == UI_LIVINGROOM1) {
+                INVERT_BOOL(ui_status.light_sink);
+            } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_kitchen);
             }
             writeMQTT_UI();
@@ -387,13 +398,22 @@ void ui_run(void) {
         } else if ((p.x >= BTNS_OFF_X + BTN_W + BTN_GAP) && (p.x <= BTNS_OFF_X + BTN_W + BTN_GAP + BTN_W) && (p.y >= (BTNS_OFF_Y + BTN_H + BTN_GAP)) && (p.y <= (BTNS_OFF_Y + BTN_H + BTN_GAP + BTN_H))) {
             // 5
             if (ui_page == UI_LIVINGROOM1) {
-                ui_status.light_amp = false;
-                ui_status.light_kitchen = false;
-                ui_status.light_bench= false;
-                ui_status.light_workspace = false;
-                ui_status.light_pc = false;
-                ui_status.light_corner = false;
-                ui_status.light_box = false;
+                bool on = ui_status.light_corner || ui_status.light_sink || ui_status.light_workspace
+                        || ui_status.light_amp || ui_status.light_bench || ui_status.light_box
+                        || ui_status.light_kitchen || ui_status.light_pc;
+                if (on) {
+                    ui_status.light_amp = false;
+                    ui_status.light_kitchen = false;
+                    ui_status.light_bench= false;
+                    ui_status.light_workspace = false;
+                    ui_status.light_pc = false;
+                    ui_status.light_corner = false;
+                    ui_status.light_box = false;
+                    ui_status.light_sink = false;
+                } else {
+                    ui_status.light_corner = true;
+                    ui_status.light_sink = true;
+                }
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_box);
             } else if (ui_page == UI_BATHROOM) {