[Fix] Add back display icons with PROGMEM macro

Author: brentru

src/components/display/drivers/dispDrvBase.h

@@ -15,10 +15,8 @@
 #ifndef WS_DISP_DRV_BASE_H
 #define WS_DISP_DRV_BASE_H
 
-#ifndef ARDUINO_ARCH_ESP8266
 #include "../assets/icons.h"
 #include "../assets/splash.h"
-#endif
 #include "Adafruit_ThinkInk.h"
 #include "Wippersnapper.h"
 

src/components/display/drivers/dispDrvSt7789.h

@@ -108,7 +108,6 @@ class dispDrvSt7789 : public dispDrvBase {
     if (!_display)
       return;
 
-    #ifndef ARDUINO_ARCH_ESP8266
     // Display the appropriate splash screen based on resolution
     if (_width == 240 && _height == 240) {
       _display->drawBitmap(0, 0, tft_bmp_logo_240240, 240, 240, ST77XX_WHITE);
@@ -118,7 +117,6 @@ class dispDrvSt7789 : public dispDrvBase {
       // Unsupported resolution detected, skip splash screen
       return;
     }
-    #endif
 
     delay(500);
   }
@@ -145,7 +143,6 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->setCursor(5, 6);
     _display->print(io_username);
 
-    #ifndef ARDUINO_ARCH_ESP8266
     // Calculate icon positions (rightmost side of status bar), center
     // vertically
     _statusbar_icons_y =
@@ -169,7 +166,6 @@ class dispDrvSt7789 : public dispDrvBase {
                          epd_bmp_bat_full, ST7789_STATUSBAR_ICON_SZ,
                          ST7789_STATUSBAR_ICON_SZ, ST77XX_BLACK);
 
-    #endif
     // Reset text color and size for main text area
     _display->setTextColor(ST77XX_WHITE);
     _display->setTextSize(_text_sz);
@@ -198,7 +194,6 @@ class dispDrvSt7789 : public dispDrvBase {
     if (!update_rssi && !update_mqtt)
       return;
 
-    #ifndef ARDUINO_ARCH_ESP8266
     if (update_mqtt) {
       // Clear and draw the new cloud icon, based on MQTT connection status
       _display->fillRect(_statusbar_icon_cloud_x, _statusbar_icons_y,
@@ -239,7 +234,6 @@ class dispDrvSt7789 : public dispDrvBase {
                            ST7789_STATUSBAR_ICON_SZ, ST77XX_BLACK);
       _statusbar_rssi = rssi;
     }
-    #endif
   }
 
   /*!

src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h

@@ -93,10 +93,8 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
   virtual void showSplash() override {
     if (!_display)
       return;
-    #ifndef ARDUINO_ARCH_ESP8266
     _display->drawBitmap(0, 0, epd_bitmap_ws_logo_296128, 296, 128, EPD_BLACK);
     _display->display();
-    #endif
   }
 
   /*!
@@ -123,7 +121,6 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
     _display->setCursor(5, 6);
     _display->print(io_username);
 
-    #ifndef ARDUINO_ARCH_ESP8266
     // Calculate status bar icon positions and center vertically
     _statusbar_icons_y =
         STATUS_BAR_BORDER +
@@ -144,7 +141,6 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
     _display->drawBitmap(_statusbar_icon_battery_x, _statusbar_icons_y,
                          epd_bmp_bat_full, STATUS_BAR_ICON_SZ,
                          STATUS_BAR_ICON_SZ, EPD_BLACK);
-    #endif
     _display->display();
   }
 
@@ -171,7 +167,6 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
     if (!update_rssi && !update_mqtt)
       return;
 
-    #ifndef ARDUINO_ARCH_ESP8266
     if (update_mqtt) {
       // updating the RSSI occurs too frequently to be practical
       _display->fillRect(_statusbar_icon_cloud_x, _statusbar_icons_y,
@@ -210,7 +205,6 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
                            EPD_BLACK);
       _statusbar_rssi = rssi;
     }
-    #endif
 
     _display->display();
   }

src/components/display/drivers/dispDrvThinkInkGrayscale4T5.h

@@ -105,7 +105,6 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
     _display->setCursor(5, 6);
     _display->print(io_username);
 
-    #ifndef ARDUINO_ARCH_ESP8266
     // Calculate status bar icon positions and center vertically
     _statusbar_icons_y =
         STATUS_BAR_BORDER +
@@ -126,7 +125,6 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
     _display->drawBitmap(_statusbar_icon_battery_x, _statusbar_icons_y,
                          epd_bmp_bat_full, STATUS_BAR_ICON_SZ,
                          STATUS_BAR_ICON_SZ, EPD_BLACK);
-    #endif
     _display->display();
   }
 
@@ -153,7 +151,6 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
     if (!update_rssi && !update_mqtt)
       return;
 
-    #ifndef ARDUINO_ARCH_ESP8266
     if (update_mqtt) {
       // updating the RSSI occurs too frequently to be practical
       _display->fillRect(_statusbar_icon_cloud_x, _statusbar_icons_y,
@@ -192,7 +189,6 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
                            EPD_BLACK);
       _statusbar_rssi = rssi;
     }
-    #endif
     _display->display();
   }