ui now functioning for livingroom

include/mqtt.h

@@ -18,7 +18,7 @@ void initMQTT();
 void runMQTT();
 
 #ifdef FEATURE_UI
-void writeMQTTtopic(const char *topic, const char *data, bool retain = true);
+void writeMQTT_UI(void);
 #endif // FEATURE_UI
 
 #endif // __MQTT_H__

include/ui.h

@@ -33,10 +33,10 @@ enum ui_state {
     UI_WIFI_CONNECTING,
     UI_WIFI_CONNECTED,
     UI_READY,
+    UI_UPDATE,
 };
 
 void ui_init(void);
-void ui_draw_menu(void);
 void ui_run(void);
 
 void ui_progress(enum ui_state state);

src/mqtt.cpp

@@ -157,20 +157,28 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
     // store new topic values for display
     if (ts == "livingroom/light_kitchen") {
         ui_status.light_kitchen = state ? true : false;
+        ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_pc") {
         ui_status.light_pc = state ? true : false;
+        ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_bench") {
         ui_status.light_bench = state ? true : false;
+        ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_amp") {
         ui_status.light_amp = state ? true : false;
+        ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_box") {
         ui_status.light_box = state ? true : false;
-    } else if (ts == "livingroom/TODO") {
+        ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/light_corner/cmnd/POWER") {
         ui_status.light_corner = state ? true: false;
-    } else if (ts == "livingroom/TODO") {
+        ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/workbench/cmnd/POWER") {
         ui_status.light_workspace = state ? true : false;
-    } else if (ts == "livingroom/TODO") {
+        ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/amp/cmnd/POWER") {
         ui_status.sound_amplifier = state ? true : false;
+        ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
 }
@@ -202,7 +210,9 @@ static void mqttReconnect() {
         mqtt.subscribe("livingroom/light_bench");
         mqtt.subscribe("livingroom/light_amp");
         mqtt.subscribe("livingroom/light_box");
-        // TODO corner lights, workspace, amp
+        mqtt.subscribe("livingroom/light_corner/cmnd/POWER");
+        mqtt.subscribe("livingroom/workbench/cmnd/POWER");
+        mqtt.subscribe("livingroom/amp/cmnd/POWER");
 #endif // FEATURE_UI
     }
 }
@@ -229,8 +239,29 @@ void runMQTT() {
 }
 
 #ifdef FEATURE_UI
-void writeMQTTtopic(const char *topic, const char *data, bool retain) {
-    mqtt.publish(topic, data, retain);
+static struct ui_status prev_status = ui_status;
+
+void writeMQTT_UI(void) {
+    struct ui_status curr_status = ui_status;
+    if (curr_status.light_amp != prev_status.light_amp) {
+        mqtt.publish("livingroom/light_amp", curr_status.light_amp ? "on" : "off", true);
+    } else if (curr_status.light_bench != prev_status.light_bench) {
+        mqtt.publish("livingroom/light_bench", curr_status.light_bench ? "on" : "off", true);
+    } else if (curr_status.light_box != prev_status.light_box) {
+        mqtt.publish("livingroom/light_box", curr_status.light_box ? "on" : "off", true);
+    } else if (curr_status.light_corner != prev_status.light_corner) {
+        mqtt.publish("livingroom/light_corner/cmnd/POWER", curr_status.light_corner ? "on" : "off", true);
+    } else if (curr_status.light_kitchen != prev_status.light_kitchen) {
+        mqtt.publish("livingroom/light_kitchen", curr_status.light_kitchen ? "on" : "off", true);
+    } else if (curr_status.light_pc != prev_status.light_pc) {
+        mqtt.publish("livingroom/light_pc", curr_status.light_pc ? "on" : "off", true);
+    } else if (curr_status.light_workspace != prev_status.light_workspace) {
+        mqtt.publish("livingroom/workbench/cmnd/POWER", curr_status.light_workspace ? "on" : "off", true);
+    } else if (curr_status.sound_amplifier != prev_status.sound_amplifier) {
+        mqtt.publish("livingroom/amp/cmnd/POWER", curr_status.sound_amplifier ? "on" : "off", true);
+    }
+
+    prev_status = curr_status;
 }
 #endif
 

src/ui.cpp

@@ -86,21 +86,61 @@ static void draw_button(const char *name, uint32_t x, uint32_t y, uint32_t color
 }
 
 static void draw_livingroom1(void) {
-    draw_button("Lights Corner", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2, ui_status.light_corner ? TFT_GREEN : TFT_RED);
-    draw_button("Lights Workspace", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, ui_status.light_workspace ? TFT_GREEN : TFT_RED);
-    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);
-
-    draw_button("Sound Amp.", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2, ui_status.sound_amplifier ? TFT_GREEN : TFT_RED);
-    draw_button("All Lights Off", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, TFT_RED);
+    // 1
+    draw_button("Lights Corner",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.light_corner ? TFT_GREEN : TFT_RED);
+
+    // 2
+    draw_button("Lights Workspace",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                ui_status.light_workspace ? 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("Sound Amp.",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.sound_amplifier ? TFT_GREEN : TFT_RED);
+
+    // 5
+    draw_button("All Lights Off",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                TFT_MAGENTA);
 }
 
 static void draw_livingroom2(void) {
-    draw_button("Lights PC", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2, ui_status.light_corner ? TFT_GREEN : TFT_RED);
-    draw_button("Lights Bench", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, ui_status.light_workspace ? TFT_GREEN : TFT_RED);
-    //draw_button("Lights Amp.", 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);
-
-    draw_button("Lights Amp.", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2, ui_status.sound_amplifier ? TFT_GREEN : TFT_RED);
-    draw_button("Lights Box", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, TFT_RED); // TODO both
+    // 1
+    draw_button("Lights PC",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.light_pc ? TFT_GREEN : TFT_RED);
+
+    // 2
+    draw_button("Lights Bench",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                ui_status.light_bench ? TFT_GREEN : TFT_RED);
+
+    // 4
+    draw_button("Lights Amp.",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2,
+                ui_status.light_amp ? TFT_GREEN : TFT_RED);
+
+    // 5
+    draw_button("Lights Box",
+                BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
+                BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
+                ui_status.light_box ? TFT_GREEN : TFT_RED);
 }
 
 void ui_init(void) {
@@ -118,6 +158,30 @@ void ui_init(void) {
     ui_progress(UI_INIT);
 }
 
+static void ui_draw_menu(void) {
+    switch (ui_page) {
+        case UI_START:
+            tft.fillScreen(TFT_BLACK);
+            ui_page = UI_LIVINGROOM1;
+            // fall-through
+
+        case UI_LIVINGROOM1:
+            draw_livingroom1();
+            break;
+
+        case UI_LIVINGROOM2:
+            draw_livingroom2();
+            break;
+
+        default:
+            ui_page = UI_START;
+            ui_draw_menu();
+            return;
+    }
+
+    draw_button("Next...", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2, TFT_CYAN);
+}
+
 void ui_progress(enum ui_state state) {
     int x = LCD_WIDTH / 2;
     int y = LCD_HEIGHT / 2;
@@ -153,33 +217,14 @@ void ui_progress(enum ui_state state) {
         } break;
 
         case UI_READY: {
-            tft.fillScreen(TFT_BLACK);
-            tft.setTextDatum(MC_DATUM); // middle center
-            tft.drawString("Ready", x, y, fontSize);
+            ui_page = UI_START;
+            ui_draw_menu();
         } break;
-    }
-}
 
-void ui_draw_menu(void) {
-    switch (ui_page) {
-        case UI_START:
-            tft.fillScreen(TFT_BLACK);
-            ui_page = UI_LIVINGROOM1;
-            // fall-through
-
-        case UI_LIVINGROOM1:
-            draw_livingroom1();
-            break;
-
-        case UI_LIVINGROOM2:
-            draw_livingroom2();
-            break;
-
-        default:
-            ui_page = UI_START;
+        case UI_UPDATE: {
+            ui_draw_menu();
+        } break;
     }
-
-    draw_button("Next...", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2, TFT_MAGENTA);
 }
 
 void ui_run(void) {
@@ -187,15 +232,49 @@ void ui_run(void) {
         TS_Point p = touchToScreen(ts.getPoint());
 
         if ((p.x >= BTNS_OFF_X) && (p.x <= BTNS_OFF_X + BTN_W) && (p.y >= BTNS_OFF_Y) && (p.y <= BTNS_OFF_Y + BTN_H)) {
-            INVERT_BOOL(ui_status.light_corner);
+            // 1
+            if (ui_page == UI_LIVINGROOM1) {
+                INVERT_BOOL(ui_status.light_corner);
+            } else if (ui_page == UI_LIVINGROOM2) {
+                INVERT_BOOL(ui_status.light_pc);
+            }
+            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))) {
-            INVERT_BOOL(ui_status.light_workspace);
+            // 2
+            if (ui_page == UI_LIVINGROOM1) {
+                INVERT_BOOL(ui_status.light_workspace);
+            } else if (ui_page == UI_LIVINGROOM2) {
+                INVERT_BOOL(ui_status.light_bench);
+            }
+            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))) {
-            INVERT_BOOL(ui_status.light_kitchen);
+            // 3
+            if (ui_page == UI_LIVINGROOM1) {
+                INVERT_BOOL(ui_status.light_kitchen);
+            }
+            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)) {
-            INVERT_BOOL(ui_status.sound_amplifier);
+            // 4
+            if (ui_page == UI_LIVINGROOM1) {
+                INVERT_BOOL(ui_status.sound_amplifier);
+            } else if (ui_page == UI_LIVINGROOM2) {
+                INVERT_BOOL(ui_status.light_amp);
+            }
+            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))) {
-            // TODO should act on both TV lights (box and amp)
+            // 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;
+            } else if (ui_page == UI_LIVINGROOM2) {
+                INVERT_BOOL(ui_status.light_box);
+            }
+            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))) {
             // switch to next page
             ui_page = (enum ui_pages)((ui_page + 1) % UI_NUM_PAGES);