Continue remove old TFT code, add status bar

Author: brentru

src/components/display/assets/splash.h

@@ -69,8 +69,8 @@ bool DisplayController::Handle_Display_AddOrReplace(
     return false;
   }
 
-  //WS.feedWDT();
-  //display->showSplash();
+  WS.feedWDT();
+  display->showSplash();
   WS.feedWDT();
   display->drawStatusBar(WS._config.aio_user);
   WS.feedWDT();

src/components/display/controller.cpp

@@ -52,7 +52,9 @@ class dispDrvSt7789 : public dispDrvBase {
       delete _display;
       _display = nullptr;
     }
-    //digitalWrite(TFT_BACKLIGHT, LOW);
+#if defined(ARDUINO_FUNHOUSE_ESP32S2)
+    digitalWrite(TFT_BACKLIGHT, LOW);
+#endif
   }
 
   /*!
@@ -68,13 +70,14 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->init(_width, _height);
     _display->setRotation(_rotation);
     setTextSize(ST7789_TEXT_SZ_DEFAULT);
-    _display->fillScreen(ST77XX_WHITE);
+    _display->fillScreen(ST77XX_BLACK);
     _display->setTextColor(ST77XX_WHITE);
 
-/*     #ifdef TFT_BACKLIGHT
+#if defined(ARDUINO_FUNHOUSE_ESP32S2)
+    // Turn backlight on
     pinMode(TFT_BACKLIGHT, OUTPUT);
-    digitalWrite(TFT_BACKLIGHT, HIGH); // Backlight on
-    #endif */
+    digitalWrite(TFT_BACKLIGHT, HIGH);
+#endif
 
     return true;
   }
@@ -102,15 +105,15 @@ class dispDrvSt7789 : public dispDrvBase {
 
     // Display the appropriate splash screen based on resolution
     if (_width == 240 && _height == 240) {
-      _display->drawBitmap(0, 0, tft_bmp_logo_240240, 240, 240, ST77XX_BLACK);
+      _display->drawBitmap(0, 0, tft_bmp_logo_240240, 240, 240, ST77XX_WHITE);
     } else if (_width == 240 && _height == 135) {
       _display->drawBitmap(0, 0, tft_bmp_logo_240135, 240, 135, EPD_BLACK);
     } else {
       // Unsupported resolution
       return;
     }
 
-    delay(1500); // Pause for 1.5 seconds
+    delay(1000);
   }
 
   /*!
@@ -141,10 +144,8 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->fillScreen(ST77XX_BLACK);
 
     // Draw status bar
-    // TODO: We are not drawing a border here because it isnt
-    // required on a color display, I think.
     _display->fillRect(0, 0, _display->width(), _status_bar_height,
-                       ST77XX_BLACK);
+                       ST77XX_WHITE);
 
     // Draw username on left side of the status bar
     _display->setTextSize(1);
@@ -202,8 +203,11 @@ class dispDrvSt7789 : public dispDrvBase {
     if (_display == nullptr)
       return;
 
-    // Start with a fresh display buffer
-    _display->fillScreen(ST77XX_BLACK);
+    _display->setTextColor(ST77XX_WHITE);
+
+    // Clear only the area below the status bar
+    _display->fillRect(0, _status_bar_height, _width,
+                       _height - _status_bar_height, ST77XX_BLACK);
     int16_t y_idx = _status_bar_height;
     _display->setCursor(0, y_idx);
 

src/components/display/drivers/dispDrvSt7789.h

@@ -47,40 +47,4 @@ void convertFromJson(JsonVariantConst src, secretsConfig &dst) {
   dst.status_pixel_brightness = src["status_pixel_brightness"] | 0.2;
   // Parse MQTT port from secrets, if exists
   dst.io_port = src["io_port"] | 8883;
-}
-
-// Converts a displayConfigSPI structure to a JSON variant
-void convertToJson(const displayConfigSPI &src, JsonVariant dst) {
-  dst["pin_cs"] = src.pinCs;
-  dst["pin_dc"] = src.pinDc;
-  dst["pin_mosi"] = src.pinMosi;
-  dst["pin_sck"] = src.pinSck;
-  dst["pin_rst"] = src.pinRst;
-}
-
-// Extracts a displayConfigSPI structure from a JSON variant
-void convertFromJson(JsonVariantConst src, displayConfigSPI &dst) {
-  dst.pinCs = src["pin_cs"] | 40;
-  dst.pinDc = src["pin_dc"] | 39;
-  dst.pinMosi = src["pin_mosi"] | 0;
-  dst.pinSck = src["pin_sck"] | 0;
-  dst.pinRst = src["pin_rst"] | 41;
-}
-
-// Converts a displayConfig structure to a JSON variant
-void convertToJson(const displayConfig &src, JsonVariant dst) {
-  dst["driver"] = src.driver;
-  dst["width"] = src.width;
-  dst["height"] = src.height;
-  dst["rotation"] = src.rotation;
-  dst["spi_config"] = src.spiConfig;
-}
-
-// Extracts a displayConfig structure from a JSON variant
-void convertFromJson(JsonVariantConst src, displayConfig &dst) {
-  strlcpy(dst.driver, src["driver"] | "ST7789", sizeof(dst.driver));
-  dst.width = src["width"] | 128;
-  dst.height = src["height"] | 64;
-  dst.rotation = src["rotation"] | 0;
-  dst.spiConfig = src["spi_config"];
-}
+}

src/provisioning/ConfigJson.cpp

@@ -25,7 +25,4 @@ void convertFromJson(JsonVariantConst src, networkConfig &dst);
 // Converters for secrets configuration
 void convertToJson(const secretsConfig &src, JsonVariant dst);
 void convertFromJson(JsonVariantConst src, secretsConfig &dst);
-// Converters for display configuration
-void convertToJson(const displayConfig &src, JsonVariant dst);
-void convertFromJson(JsonVariantConst src, displayConfig &dst);
 #endif // CONFIGJSON_H

src/provisioning/ConfigJson.h

@@ -496,83 +496,6 @@ void Wippersnapper_FS::fsHalt(String msg) {
   }
 }
 
-#ifdef ARDUINO_FUNHOUSE_ESP32S2
-void Wippersnapper_FS::createDisplayConfig() {
-  // Open file for writing
-  File32 displayFile = wipperFatFs.open("/display_config.json", FILE_WRITE);
-
-  // Create a default displayConfig structure
-  displayConfig displayConfig;
-  strcpy(displayConfig.driver, "ST7789");
-  displayConfig.width = 240;
-  displayConfig.height = 240;
-  displayConfig.rotation = 0;
-  displayConfig.spiConfig.pinCs = 40;
-  displayConfig.spiConfig.pinDc = 39;
-  displayConfig.spiConfig.pinMosi = 0;
-  displayConfig.spiConfig.pinSck = 0;
-  displayConfig.spiConfig.pinRst = 41;
-
-  // Create and fill JSON document from displayConfig
-  JsonDocument doc;
-  if (!doc.set(displayConfig)) {
-    fsHalt("ERROR: Unable to set displayConfig, no space in arduinoJSON "
-           "document!");
-  }
-  // Write the file out to the filesystem
-  serializeJsonPretty(doc, displayFile);
-  displayFile.flush();
-  displayFile.close();
-  delay(2500); // give FS some time to write the file
-}
-
-bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool force_recreate) {
-  if (force_recreate) {
-    if (wipperFatFs.exists("/display_config.json")) {
-      wipperFatFs.remove("/display_config.json");
-    }
-#ifdef ARDUINO_FUNHOUSE_ESP32S2
-    createDisplayConfig();
-#endif
-  }
-
-  // Check if display_config.json file exists, if not, generate it
-  if (!wipperFatFs.exists("/display_config.json")) {
-    WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");
-#ifdef ARDUINO_FUNHOUSE_ESP32S2
-    createDisplayConfig(); // generate a default display_config.json for
-                           // FunHouse
-#endif
-  }
-
-  // Attempt to open file for JSON parsing
-  File32 file = wipperFatFs.open("/display_config.json", FILE_READ);
-  if (!file) {
-    if (!force_recreate) {
-      return false;
-    }
-    fsHalt("FATAL ERROR: Unable to open display_config.json for parsing");
-  }
-
-  // Attempt to deserialize the file's json document
-  JsonDocument doc;
-  DeserializationError error = deserializeJson(doc, file);
-  if (error) {
-    if (!force_recreate) {
-      return false;
-    }
-    fsHalt(String("FATAL ERROR: Unable to parse display_config.json - "
-                  "deserializeJson() failed with code") +
-           error.c_str());
-  }
-  // Close the file, we're done with it
-  file.close();
-  // Extract a displayConfig struct from the JSON document
-  dispCfg = doc.as<displayConfig>();
-  return true;
-}
-#endif // ARDUINO_FUNHOUSE_ESP32S2
-
 /**************************************************************************/
 /*!
     @brief    Callback invoked when received READ10 command. Copies disk's

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -26,7 +26,6 @@
 
 // forward decl.
 class Wippersnapper;
-struct displayConfig;
 
 // global TinyUSB callbacks
 int32_t qspi_msc_write_cb(uint32_t lba, uint8_t *buffer, uint32_t bufsize);
@@ -57,11 +56,6 @@ class Wippersnapper_FS {
   void fsHalt(String msg);
 
   void parseSecrets();
-
-#ifdef ARDUINO_FUNHOUSE_ESP32S2
-  bool parseDisplayConfig(displayConfig &displayFile, bool force_recreate = false);
-  void createDisplayConfig();
-#endif
 private:
   bool _freshFS = false; /*!< True if filesystem was initialized by
                             WipperSnapper, False otherwise. */