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

Update configs

Browse Source
This commit is contained in:
fvanroie 2021-11-13 02:57:59 +01:00
parent 1fa119a7c8
commit 8e74dc00ab
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yaml vendored
View File

@ -35,6 +35,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with:
submodules: 'true'
- name: Cache pip - name: Cache pip
uses: actions/cache@v2 uses: actions/cache@v2
with: with:

2
include/hasp_conf.h
View File

@ -192,7 +192,7 @@
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
#include "lv_zifont.h" // #include "lv_zifont.h"
#endif #endif
#endif #endif

4
platformio.ini
View File

@ -65,8 +65,8 @@ build_flags =
; -- Hasp build options ---------------------------- ; -- Hasp build options ----------------------------
-D HASP_VER_MAJ=0 -D HASP_VER_MAJ=0
-D HASP_VER_MIN=6 -D HASP_VER_MIN=7
-D HASP_VER_REV=3 -D HASP_VER_REV=0
${override.build_flags} ${override.build_flags}
; -- Shared library dependencies in all environments ; -- Shared library dependencies in all environments

4
src/hasp/hasp.cpp
View File

@ -501,6 +501,7 @@ void haspSetup(void)
LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[0]); LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[0]);
// LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16); // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16);
/* ZiFonts
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
@ -521,6 +522,7 @@ void haspSetup(void)
#endif #endif
#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;
@ -534,7 +536,7 @@ void haspSetup(void)
lv_ft_info_t info; lv_ft_info_t info;
info.name = "L:/mdi.ttf"; info.name = "L:/mdi.ttf";
info.weight = 12; info.weight = 48;
info.style = FT_FONT_STYLE_NORMAL; info.style = FT_FONT_STYLE_NORMAL;
lv_ft_font_init(&info); lv_ft_font_init(&info);
haspFonts[7] = info.font; haspFonts[7] = info.font;

6
user_setups/esp32/_esp32.ini
View File

@ -36,6 +36,12 @@ build_flags =
-D HASP_USE_GIFDECODE=0 -D HASP_USE_GIFDECODE=0
; -- LittleFS build options ------------------------ ; -- LittleFS build options ------------------------
;-D CONFIG_LITTLEFS_FOR_IDF_3_2 ; obsolete in IDF 3.3 ;-D CONFIG_LITTLEFS_FOR_IDF_3_2 ; obsolete in IDF 3.3
; -- FreeType build options ------------------------
-D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache
-D USE_LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache
-D USE_LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache
-D USE_LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache
-D USE_LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM
lib_ignore = lib_ignore =
GxTFT GxTFT

7
user_setups/esp32/lolin-d32-pro_ili9341.ini
View File

@ -29,17 +29,10 @@ build_flags =
-D TOUCH_CS=12 ; Default for TFT connector -D TOUCH_CS=12 ; Default for TFT connector
;endregion ;endregion
-D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache
-D USE_LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache
-D USE_LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache
-D USE_LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache
-D USE_LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM
;region -- Library options ------------------------------- ;region -- Library options -------------------------------
lib_deps = lib_deps =
${env.lib_deps} ${env.lib_deps}
${esp32.lib_deps} ${esp32.lib_deps}
;git+https://gitlab.freedesktop.org/freetype/freetype.git
lib_ignore = lib_ignore =
${env.lib_ignore} ${env.lib_ignore}