fix(demo): fix ebike demo header file inclusion issue (#7133)

2024-10-29 19:33:28 +08:00
parent d34f94a1cc
commit ce97ba869b
25 changed files with 97 additions and 33 deletions
--- a/demos/ebike/generated/font_ebike_130.c
+++ b/demos/ebike/generated/font_ebike_130.c
@@ -4,10 +4,18 @@
 * Opts:
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_130
--- a/demos/ebike/generated/font_ebike_56.c
+++ b/demos/ebike/generated/font_ebike_56.c
@@ -4,10 +4,18 @@
 * Opts:
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_56
--- a/demos/ebike/generated/font_ebike_inter_14.c
+++ b/demos/ebike/generated/font_ebike_inter_14.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 14 --font Inter-SemiBold.ttf -r 0x20-0x7F --font ../../../scripts/built_in_font/DejaVuSans.ttf --range 0xFE99,0xFE97,0xFE8D,0xFEBF,0xFE83,0xFE95,0xFE8E,0xFEF3,0xFE8B,0xFEBC,0xFE87,0xFEB3,0xFE98,0xFECB,0xFEDF,0xFED3,0xFEEF,0xFED8,0xFEB1,0xFEAD,0x627,0xFEA9,0xFEF9,0xFED0,0x0644,0xFECF,0xFE94,0x0639,0xFECC,0x0646,0x0648,0x0645,0xFEE3,0xFEE4,0xFEE2,0x0631,0x0633,0x0628,0xFE91,0x0637,0x064A,0x062D,0x0641,0x0636,0x0642,0x0649,0x0638,0x0625,0x0623,0x0621,0xFEE0,0xFEDE,0xFECA,0xFEE8,0xFEE6,0xFEAE,0xFEB4,0xFEB2,0xFE92,0xFE90,0xFEC4,0xFEC2,0xFEF4,0xFEF2,0xFEAA,0xFEDB,0xFEDC,0xFEA0,0xFEA3,0xFEA4,0xFEA2,0xFEF7,0xFEC0,0xFEF0,0xFEE1,0xFEEE,0xFEC9 --font ../../../scripts/built_in_font/SimSun.woff --symbols 语語言標題月日电池今日距离天的速度时间设置蓝牙灯亮度音量最大限度光照强统计三平均高时速简体中文。 --format lvgl -o font_ebike_inter_14.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_INTER_14
--- a/demos/ebike/generated/font_ebike_inter_20.c
+++ b/demos/ebike/generated/font_ebike_inter_20.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 20 --font Inter-SemiBold.ttf -r 0x20-0x7F --font ../../../scripts/built_in_font/DejaVuSans.ttf --range 0xFE99,0xFE97,0xFE8D,0xFEBF,0xFE83,0xFE95,0xFE8E,0xFEF3,0xFE8B,0xFEBC,0xFE87,0xFEB3,0xFE98,0xFECB,0xFEDF,0xFED3,0xFEEF,0xFED8,0xFEB1,0xFEAD,0x627,0xFEA9,0xFEF9,0xFED0,0x0644,0xFECF,0xFE94,0x0639,0xFECC,0x0646,0x0648,0x0645,0xFEE3,0xFEE4,0xFEE2,0x0631,0x0633,0x0628,0xFE91,0x0637,0x064A,0x062D,0x0641,0x0636,0x0642,0x0649,0x0638,0x0625,0x0623,0x0621,0xFEE0,0xFEDE,0xFECA,0xFEE8,0xFEE6,0xFEAE,0xFEB4,0xFEB2,0xFE92,0xFE90,0xFEC4,0xFEC2,0xFEF4,0xFEF2,0xFEAA,0xFEDB,0xFEDC,0xFEA0,0xFEA3,0xFEA4,0xFEA2,0xFEF7,0xFEC0,0xFEF0,0xFEE1,0xFEEE,0xFEC9 --font ../../../scripts/built_in_font/SimSun.woff --symbols 语語言標題月日电池今日距离天的速度时间设置蓝牙灯亮度音量最大限度光照强统计三平均高时速简体中文。 --format lvgl -o font_ebike_inter_20.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_INTER_20
--- a/demos/ebike/generated/font_ebike_trump_24.c
+++ b/demos/ebike/generated/font_ebike_trump_24.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 24 --font TrumpGothicPro.ttf -r 0x20-0x7F --font ../../../scripts/built_in_font/DejaVuSans.ttf --range 0xFEA9,0xFE8D,0xFEAA,0xFECB,0xFEF9,0xFE95,0xFE8E,0xFEF3,0xFE8B,0xFEBC,0xFEA3,0xFE87,0xFEF4 --font ../../../scripts/built_in_font/SimSun.woff --symbols 语語言標題月日电池今日距离天的速度时间设置蓝牙灯亮度音量最大限度光照强统计三平均高时速简体中文。 --format lvgl -o font_ebike_trump_24.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_TRUMP_24
--- a/demos/ebike/generated/font_ebike_trump_40.c
+++ b/demos/ebike/generated/font_ebike_trump_40.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 40 --font TrumpGothicPro.ttf -r 0x20-0x7F --font ../../../scripts/built_in_font/DejaVuSans.ttf --range 0xFEA9,0xFE8D,0xFEAA,0xFECB,0xFEF9,0xFE95,0xFE8E,0xFEF3,0xFE8B,0xFEBC,0xFEA3,0xFE87,0xFEF4 --font ../../../scripts/built_in_font/SimSun.woff --symbols 语語言標題月日电池今日距离天的速度时间设置蓝牙灯亮度音量最大限度光照强统计三平均高时速简体中文。 --format lvgl -o font_ebike_trump_40.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_TRUMP_40
--- a/demos/ebike/generated/font_ebike_trump_48.c
+++ b/demos/ebike/generated/font_ebike_trump_48.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 48 --font TrumpGothicPro.ttf -r 0x20-0x7F --format lvgl -o font_ebike_trump_48.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_TRUMP_48
--- a/demos/ebike/generated/font_ebike_trump_72.c
+++ b/demos/ebike/generated/font_ebike_trump_72.c
@@ -4,10 +4,18 @@
 * Opts: --no-compress --no-prefilter --bpp 4 --size 72 --font TrumpGothicPro.ttf -r 0x20-0x7F --format lvgl -o font_ebike_trump_72.c --force-fast-kern-format
 ******************************************************************************/

-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef FONT_EBIKE_TRUMP_72
--- a/demos/ebike/generated/img_ebike_arrow_left.c
+++ b/demos/ebike/generated/img_ebike_arrow_left.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_arrow_left_2.c
+++ b/demos/ebike/generated/img_ebike_arrow_left_2.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_arrow_right.c
+++ b/demos/ebike/generated/img_ebike_arrow_right.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_arrow_right_2.c
+++ b/demos/ebike/generated/img_ebike_arrow_right_2.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_bg.c
+++ b/demos/ebike/generated/img_ebike_bg.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_bg_large.c
+++ b/demos/ebike/generated/img_ebike_bg_large.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_clock.c
+++ b/demos/ebike/generated/img_ebike_clock.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_dropdown_icon.c
+++ b/demos/ebike/generated/img_ebike_dropdown_icon.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_home.c
+++ b/demos/ebike/generated/img_ebike_home.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_lamp.c
+++ b/demos/ebike/generated/img_ebike_lamp.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_scale.c
+++ b/demos/ebike/generated/img_ebike_scale.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_scale_large.c
+++ b/demos/ebike/generated/img_ebike_scale_large.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_settings.c
+++ b/demos/ebike/generated/img_ebike_settings.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_settings_large.c
+++ b/demos/ebike/generated/img_ebike_settings_large.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_stats.c
+++ b/demos/ebike/generated/img_ebike_stats.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif


--- a/demos/ebike/generated/img_ebike_stats_large.c
+++ b/demos/ebike/generated/img_ebike_stats_large.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif

 #ifndef LV_ATTRIBUTE_MEM_ALIGN
--- a/demos/ebike/generated/img_ebike_whether.c
+++ b/demos/ebike/generated/img_ebike_whether.c
@@ -9,7 +9,7 @@
 #if defined(LV_LVGL_H_INCLUDE_SIMPLE)
    #include "lvgl.h"
 #else
-    #include "lvgl/lvgl.h"
+    #include "../../../lvgl.h"
 #endif