stashed changes: show connection info on display at start

include/ui.h

@@ -27,8 +27,18 @@ struct ui_status {
 
 extern struct ui_status ui_status;
 
+enum ui_state {
+    UI_INIT = 0,
+    UI_WIFI_CONNECT,
+    UI_WIFI_CONNECTING,
+    UI_WIFI_CONNECTED,
+    UI_READY,
+};
+
 void ui_init(void);
 void ui_draw_menu(void);
 void ui_run(void);
 
+void ui_progress(enum ui_state state);
+
 #endif // __UI_H__

platformio.ini

@@ -27,6 +27,7 @@ build_flags =
   -DFEATURE_UI
   -DUSER_SETUP_LOADED=1
   -include include/User_Setup.h
+  -DDISABLE_ALL_LIBRARY_WARNINGS
 lib_ldf_mode = deep
 lib_deps =
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c

src/main.cpp

@@ -95,6 +95,9 @@ void setup() {
 
     // Connect to WiFi AP
     debug.print(F("Connecting WiFi"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECT);
+#endif // FEATURE_UI
     WiFi.hostname(hostname);
     WiFi.mode(WIFI_STA);
     WiFi.hostname(hostname);
@@ -103,8 +106,14 @@ void setup() {
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
         debug.print(F("."));
+#ifdef FEATURE_UI
+        ui_progress(UI_WIFI_CONNECTING);
+#endif // FEATURE_UI
     }
     debug.println(F("\nWiFi connected!"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECTED);
+#endif // FEATURE_UI
 
     disconnectHandler = WiFi.onStationModeDisconnected(onDisconnected);
 
@@ -137,6 +146,9 @@ void setup() {
 
     // Connect to WiFi AP
     debug.print(F("Connecting WiFi"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECT);
+#endif // FEATURE_UI
     WiFi.mode(WIFI_STA);
     WiFi.setHostname(hostname.c_str());
     WiFi.begin(WIFI_SSID, WIFI_PASS);
@@ -144,8 +156,14 @@ void setup() {
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
         debug.print(F("."));
+#ifdef FEATURE_UI
+        ui_progress(UI_WIFI_CONNECTING);
+#endif // FEATURE_UI
     }
     debug.println(F("\nWiFi connected!"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECTED);
+#endif // FEATURE_UI
 
     // Set hostname workaround
     WiFi.setHostname(hostname.c_str());
@@ -157,13 +175,22 @@ void setup() {
     WiFi.init(&Serial1);
 
     debug.print(F("Connecting WiFi"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECT);
+#endif // FEATURE_UI
     WiFi.begin(WIFI_SSID, WIFI_PASS);
     while (WiFi.status() != WL_CONNECTED) {
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
         debug.print(F("."));
+#ifdef FEATURE_UI
+        ui_progress(UI_WIFI_CONNECTING);
+#endif // FEATURE_UI
     }
     debug.println(F("\nWiFi connected!"));
+#ifdef FEATURE_UI
+    ui_progress(UI_WIFI_CONNECTED);
+#endif // FEATURE_UI
 
 #endif
 
@@ -183,7 +210,7 @@ void setup() {
 
 #ifdef FEATURE_UI
     debug.println(F("UI Go"));
-    ui_draw_menu();
+    ui_progress(UI_READY);
 #endif // FEATURE_UI
 }
 

src/ui.cpp

@@ -57,15 +57,15 @@ static TFT_eSPI tft = TFT_eSPI();
 
 struct ui_status ui_status = {0};
 
-enum ui_states {
-    UI_INIT = 0,
+enum ui_pages {
+    UI_START = 0,
     UI_LIVINGROOM1,
     UI_LIVINGROOM2,
 
-    UI_NUM_STATES
+    UI_NUM_PAGES
 };
 
-static enum ui_states ui_state = UI_INIT;
+static enum ui_pages ui_page = UI_START;
 
 static TS_Point touchToScreen(TS_Point p) {
     p.x = map(p.x, TOUCH_LEFT, TOUCH_RIGHT, 0, LCD_WIDTH);
@@ -115,20 +115,56 @@ void ui_init(void) {
     ledcAttachPin(TFT_BL, LEDC_CHANNEL_0);
     ledcAnalogWrite(LEDC_CHANNEL_0, 255);
 
-    tft.fillScreen(TFT_BLACK);
+    ui_progress(UI_INIT);
+}
 
-    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);
+void ui_progress(enum ui_state state) {
+    int x = LCD_WIDTH / 2;
+    int y = LCD_HEIGHT / 2;
+    int fontSize = 2;
+
+    switch (state) {
+        case UI_INIT: {
+            tft.fillScreen(TFT_BLACK);
+            tft.setTextDatum(MC_DATUM); // middle center
+            tft.drawString("Initializing ESP-ENV", x, y - 32, fontSize);
+            tft.drawString("xythobuz.de", x, y, fontSize);
+        } break;
+
+        case UI_WIFI_CONNECT: {
+            tft.setTextDatum(MC_DATUM); // middle center
+            tft.drawString("Connecting to '" WIFI_SSID "'", x, y + 32, fontSize);
+        } break;
+
+        case UI_WIFI_CONNECTING: {
+            static int n = 0;
+            const char anim[] = { '\\', '|', '/', '-' };
+            n++;
+            if (n >= sizeof(anim)) {
+                n = 0;
+            }
+            char s[2] = { anim[n], '\0' };
+            tft.drawCentreString(s, x, y + 64, fontSize);
+        } break;
+
+        case UI_WIFI_CONNECTED: {
+            tft.setTextDatum(MC_DATUM); // middle center
+            tft.drawString("Connected!", x, y + 64, fontSize);
+        } break;
 
-    ui_state = UI_INIT;
+        case UI_READY: {
+            tft.fillScreen(TFT_BLACK);
+            tft.setTextDatum(MC_DATUM); // middle center
+            tft.drawString("Ready", x, y, fontSize);
+        } break;
+    }
 }
 
 void ui_draw_menu(void) {
-    switch (ui_state) {
-        case UI_INIT:
+    switch (ui_page) {
+        case UI_START:
             tft.fillScreen(TFT_BLACK);
-            ui_state = UI_LIVINGROOM1;
+            ui_page = UI_LIVINGROOM1;
             // fall-through
 
         case UI_LIVINGROOM1:
@@ -140,7 +176,7 @@ void ui_draw_menu(void) {
             break;
 
         default:
-            ui_state = UI_INIT;
+            ui_page = UI_START;
     }
 
     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);
@@ -162,10 +198,10 @@ void ui_run(void) {
             // 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))) {
             // switch to next page
-            ui_state = (enum ui_states)((ui_state + 1) % UI_NUM_STATES);
-            if (ui_state == UI_INIT) {
+            ui_page = (enum ui_pages)((ui_page + 1) % UI_NUM_PAGES);
+            if (ui_page == UI_START) {
                 // skip init screen
-                ui_state = (enum ui_states)((ui_state + 1) % UI_NUM_STATES);
+                ui_page = (enum ui_pages)((ui_page + 1) % UI_NUM_PAGES);
             }
             tft.fillScreen(TFT_BLACK);
         }