Removing LVGL display/ in favor of components/display approach

Author: brentru

src/Wippersnapper.cpp

@@ -121,12 +121,6 @@
 #include <Esp.h>
 #endif
 
-// Display
-#ifdef USE_DISPLAY
-#include "display/ws_display_driver.h"
-#include "display/ws_display_ui_helper.h"
-#endif
-
 #include "components/display/controller.h"
 #include "components/ds18x20/ws_ds18x20.h"
 #include "components/pixels/ws_pixels.h"
@@ -234,10 +228,6 @@ class Wippersnapper_DigitalGPIO;
 class Wippersnapper_AnalogIO;
 class Wippersnapper_FS;
 class WipperSnapper_LittleFS;
-#ifdef USE_DISPLAY
-class ws_display_driver;
-class ws_display_ui_helper;
-#endif
 #ifdef ARDUINO_ARCH_ESP32
 class ws_ledc;
 #endif
@@ -361,11 +351,6 @@ class Wippersnapper {
   Wippersnapper_FS *_fileSystem; ///< Instance of Filesystem (native USB)
   WipperSnapper_LittleFS
       *_littleFS; ///< Instance of LittleFS Filesystem (non-native USB)
-#ifdef USE_DISPLAY
-  ws_display_driver *_display = nullptr; ///< Instance of display driver class
-  ws_display_ui_helper *_ui_helper =
-      nullptr; ///< Instance of display UI helper class
-#endif
   ws_pixels *_ws_pixelsComponent; ///< ptr to instance of ws_pixels class
   ws_pwm *_pwmComponent;          ///< Instance of pwm class
   ws_servo *_servoComponent;      ///< Instance of servo class

src/Wippersnapper.h

@@ -38,7 +38,6 @@
 #define BOARD_ID "funhouse"                      ///< Board ID
 #define USE_TINYUSB                              ///< Enable TinyUSB
 #define USE_STATUS_DOTSTAR                       ///< Enable DotStar
-#define USE_DISPLAY                              ///< Enable Display
 #define STATUS_DOTSTAR_PIN_DATA PIN_DOTSTAR_DATA ///< DotStar Data Pin
 #define STATUS_DOTSTAR_PIN_CLK PIN_DOTSTAR_CLOCK ///< DotStar Clock Pin
 #define STATUS_DOTSTAR_NUM 5                     ///< Number of DotStar LEDs

src/Wippersnapper_Boards.h

@@ -285,11 +285,6 @@ bool Wippersnapper_AnalogIO::encodePinEvent(
             pinValVolts);
     snprintf(buffer, 100, "[Pin] A%d read: %0.2f\n", pinName, pinValVolts);
   }
-// display analog pin read on terminal
-#ifdef USE_DISPLAY
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
   // Encode signal message
   pb_ostream_t stream =
       pb_ostream_from_buffer(WS._buffer_outgoing, sizeof(WS._buffer_outgoing));

src/components/analogIO/Wippersnapper_AnalogIO.cpp

@@ -75,12 +75,6 @@ void Wippersnapper_DigitalGPIO::initDigitalPin(
     WS_DEBUG_PRINT("Configured digital output pin on D");
     WS_DEBUG_PRINTLN(pinName);
 
-#ifdef USE_DISPLAY
-    char buffer[100];
-    snprintf(buffer, 100, "[Pin] Configured Digital Output on D%u\n", pinName);
-    WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
 // Initialize LOW
 #if defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH)
     // The Adafruit Feather ESP8266's built-in LED is reverse wired so setting
@@ -109,13 +103,6 @@ void Wippersnapper_DigitalGPIO::initDigitalPin(
     WS_DEBUG_PRINT("Interval (ms):");
     WS_DEBUG_PRINTLN(periodMs);
 
-#ifdef USE_DISPLAY
-    char buffer[100];
-    snprintf(buffer, 100,
-             "[Pin] Configured Digital Input on D%u, polling every %lu mS\n",
-             pinName, periodMs);
-    WS._ui_helper->add_text_to_terminal(buffer);
-#endif
     // get current time
     ulong curTime = millis() - 1;
 
@@ -149,12 +136,6 @@ void Wippersnapper_DigitalGPIO::deinitDigitalPin(
   WS_DEBUG_PRINT("Deinitializing digital pin ");
   WS_DEBUG_PRINTLN(pinName);
 
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[Pin] De-initialized D%u\n", pinName);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
   if (direction ==
       wippersnapper_pin_v1_ConfigurePinRequest_Direction_DIRECTION_INPUT) {
     // de-allocate the pin within digital_input_pins[]
@@ -209,12 +190,6 @@ void Wippersnapper_DigitalGPIO::digitalWriteSvc(uint8_t pinName, int pinValue) {
   WS_DEBUG_PRINT(" to ");
   WS_DEBUG_PRINTLN(pinValue);
 
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[Pin] Writing %d to D%u\n", pinValue, pinName);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
 // Write to the GPIO pin
 #if defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH)
   // The Adafruit Feather ESP8266's built-in LED is reverse wired so setting the
@@ -249,13 +224,6 @@ void Wippersnapper_DigitalGPIO::processDigitalInputs() {
         // read the pin
         int pinVal = digitalReadSvc(_digital_input_pins[i].pinName);
 
-#ifdef USE_DISPLAY
-        char buffer[100];
-        snprintf(buffer, 100, "[Pin] Read D%u: %d\n",
-                 _digital_input_pins[i].pinName, pinVal);
-        WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
         // Create new signal message
         wippersnapper_signal_v1_CreateSignalRequest _outgoingSignalMsg =
             wippersnapper_signal_v1_CreateSignalRequest_init_zero;
@@ -289,13 +257,6 @@ void Wippersnapper_DigitalGPIO::processDigitalInputs() {
           WS_DEBUG_PRINT("Executing state-based event on D");
           WS_DEBUG_PRINTLN(_digital_input_pins[i].pinName);
 
-#ifdef USE_DISPLAY
-          char buffer[100];
-          snprintf(buffer, 100, "[Pin] Read D%u: %d\n",
-                   _digital_input_pins[i].pinName, pinVal);
-          WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
           // Create new signal message
           wippersnapper_signal_v1_CreateSignalRequest _outgoingSignalMsg =
               wippersnapper_signal_v1_CreateSignalRequest_init_zero;

src/components/digitalIO/Wippersnapper_DigitalGPIO.cpp

@@ -57,16 +57,19 @@ class dispDrvSt7789 : public dispDrvBase {
   */
   bool begin() override {
 
-// Special configuration for Feather TFTs
+// Special power control configuration for
+// boards with built-in TFTs 
 #if defined(TFT_BACKLITE)
     // turn on backlite
     pinMode(TFT_BACKLITE, OUTPUT);
     digitalWrite(TFT_BACKLITE, HIGH);
 
+    #if defined(TFT_I2C_POWER)
     // turn on the TFT / I2C power supply
     pinMode(TFT_I2C_POWER, OUTPUT);
     digitalWrite(TFT_I2C_POWER, HIGH);
     delay(10);
+    #endif // TFT_I2C_POWER
 #endif
 
     _display = new Adafruit_ST7789(_pin_cs, _pin_dc, _pin_rst);

src/components/display/drivers/dispDrvSt7789.h

@@ -97,13 +97,6 @@ bool ws_ds18x20::addDS18x20(
   WS_DEBUG_PRINT(msgDs18x20InitReq->onewire_pin);
   WS_DEBUG_PRINTLN(" with DS18x20 attached!");
 
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[DS18x] Attached DS18x20 sensor to pin %s\n",
-           msgDs18x20InitReq->onewire_pin);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
   // Encode and publish response back to broker
   memset(WS._buffer_outgoing, 0, sizeof(WS._buffer_outgoing));
   pb_ostream_t ostream =
@@ -148,13 +141,6 @@ void ws_ds18x20::deleteDS18x20(
                           idx); // erase vector and re-allocate
     }
   }
-
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[DS18x] Deleted DS18x20 sensor on pin %s\n",
-           msgDS18x20DeinitReq->onewire_pin);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
 }
 
 /*************************************************************/
@@ -194,11 +180,6 @@ void ws_ds18x20::update() {
         if (tempC == DEVICE_DISCONNECTED_C) {
           WS_DEBUG_PRINTLN("ERROR: Could not read temperature data, is the "
                            "sensor disconnected?");
-#ifdef USE_DISPLAY
-          WS._ui_helper->add_text_to_terminal(
-              "[DS18x ERROR] Unable to read temperature, is the sensor "
-              "disconnected?\n");
-#endif
           break;
         }
 
@@ -301,10 +282,6 @@ void ws_ds18x20::update() {
             return;
           };
           WS_DEBUG_PRINTLN("PUBLISHED!");
-#ifdef USE_DISPLAY
-          WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
           (*iter)->sensorPeriodPrv = curTime; // set prv period
         }
       }

src/components/ds18x20/ws_ds18x20.cpp

@@ -1233,9 +1233,6 @@ void WipperSnapper_Component_I2C::displayDeviceEventMessage(
     default:
       break;
     }
-#ifdef USE_DISPLAY
-    WS._ui_helper->add_text_to_terminal(buffer);
-#endif
   }
 }
 

src/components/i2c/WipperSnapper_I2C.cpp

@@ -272,14 +272,6 @@ bool ws_pixels::addStrand(
     WS_DEBUG_PRINT(pixelsCreateReqMsg->pixels_num);
     WS_DEBUG_PRINT(" on GPIO #");
     WS_DEBUG_PRINTLN(pixelsCreateReqMsg->pixels_pin_neopixel);
-
-#ifdef USE_DISPLAY
-    char buffer[100];
-    snprintf(buffer, 100, "[Pixel] Added NeoPixel strand on Pin %s\n.",
-             pixelsCreateReqMsg->pixels_pin_neopixel);
-    WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
     publishAddStrandResponse(true, pixelsCreateReqMsg->pixels_pin_neopixel);
   } else if (pixelsCreateReqMsg->pixels_type ==
              wippersnapper_pixels_v1_PixelsType_PIXELS_TYPE_DOTSTAR) {
@@ -314,14 +306,6 @@ bool ws_pixels::addStrand(
     WS_DEBUG_PRINT(strands[strandIdx].numPixels);
     WS_DEBUG_PRINT(" on Data GPIO #");
     WS_DEBUG_PRINTLN(strands[strandIdx].pinDotStarData);
-
-#ifdef USE_DISPLAY
-    char buffer[100];
-    snprintf(buffer, 100, "[Pixel] Added NeoPixel strand on Pin %s\n.",
-             pixelsCreateReqMsg->pixels_pin_neopixel);
-    WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
     publishAddStrandResponse(true, pixelsCreateReqMsg->pixels_pin_dotstar_data);
   } else {
     WS_DEBUG_PRINTLN("ERROR: Invalid strand type provided!");
@@ -380,13 +364,6 @@ void ws_pixels::deleteStrand(
 
   WS_DEBUG_PRINT("Deleted strand on data pin ");
   WS_DEBUG_PRINTLN(pixelsDeleteMsg->pixels_pin_data);
-
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[Pixel] Deleted strand on pin %s\n.",
-           pixelsDeleteMsg->pixels_pin_data);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
 }
 
 /**************************************************************************/
@@ -439,14 +416,6 @@ void ws_pixels::fillStrand(
   WS_DEBUG_PRINT("Filling color: ");
   WS_DEBUG_PRINTLN(pixelsWriteMsg->pixels_color);
 
-#ifdef USE_DISPLAY
-  char buffer[100];
-  snprintf(buffer, 100, "[Pixel] Filling strand on pin %s with color %u\n",
-           pixelsWriteMsg->pixels_pin_data,
-           (unsigned int)pixelsWriteMsg->pixels_color);
-  WS._ui_helper->add_text_to_terminal(buffer);
-#endif
-
   if (pixelsWriteMsg->pixels_type ==
       wippersnapper_pixels_v1_PixelsType_PIXELS_TYPE_NEOPIXEL) {
     strands[strandIdx].neoPixelPtr->fill(rgbColorGamma);