This commit is contained in:
brentru 2023-06-27 13:19:40 -04:00
parent f3c8cf6501
commit cb58f996cb
5 changed files with 17 additions and 18 deletions

View file

@ -2074,7 +2074,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = __cdecl=, ARDUINO_ARCH_ESP32
PREDEFINED = __cdecl=, ARDUINO_ARCH_ESP32=1, ARDUINO_FUNHOUSE_ESP32S2=1
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The

View file

@ -29,14 +29,14 @@
#define STATUS_NEOPIXEL_PIN 40
#define STATUS_NEOPIXEL_NUM 1
#elif defined(ARDUINO_FUNHOUSE_ESP32S2)
#define BOARD_ID "funhouse"
#define USE_TINYUSB
#define USE_STATUS_DOTSTAR
#define USE_DISPLAY
#define STATUS_DOTSTAR_PIN_DATA PIN_DOTSTAR_DATA
#define STATUS_DOTSTAR_PIN_CLK PIN_DOTSTAR_CLOCK
#define STATUS_DOTSTAR_NUM 5
#define STATUS_DOTSTAR_COLOR_ORDER DOTSTAR_GBR
#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
#define STATUS_DOTSTAR_COLOR_ORDER DOTSTAR_GBR ///< DotStar Color Order
#elif defined(ARDUINO_METRO_ESP32S2)
#define BOARD_ID "metroesp32s2"
#define USE_TINYUSB

View file

@ -15,15 +15,6 @@
#ifdef ARDUINO_FUNHOUSE_ESP32S2
#include "ws_display_driver.h"
/**************************************************************************/
/*!
@brief Callback for LVGL logging through USB serial
@param buf
Data to write out to serial.
*/
/**************************************************************************/
// static void my_log_cb(const char *buf) { WS_DEBUG_PRINTLN(buf); }
/**************************************************************************/
/*!
@brief Creates a new WipperSnapper display driver object from a

View file

@ -21,6 +21,7 @@
#include <Adafruit_ST7789.h>
#include <lvgl.h>
/** Display driver configuration */
struct displayConfig {
char driver[10]; ///< Display driver type
int width; ///< Display width

View file

@ -62,6 +62,13 @@ class ws_display_driver;
/**************************************************************************/
class ws_display_ui_helper {
public:
/**************************************************************************/
/*!
@brief Constructor for the ws_display_ui_helper class.
@param drv
Pointer to the display driver.
*/
/**************************************************************************/
ws_display_ui_helper(ws_display_driver *drv) { _dispDriver = drv; };
~ws_display_ui_helper(){};