From 1d3eab7e8536d582bcd7a81efeeca276a52b6ffd Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Wed, 17 Mar 2021 20:56:07 +0100 Subject: [PATCH] Fix build error for native and esp8266 --- src/hasp/hasp.cpp | 5 +++-- user_setups/esp32/esp32-dev_ili9488.ini | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp index b5414fde..3e8ed004 100644 --- a/src/hasp/hasp.cpp +++ b/src/hasp/hasp.cpp @@ -380,12 +380,13 @@ void haspSetup(void) // defaultFont = haspFonts[0]; haspFonts[0] = hasp_font; // save it } -#endif -#endif LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern); LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *hasp_font); +#endif +#endif + if(haspFonts[0] == nullptr) haspFonts[0] = LV_THEME_DEFAULT_FONT_SMALL; // if(haspFonts[1] == nullptr) haspFonts[1] = LV_THEME_DEFAULT_FONT_NORMAL; if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE; diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini index 5747e110..6fbcbba4 100644 --- a/user_setups/esp32/esp32-dev_ili9488.ini +++ b/user_setups/esp32/esp32-dev_ili9488.ini @@ -30,7 +30,7 @@ build_flags = -D TOUCH_DRIVER=2046 ; XPT2606 Resistive touch panel driver -D SPI_FREQUENCY=27000000 -D SPI_TOUCH_FREQUENCY=2500000 - -D SPI_READ_FREQUENCY=16000000 + -D SPI_READ_FREQUENCY=20000000 ;endregion ; -- Debugging options -----------------------------