add pc displays to ui

include/ui.h

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

src/mqtt.cpp

@@ -178,6 +178,10 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         ui_status.light_sink = state ? true : false;
         prev_status.light_sink = ui_status.light_sink;
         ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/displays/cmnd/POWER") {
+        ui_status.pc_displays = state ? true : false;
+        prev_status.pc_displays = ui_status.pc_displays;
+        ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
 
@@ -252,6 +256,7 @@ static void mqttReconnect() {
         mqtt.subscribe("livingroom/amp/cmnd/POWER");
         mqtt.subscribe("bathroom/force_light");
         mqtt.subscribe("livingroom/light_sink/cmnd/POWER");
+        mqtt.subscribe("livingroom/displays/cmnd/POWER");
 #endif // FEATURE_UI
     }
 }
@@ -329,6 +334,9 @@ void writeMQTT_UI(void) {
     if (curr_status.light_sink != prev_status.light_sink) {
         mqttPublish("livingroom/light_sink/cmnd/POWER", curr_status.light_sink ? "on" : "off", true);
     }
+    if (curr_status.pc_displays != prev_status.pc_displays) {
+        mqttPublish("livingroom/displays/cmnd/POWER", curr_status.pc_displays ? "on" : "off", true);
+    }
 
     prev_status = curr_status;
 }

src/ui.cpp

@@ -154,7 +154,7 @@ static void draw_livingroom1(void) {
     // 5
     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;
+            || ui_status.light_kitchen || ui_status.light_pc || ui_status.pc_displays;
     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,
@@ -206,6 +206,13 @@ static void draw_bathroom(void) {
                 BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
                 ui_status.bathroom_lights == BATH_LIGHT_BIG ? TFT_GREEN : TFT_RED);
 
+    // 3
+    // TODO own page?
+    draw_button("PC Displays",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2,
+                ui_status.pc_displays ? TFT_GREEN : TFT_RED);
+
     // 4
     draw_button("Bath Lights Off",
                 BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
@@ -585,6 +592,8 @@ void ui_run(void) {
                 INVERT_BOOL(ui_status.light_sink);
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_kitchen);
+            } else if (ui_page == UI_BATHROOM) {
+                INVERT_BOOL(ui_status.pc_displays);
             }
             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) && (p.y <= BTNS_OFF_Y + BTN_H)) {
@@ -602,7 +611,7 @@ void ui_run(void) {
             if (ui_page == UI_LIVINGROOM1) {
                 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;
+                        || ui_status.light_kitchen || ui_status.light_pc || ui_status.pc_displays;
                 if (on) {
                     ui_status.light_amp = false;
                     ui_status.light_kitchen = false;
@@ -612,9 +621,11 @@ void ui_run(void) {
                     ui_status.light_corner = false;
                     ui_status.light_box = false;
                     ui_status.light_sink = false;
+                    ui_status.pc_displays = false;
                 } else {
                     ui_status.light_corner = true;
                     ui_status.light_sink = true;
+                    ui_status.pc_displays = true;
                 }
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_box);