wait some time after a registered touch and react properly to external mqtt events

src/DebugLog.cpp

@@ -38,7 +38,7 @@ void DebugLog::addToBuffer(String s) {
 
 void DebugLog::sendToTargets(String s) {
     Serial.print(s);
-    
+
     s = "log:" + s;
     wifi_send_websocket(s);
 }
@@ -51,7 +51,7 @@ void DebugLog::print(String s) {
 #ifdef ENABLE_DEBUGLOG
     addToBuffer(s);
 #endif // ENABLE_DEBUGLOG
-    
+
     sendToTargets(s);
 }
 

src/mqtt.cpp

@@ -49,6 +49,10 @@ PubSubClient mqtt(mqttClient);
 static unsigned long last_mqtt_reconnect_time = 0;
 static unsigned long last_mqtt_write_time = 0;
 
+#ifdef FEATURE_UI
+static struct ui_status prev_status = ui_status;
+#endif // FEATURE_UI
+
 static void writeMQTT() {
     if (!mqtt.connected()) {
         return;
@@ -117,73 +121,44 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
     } else if (ps.indexOf("none") != -1) {
         state = 4;
     } else {
+        debug.println(F("parse abort"));
         return;
     }
 #endif
 
-#ifdef FEATURE_RELAIS
-    int id = -1;
-
-    String our_topic(SENSOR_LOCATION);
-    our_topic += "/";
-
-    if (!ts.startsWith(our_topic)) {
-        debug.print(F("Unknown MQTT room "));
-        debug.println(ts);
-        return;
-    }
-
-    String ids = ts.substring(our_topic.length());
-    for (int i = 0; i < relais_count(); i++) {
-        if (ids == relais_name(i)) {
-            id = i;
-            break;
-        }
-    }
-
-    if (id < 0) {
-        debug.print(F("Unknown MQTT topic "));
-        debug.println(ts);
-        return;
-    }
-
-    if ((id >= 0) && (id < relais_count())) {
-        debug.print(F("Turning "));
-        debug.print(state ? "on" : "off");
-        debug.print(F(" relais "));
-        debug.println(id);
-
-        relais_set(id, state);
-
-        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;
+        prev_status.light_kitchen = ui_status.light_kitchen;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_pc") {
         ui_status.light_pc = state ? true : false;
+        prev_status.light_pc = ui_status.light_pc;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_bench") {
         ui_status.light_bench = state ? true : false;
+        prev_status.light_bench = ui_status.light_bench;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_amp") {
         ui_status.light_amp = state ? true : false;
+        prev_status.light_amp = ui_status.light_amp;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_box") {
         ui_status.light_box = state ? true : false;
+        prev_status.light_box = ui_status.light_box;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/light_corner/cmnd/POWER") {
-        ui_status.light_corner = state ? true: false;
+        ui_status.light_corner = state ? true : false;
+        prev_status.light_corner = ui_status.light_corner;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/workbench/cmnd/POWER") {
         ui_status.light_workspace = state ? true : false;
+        prev_status.light_workspace = ui_status.light_workspace;
         ui_progress(UI_UPDATE);
     } else if (ts == "livingroom/amp/cmnd/POWER") {
         ui_status.sound_amplifier = state ? true : false;
+        prev_status.sound_amplifier = ui_status.sound_amplifier;
         ui_progress(UI_UPDATE);
     } else if (ts == "bathroom/force_light") {
         if (state == 0) {
@@ -197,9 +172,48 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         } else if (state == 4) {
             ui_status.bathroom_lights = BATH_LIGHT_NONE;
         }
+        prev_status.bathroom_lights = ui_status.bathroom_lights;
         ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
+
+#ifdef FEATURE_RELAIS
+    int id = -1;
+
+    String our_topic(SENSOR_LOCATION);
+    our_topic += "/";
+
+    if (!ts.startsWith(our_topic)) {
+        debug.print(F("Unknown MQTT room "));
+        debug.println(ts);
+        return;
+    }
+
+    String ids = ts.substring(our_topic.length());
+    for (int i = 0; i < relais_count(); i++) {
+        if (ids == relais_name(i)) {
+            id = i;
+            break;
+        }
+    }
+
+    if (id < 0) {
+        debug.print(F("Unknown MQTT topic "));
+        debug.println(ts);
+        return;
+    }
+
+    if ((id >= 0) && (id < relais_count())) {
+        debug.print(F("Turning "));
+        debug.print(state ? "on" : "off");
+        debug.print(F(" relais "));
+        debug.println(id);
+
+        relais_set(id, state);
+
+        writeDatabase();
+    }
+#endif // FEATURE_RELAIS
 }
 
 static void mqttReconnect() {
@@ -259,7 +273,6 @@ void runMQTT() {
 }
 
 #ifdef FEATURE_UI
-static struct ui_status prev_status = ui_status;
 
 static void mqttPublish(const char* ts, const char *ps, bool retained) {
     debug.print(F("MQTT  Tx&gt; @ \""));

src/ui.cpp

@@ -52,12 +52,11 @@
 #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);
+#define INVERT_BOOL(x) (x) = !(x)
 
 #define LDR_CHECK_MS 1000
-
-#define TOUCH_PRESSURE_MIN_DOWN 200
-#define TOUCH_PRESSURE_MIN_UP 10
+#define MIN_TOUCH_DELAY_MS 200
+#define TOUCH_PRESSURE_MIN 200
 
 static SPIClass mySpi = SPIClass(HSPI);
 static XPT2046_Touchscreen ts(XPT2046_CS, XPT2046_IRQ);
@@ -79,6 +78,7 @@ static enum ui_pages ui_page = UI_START;
 static bool is_touched = false;
 static unsigned long last_ldr = 0;
 static int ldr_value = 0;
+static unsigned long last_touch_time = 0;
 
 static TS_Point touchToScreen(TS_Point p) {
     p.x = map(p.x, TOUCH_LEFT, TOUCH_RIGHT, 0, LCD_WIDTH);
@@ -305,11 +305,15 @@ void ui_progress(enum ui_state state) {
 
 void ui_run(void) {
     unsigned long now = millis();
+
     if (now >= (last_ldr + LDR_CHECK_MS)) {
         last_ldr = now;
         int ldr = analogRead(LDR_PIN);
+
+        // TODO lowpass?
         //ldr_value = (ldr_value * 0.9f) + (ldr * 0.1f);
         ldr_value = ldr;
+
         if (ui_page == UI_INFO) {
             ui_draw_menu();
         }
@@ -322,13 +326,14 @@ void ui_run(void) {
         p = touchToScreen(ts.getPoint());
 
         // minimum pressure
-        if (p.z < TOUCH_PRESSURE_MIN_DOWN) {
+        if (p.z < TOUCH_PRESSURE_MIN) {
             touched = false;
         }
     }
 
     if (touched && (!is_touched)) {
         is_touched = true;
+        last_touch_time = millis();
 
         if (ui_page == UI_INFO) {
             // switch to next page
@@ -406,7 +411,7 @@ void ui_run(void) {
         }
 
         ui_draw_menu();
-    } else if ((!touched) && is_touched && (p.z < TOUCH_PRESSURE_MIN_UP)) {
+    } else if ((!touched) && is_touched && ((now - last_touch_time) >= MIN_TOUCH_DELAY_MS)) {
         is_touched = false;
     }
 }