From 0317185acfc2162d423079c72237356644aa67ce Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 21 Jan 2025 10:28:36 +1100 Subject: [PATCH] fix(color): LVGL font generation not working (#5807) Fix font generation after H7 changes --- radio/src/fonts/lvgl/lz4_font.cpp | 2 ++ radio/src/gui/colorlcd/lv_conf.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/radio/src/fonts/lvgl/lz4_font.cpp b/radio/src/fonts/lvgl/lz4_font.cpp index 57dad2cce..bdbbf5563 100644 --- a/radio/src/fonts/lvgl/lz4_font.cpp +++ b/radio/src/fonts/lvgl/lz4_font.cpp @@ -49,6 +49,8 @@ #include #include +#define __IRAM +#define LV_SKIP_DEFINES 1 #include "../../gui/colorlcd/lv_conf.h" #define LV_CONF_SKIP 1 #include "../../gui/colorlcd/lz4_fonts.h" diff --git a/radio/src/gui/colorlcd/lv_conf.h b/radio/src/gui/colorlcd/lv_conf.h index 97161a505..421055bf3 100644 --- a/radio/src/gui/colorlcd/lv_conf.h +++ b/radio/src/gui/colorlcd/lv_conf.h @@ -24,7 +24,9 @@ /* clang-format off */ #include +#if !defined(LV_SKIP_DEFINES) #include "definitions.h" +#endif /*==================== COLOR SETTINGS