basic menu ui with buttons working

include/ui.h

@@ -14,6 +14,19 @@
 #ifndef __UI_H__
 #define __UI_H__
 
+struct ui_status {
+    bool light_corner;
+    bool light_workspace;
+    bool light_kitchen;
+    bool sound_amplifier;
+    bool light_bench;
+    bool light_pc;
+    bool light_amp;
+    bool light_box;
+};
+
+extern struct ui_status ui_status;
+
 void ui_init(void);
 void ui_draw_menu(void);
 void ui_run(void);

src/mqtt.cpp

@@ -18,6 +18,7 @@
 #include "sensors.h"
 #include "relais.h"
 #include "influx.h"
+#include "ui.h"
 #include "mqtt.h"
 
 #ifdef ENABLE_MQTT
@@ -103,8 +104,18 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
     debug.print(ps);
     debug.println(F("\""));
 
-#ifdef FEATURE_RELAIS
+#if defined(FEATURE_RELAIS) || defined(FEATURE_UI)
     int state = 0;
+    if (ps.indexOf("on") != -1) {
+        state = 1;
+    } else if (ps.indexOf("off") != -1) {
+        state = 0;
+    } else {
+        return;
+    }
+#endif
+
+#ifdef FEATURE_RELAIS
     int id = -1;
 
     String our_topic(SENSOR_LOCATION);
@@ -130,14 +141,6 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         return;
     }
 
-    if (ps.indexOf("on") != -1) {
-        state = 1;
-    } else if (ps.indexOf("off") != -1) {
-        state = 0;
-    } else {
-        return;
-    }
-
     if ((id >= 0) && (id < relais_count())) {
         debug.print(F("Turning "));
         debug.print(state ? "on" : "off");
@@ -149,6 +152,27 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         writeDatabase();
     }
 #endif // FEATURE_RELAIS
+
+#ifdef FEATURE_UI
+    // store new topic values for display
+    if (ts == "livingroom/light_kitchen") {
+        ui_status.light_kitchen = state ? true : false;
+    } else if (ts == "livingroom/light_pc") {
+        ui_status.light_pc = state ? true : false;
+    } else if (ts == "livingroom/light_bench") {
+        ui_status.light_bench = state ? true : false;
+    } else if (ts == "livingroom/light_amp") {
+        ui_status.light_amp = state ? true : false;
+    } else if (ts == "livingroom/light_box") {
+        ui_status.light_box = state ? true : false;
+    } else if (ts == "livingroom/TODO") {
+        ui_status.light_corner = state ? true: false;
+    } else if (ts == "livingroom/TODO") {
+        ui_status.light_workspace = state ? true : false;
+    } else if (ts == "livingroom/TODO") {
+        ui_status.sound_amplifier = state ? true : false;
+    }
+#endif // FEATURE_UI
 }
 
 static void mqttReconnect() {
@@ -172,7 +196,13 @@ static void mqttReconnect() {
 #endif // FEATURE_RELAIS
 
 #ifdef FEATURE_UI
+        // TODO need to list all topics we're interested in?
         mqtt.subscribe("livingroom/light_kitchen");
+        mqtt.subscribe("livingroom/light_pc");
+        mqtt.subscribe("livingroom/light_bench");
+        mqtt.subscribe("livingroom/light_amp");
+        mqtt.subscribe("livingroom/light_box");
+        // TODO corner lights, workspace, amp
 #endif // FEATURE_UI
     }
 }

src/ui.cpp

@@ -42,11 +42,31 @@
 #define TOUCH_TOP 230
 #define TOUCH_BOTTOM 3800
 
+#define BTN_W 120
+#define BTN_H 60
+#define BTN_GAP 20
+
+#define BTNS_OFF_X ((LCD_WIDTH - (2 * BTN_W) - (1 * BTN_GAP)) / 2)
+#define BTNS_OFF_Y ((LCD_HEIGHT - (3 * BTN_H) - (2 * BTN_GAP)) / 2)
+
+#define INVERT_BOOL(x) (x) = !(x);
+
 static SPIClass mySpi = SPIClass(HSPI);
 static XPT2046_Touchscreen ts(XPT2046_CS, XPT2046_IRQ);
-
 static TFT_eSPI tft = TFT_eSPI();
 
+struct ui_status ui_status = {0};
+
+enum ui_states {
+    UI_INIT = 0,
+    UI_LIVINGROOM1,
+    UI_LIVINGROOM2,
+
+    UI_NUM_STATES
+};
+
+static enum ui_states ui_state = UI_INIT;
+
 static TS_Point touchToScreen(TS_Point p) {
     p.x = map(p.x, TOUCH_LEFT, TOUCH_RIGHT, 0, LCD_WIDTH);
     p.y = map(p.y, TOUCH_TOP, TOUCH_BOTTOM, 0, LCD_HEIGHT);
@@ -58,30 +78,29 @@ static void ledcAnalogWrite(uint8_t channel, uint32_t value, uint32_t valueMax =
     ledcWrite(channel, duty);
 }
 
-#define BTN_W 120
-#define BTN_H 60
-#define BTN_GAP 20
-
-#define BTNS_OFF_X ((LCD_WIDTH - (2 * BTN_W) - (1 * BTN_GAP)) / 2)
-#define BTNS_OFF_Y ((LCD_HEIGHT - (3 * BTN_H) - (2 * BTN_GAP)) / 2)
-
-static void draw_button(const char *name, uint32_t x, uint32_t y, bool state) {
-    tft.fillRect(x - BTN_W / 2, y - BTN_H / 2, BTN_W, BTN_H, state ? TFT_GREEN : TFT_RED);
+static void draw_button(const char *name, uint32_t x, uint32_t y, uint32_t color) {
+    tft.fillRect(x - BTN_W / 2, y - BTN_H / 2, BTN_W, BTN_H, color);
 
     tft.setTextDatum(MC_DATUM); // middle center
     tft.drawString(name, x, y, 2);
 }
 
-static bool lc, lw, lk, sa, lt, lp;
+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);
 
-static void draw_livingroom(void) {
-    draw_button("Lights Corner", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2, lc);
-    draw_button("Lights Workspace", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, lw);
-    draw_button("Lights Kitchen", BTNS_OFF_X + BTN_W / 2, BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2, lk);
+    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);
+}
+
+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("Sound Amp.", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2, sa);
-    draw_button("Lights TV", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP, lt);
-    draw_button("Lights PC", BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP, BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2, lp);
+    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
 }
 
 void ui_init(void) {
@@ -101,11 +120,30 @@ void ui_init(void) {
     tft.setTextDatum(MC_DATUM); // middle center
     tft.drawString("Initializing ESP-ENV", LCD_WIDTH / 2, LCD_HEIGHT / 2 - 16, 2);
     tft.drawString("xythobuz.de", LCD_WIDTH / 2, LCD_HEIGHT / 2 + 16, 2);
+
+    ui_state = UI_INIT;
 }
 
 void ui_draw_menu(void) {
-    tft.fillScreen(TFT_BLACK);
-    draw_livingroom();
+    switch (ui_state) {
+        case UI_INIT:
+            tft.fillScreen(TFT_BLACK);
+            ui_state = UI_LIVINGROOM1;
+            // fall-through
+
+        case UI_LIVINGROOM1:
+            draw_livingroom1();
+            break;
+
+        case UI_LIVINGROOM2:
+            draw_livingroom2();
+            break;
+
+        default:
+            ui_state = UI_INIT;
+    }
+
+    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) {
@@ -113,22 +151,27 @@ 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)) {
-            lc = !lc;
+            INVERT_BOOL(ui_status.light_corner);
         } 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))) {
-            lw = !lw;
+            INVERT_BOOL(ui_status.light_workspace);
         } 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))) {
-            lk = !lk;
+            INVERT_BOOL(ui_status.light_kitchen);
         } 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)) {
-            sa = !sa;
+            INVERT_BOOL(ui_status.sound_amplifier);
         } 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))) {
-            lt = !lt;
+            // TODO should act on both TV lights (box and amp)
         } 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))) {
-            lp = !lp;
+            // switch to next page
+            ui_state = (enum ui_states)((ui_state + 1) % UI_NUM_STATES);
+            if (ui_state == UI_INIT) {
+                // skip init screen
+                ui_state = (enum ui_states)((ui_state + 1) % UI_NUM_STATES);
+            }
+            tft.fillScreen(TFT_BLACK);
         }
 
-        // TODO
-        draw_livingroom();
-        delay(100);
+        ui_draw_menu();
+        delay(100); // TODO
     }
 }