Refactored system messages

Author: CelliesProjects

src/displayTask.cpp

@@ -5,6 +5,34 @@ static float mapf(const float x, const float in_min, const float in_max, const f
     return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }
 
+static void showSystemMessage(char *str)
+{
+    static LGFX_Sprite sysMess(&display);
+
+    if (sysMess.width() == 0 || sysMess.height() == 0)
+    {
+        sysMess.setColorDepth(lgfx::palette_2bit);
+        if (!sysMess.createSprite(display.width(), GRAPH_HEIGHT))
+        {
+            log_e("could not create sprite");
+            return;
+        }
+        sysMess.setPaletteColor(1, 200, 200, 200);
+        sysMess.setTextColor(1);
+    }
+    sysMess.clear();
+
+    auto cnt = 0;
+    char *pch = strtok(str, "\n");
+    while (pch)
+    {
+        sysMess.drawCenterString(pch, display.width() >> 1, cnt++ * DejaVu24Modded.yAdvance, &DejaVu24Modded);
+        pch = strtok(NULL, "\n");
+    }
+
+    sysMess.pushSprite(0, GRAPH_HEIGHT + 5);
+}
+
 static void updateCo2History(const int32_t w, const int32_t h, const int32_t x, const int32_t y)
 {
     [[maybe_unused]] auto const START_MS = millis();
@@ -532,24 +560,13 @@ static void updateWeatherForecast(const int32_t w, const int32_t h, const int32_
     weather.pushSprite(x, y);
 }
 
-static void handleMessage(const displayMessage &msg)
+static void handleMessage(displayMessage &msg)
 {
     switch (msg.type)
     {
     case displayMessage::SYSTEM_MESSAGE:
     {
-        static LGFX_Sprite sysMess(&display);
-        if (sysMess.width() == 0 || sysMess.height() == 0)
-        {
-            if (!sysMess.createSprite(display.width(), GRAPH_HEIGHT))
-            {
-                log_e("could not create sprite");
-                return;
-            }
-        }
-        sysMess.setTextColor(TFT_WHITE, TFT_BLACK);
-        sysMess.drawCenterString(msg.str, display.width() >> 1, 40, &DejaVu24Modded);
-        sysMess.pushSprite(0, GRAPH_HEIGHT + 5);
+        showSystemMessage(msg.str);
         break;
     }
 
@@ -632,6 +649,11 @@ static void updateClock(const struct tm &timeinfo)
     clock.pushSprite(0, GRAPH_HEIGHT * 3 + 15);
 }
 
+bool TFTtouched(int32_t &x, int32_t &y)
+{
+    return display.getTouch(&x, &y) ? true : false;
+}
+
 void displayTask(void *parameter)
 {
     display.setColorDepth(lgfx::rgb565_2Byte);

src/displayTask.hpp

@@ -35,8 +35,6 @@ static const auto WEATHER_BACKGROUND = display.color565(245, 102, 10);
 
 QueueHandle_t displayQueue = nullptr;
 
-void displayTask(void *parameter);
-
 /* weather icons from https://github.com/visualcrossing/WeatherIcons/tree/main/PNG/1st%20Set%20-%20Color */
 
 extern const uint8_t clear_day_png_start[] asm("_binary_src_weather_icons_clear_day_png_start");

src/main.cpp

@@ -23,6 +23,7 @@
 #include "displayMessageStruct.hpp"
 
 extern void displayTask(void *parameter);
+extern bool TFTtouched(int32_t &x, int32_t &y);
 extern void weatherDownloadTask(void *parameter);
 
 extern QueueHandle_t displayQueue;
@@ -253,6 +254,21 @@ static void ntpSynced(void *cb_arg)
     sntp_set_time_sync_notification_cb(NULL);
 }
 
+static bool getSensorhubIP(IPAddress &hubIP)
+{
+    int ndx = MDNS.queryService("http", "tcp");
+    while (--ndx != -1)
+    {
+        if (MDNS.hostname(ndx) == WEBSOCKET_MDNS_HOSTNAME)
+            break;
+    }
+    if (ndx == -1)
+        return false;
+
+    hubIP = MDNS.IP(ndx);
+    return true;
+}
+
 void setup()
 {
     Serial.begin(115200);
@@ -300,53 +316,43 @@ void setup()
         while (1)
             delay(100);
     }
+
+    messageOnTFT("Looking for WiFi...\nPlease wait");
+
     log_i("waiting for WiFi network %s to connect", WIFI_SSID);
 
     while (!WiFi.isConnected())
         vTaskDelay(pdMS_TO_TICKS(10));
 
     log_i("connected to %s", WIFI_SSID);
 
-    messageOnTFT("Searching the sensors...");
-
     if (mdns_init() != ESP_OK)
     {
-        messageOnTFT("mDNS ERROR. System halted");
+        messageOnTFT("mDNS init ERROR. System halted");
         while (1)
             delay(100);
     }
 
-    int ndx = MDNS.queryService("http", "tcp");
-
-    log_i("found %i mDNS servers", ndx);
-
-    while (--ndx != -1)
-    {
-        if (MDNS.hostname(ndx) == WEBSOCKET_MDNS_HOSTNAME)
-            break;
-    }
+    sntp_set_time_sync_notification_cb((sntp_sync_time_cb_t)ntpSynced);
+    configTzTime(TIMEZONE, NTP_POOL);
 
-    if (ndx == -1)
+    const char searchMess[] = {"Searching the sensors..."};
+    messageOnTFT(searchMess);
+    while (!getSensorhubIP(websocketServerIP))
     {
-        messageOnTFT("No sensors. System halted");
-        while (1)
-            delay(100);
+        messageOnTFT("No sensors found\nCheck if the sensors are running\nTap the screen to search again");
+        int32_t x, y;
+        while (!TFTtouched(x, y))
+            vTaskDelay(pdTICKS_TO_MS(10));
+        messageOnTFT(searchMess);
     }
 
-    log_i("sensorhub found at IP %s", MDNS.IP(ndx).toString().c_str());
-
-    websocketServerIP = MDNS.IP(ndx);
-
-    sntp_set_time_sync_notification_cb((sntp_sync_time_cb_t)ntpSynced);
-    configTzTime(TIMEZONE, NTP_POOL);
-
     webSocket.begin(websocketServerIP, WEBSOCKET_PORT, WEBSOCKET_URL);
     webSocket.onEvent(webSocketEvent);
     webSocket.setReconnectInterval(600);
 }
 
 constexpr const auto TICK_RATE_HZ = 50;
-
 constexpr const TickType_t ticksToWait = pdTICKS_TO_MS(1000 / TICK_RATE_HZ);
 static TickType_t xLastWakeTime = xTaskGetTickCount();