add ui for bathroom lights

include/ui.h

@@ -14,6 +14,13 @@
 #ifndef __UI_H__
 #define __UI_H__
 
+enum bathroom_light_states {
+    BATH_LIGHT_OFF,
+    BATH_LIGHT_NONE,
+    BATH_LIGHT_BIG,
+    BATH_LIGHT_SMALL,
+};
+
 struct ui_status {
     bool light_corner;
     bool light_workspace;
@@ -23,6 +30,7 @@ struct ui_status {
     bool light_pc;
     bool light_amp;
     bool light_box;
+    enum bathroom_light_states bathroom_lights;
 };
 
 extern struct ui_status ui_status;

src/mqtt.cpp

@@ -110,6 +110,12 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         state = 1;
     } else if (ps.indexOf("off") != -1) {
         state = 0;
+    } else if (ps.indexOf("big") != -1) {
+        state = 3;
+    } else if (ps.indexOf("small") != -1) {
+        state = 2;
+    } else if (ps.indexOf("none") != -1) {
+        state = 4;
     } else {
         return;
     }
@@ -179,6 +185,19 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
     } else if (ts == "livingroom/amp/cmnd/POWER") {
         ui_status.sound_amplifier = state ? true : false;
         ui_progress(UI_UPDATE);
+    } else if (ts == "bathroom/force_light") {
+        if (state == 0) {
+            ui_status.bathroom_lights = BATH_LIGHT_OFF;
+        } else if (state == 1) {
+            ui_status.bathroom_lights = BATH_LIGHT_NONE;
+        } else if (state == 2) {
+            ui_status.bathroom_lights = BATH_LIGHT_SMALL;
+        } else if (state == 3) {
+            ui_status.bathroom_lights = BATH_LIGHT_BIG;
+        } else if (state == 4) {
+            ui_status.bathroom_lights = BATH_LIGHT_NONE;
+        }
+        ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
 }
@@ -213,6 +232,7 @@ static void mqttReconnect() {
         mqtt.subscribe("livingroom/light_corner/cmnd/POWER");
         mqtt.subscribe("livingroom/workbench/cmnd/POWER");
         mqtt.subscribe("livingroom/amp/cmnd/POWER");
+        mqtt.subscribe("bathroom/force_light");
 #endif // FEATURE_UI
     }
 }
@@ -277,6 +297,17 @@ void writeMQTT_UI(void) {
     if (curr_status.sound_amplifier != prev_status.sound_amplifier) {
         mqttPublish("livingroom/amp/cmnd/POWER", curr_status.sound_amplifier ? "on" : "off", true);
     }
+    if (curr_status.bathroom_lights != prev_status.bathroom_lights) {
+        if (curr_status.bathroom_lights == BATH_LIGHT_BIG) {
+            mqttPublish("bathroom/force_light", "big", true);
+        } else if (curr_status.bathroom_lights == BATH_LIGHT_SMALL) {
+            mqttPublish("bathroom/force_light", "small", true);
+        } else if (curr_status.bathroom_lights == BATH_LIGHT_OFF) {
+            mqttPublish("bathroom/force_light", "off", true);
+        } else {
+            mqttPublish("bathroom/force_light", "none", true);
+        }
+    }
 
     prev_status = curr_status;
 }

src/ui.cpp

@@ -61,6 +61,7 @@ enum ui_pages {
     UI_START = 0,
     UI_LIVINGROOM1,
     UI_LIVINGROOM2,
+    UI_BATHROOM,
 
     UI_NUM_PAGES
 };
@@ -143,6 +144,32 @@ static void draw_livingroom2(void) {
                 ui_status.light_box ? TFT_GREEN : TFT_RED);
 }
 
+static void draw_bathroom(void) {
+    // 1
+    draw_button("Bath Lights Auto",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.bathroom_lights == BATH_LIGHT_NONE ? TFT_GREEN : TFT_RED);
+
+    // 2
+    draw_button("Bath Lights Big",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                ui_status.bathroom_lights == BATH_LIGHT_BIG ? TFT_GREEN : TFT_RED);
+
+    // 4
+    draw_button("Bath Lights Off",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.bathroom_lights == BATH_LIGHT_OFF ? TFT_GREEN : TFT_RED);
+
+    // 5
+    draw_button("Bath Lights Small",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                ui_status.bathroom_lights == BATH_LIGHT_SMALL ? TFT_GREEN : TFT_RED);
+}
+
 void ui_init(void) {
     mySpi.begin(XPT2046_CLK, XPT2046_MISO, XPT2046_MOSI, XPT2046_CS);
     ts.begin(mySpi);
@@ -173,6 +200,10 @@ static void ui_draw_menu(void) {
             draw_livingroom2();
             break;
 
+        case UI_BATHROOM:
+            draw_bathroom();
+            break;
+
         default:
             ui_page = UI_START;
             ui_draw_menu();
@@ -237,6 +268,8 @@ void ui_run(void) {
                 INVERT_BOOL(ui_status.light_corner);
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_pc);
+            } else if (ui_page == UI_BATHROOM) {
+                ui_status.bathroom_lights = BATH_LIGHT_NONE;
             }
             writeMQTT_UI();
         } else if ((p.x >= BTNS_OFF_X) && (p.x <= BTNS_OFF_X + BTN_W) && (p.y >= (BTNS_OFF_Y + BTN_H + BTN_GAP)) && (p.y <= (BTNS_OFF_Y + BTN_H + BTN_GAP + BTN_H))) {
@@ -245,6 +278,8 @@ void ui_run(void) {
                 INVERT_BOOL(ui_status.light_workspace);
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_bench);
+            } else if (ui_page == UI_BATHROOM) {
+                ui_status.bathroom_lights = BATH_LIGHT_BIG;
             }
             writeMQTT_UI();
         } 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))) {
@@ -259,6 +294,8 @@ void ui_run(void) {
                 INVERT_BOOL(ui_status.sound_amplifier);
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_amp);
+            } else if (ui_page == UI_BATHROOM) {
+                ui_status.bathroom_lights = BATH_LIGHT_OFF;
             }
             writeMQTT_UI();
         } 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))) {
@@ -273,6 +310,8 @@ void ui_run(void) {
                 ui_status.light_box = false;
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_box);
+            } else if (ui_page == UI_BATHROOM) {
+                ui_status.bathroom_lights = BATH_LIGHT_SMALL;
             }
             writeMQTT_UI();
         } 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 * 2 + BTN_GAP * 2)) && (p.y <= (BTNS_OFF_Y + BTN_H * 2 + BTN_GAP * 2 + BTN_H))) {