jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build error for native and esp8266

Browse Source
This commit is contained in:
fvanroie 2021-03-17 20:56:07 +01:00
parent 33aaa68f74
commit 1d3eab7e85
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hasp/hasp.cpp
View File

@ -380,12 +380,13 @@ void haspSetup(void)
// defaultFont = haspFonts[0]; // defaultFont = haspFonts[0];
haspFonts[0] = hasp_font; // save it 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__, robotocondensed_regular_16_nokern);
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *hasp_font); 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[0] == nullptr) haspFonts[0] = LV_THEME_DEFAULT_FONT_SMALL;
// if(haspFonts[1] == nullptr) haspFonts[1] = LV_THEME_DEFAULT_FONT_NORMAL; // if(haspFonts[1] == nullptr) haspFonts[1] = LV_THEME_DEFAULT_FONT_NORMAL;
if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE; if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE;

2
user_setups/esp32/esp32-dev_ili9488.ini
View File

@ -30,7 +30,7 @@ build_flags =
-D TOUCH_DRIVER=2046 ; XPT2606 Resistive touch panel driver -D TOUCH_DRIVER=2046 ; XPT2606 Resistive touch panel driver
-D SPI_FREQUENCY=27000000 -D SPI_FREQUENCY=27000000
-D SPI_TOUCH_FREQUENCY=2500000 -D SPI_TOUCH_FREQUENCY=2500000
-D SPI_READ_FREQUENCY=16000000 -D SPI_READ_FREQUENCY=20000000
;endregion ;endregion
; -- Debugging options ----------------------------- ; -- Debugging options -----------------------------