From ce97ba869b0d8499c5fdca28c38ae308d540fddb Mon Sep 17 00:00:00 2001 From: Yuqiang Wang Date: Tue, 29 Oct 2024 19:33:28 +0800 Subject: [PATCH] fix(demo): fix ebike demo header file inclusion issue (#7133) --- demos/ebike/generated/font_ebike_130.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_56.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_inter_14.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_inter_20.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_trump_24.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_trump_40.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_trump_48.c | 12 ++++++++++-- demos/ebike/generated/font_ebike_trump_72.c | 12 ++++++++++-- demos/ebike/generated/img_ebike_arrow_left.c | 2 +- demos/ebike/generated/img_ebike_arrow_left_2.c | 2 +- demos/ebike/generated/img_ebike_arrow_right.c | 2 +- demos/ebike/generated/img_ebike_arrow_right_2.c | 2 +- demos/ebike/generated/img_ebike_bg.c | 2 +- demos/ebike/generated/img_ebike_bg_large.c | 2 +- demos/ebike/generated/img_ebike_clock.c | 2 +- demos/ebike/generated/img_ebike_dropdown_icon.c | 2 +- demos/ebike/generated/img_ebike_home.c | 2 +- demos/ebike/generated/img_ebike_lamp.c | 2 +- demos/ebike/generated/img_ebike_scale.c | 2 +- demos/ebike/generated/img_ebike_scale_large.c | 2 +- demos/ebike/generated/img_ebike_settings.c | 2 +- demos/ebike/generated/img_ebike_settings_large.c | 2 +- demos/ebike/generated/img_ebike_stats.c | 2 +- demos/ebike/generated/img_ebike_stats_large.c | 2 +- demos/ebike/generated/img_ebike_whether.c | 2 +- 25 files changed, 97 insertions(+), 33 deletions(-) diff --git a/demos/ebike/generated/font_ebike_130.c b/demos/ebike/generated/font_ebike_130.c index d37f7ad48f..e313f82321 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_56.c b/demos/ebike/generated/font_ebike_56.c index e596e1a65c..35d874f0c7 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_inter_14.c b/demos/ebike/generated/font_ebike_inter_14.c index bf773d51fd..c7e0d633f8 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_inter_20.c b/demos/ebike/generated/font_ebike_inter_20.c index 63b86f991d..02ac679e74 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_trump_24.c b/demos/ebike/generated/font_ebike_trump_24.c index a5d41060d4..3918d35cfb 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_trump_40.c b/demos/ebike/generated/font_ebike_trump_40.c index 1501b90038..0024514272 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_trump_48.c b/demos/ebike/generated/font_ebike_trump_48.c index 6fec64ac01..0b77808fdf 100644 --- 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 diff --git a/demos/ebike/generated/font_ebike_trump_72.c b/demos/ebike/generated/font_ebike_trump_72.c index 884f5b3464..39c18b187a 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_arrow_left.c b/demos/ebike/generated/img_ebike_arrow_left.c index 2e01d5275e..e55bc5e164 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_arrow_left_2.c b/demos/ebike/generated/img_ebike_arrow_left_2.c index 02d3c0076f..4c954a1211 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_arrow_right.c b/demos/ebike/generated/img_ebike_arrow_right.c index f41a66e160..832eed189d 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_arrow_right_2.c b/demos/ebike/generated/img_ebike_arrow_right_2.c index 284d534961..ce317dc3f6 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_bg.c b/demos/ebike/generated/img_ebike_bg.c index e0de9f40fe..4099e9e399 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_bg_large.c b/demos/ebike/generated/img_ebike_bg_large.c index 672498d914..e13e32aadd 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_clock.c b/demos/ebike/generated/img_ebike_clock.c index 14a8e64faa..98c52a4f63 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_dropdown_icon.c b/demos/ebike/generated/img_ebike_dropdown_icon.c index a402c17aed..5c1cf1dc46 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_home.c b/demos/ebike/generated/img_ebike_home.c index f70821e935..073294a296 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_lamp.c b/demos/ebike/generated/img_ebike_lamp.c index 890455f23b..50421c7853 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_scale.c b/demos/ebike/generated/img_ebike_scale.c index 2cac9302c2..f06ae7a0c4 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_scale_large.c b/demos/ebike/generated/img_ebike_scale_large.c index ff504176da..15d43a22b4 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_settings.c b/demos/ebike/generated/img_ebike_settings.c index 26e9ddd332..091074259c 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_settings_large.c b/demos/ebike/generated/img_ebike_settings_large.c index 8310590b5c..1dc871d232 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_stats.c b/demos/ebike/generated/img_ebike_stats.c index cd9548a9d5..924c7a99b2 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_stats_large.c b/demos/ebike/generated/img_ebike_stats_large.c index 0c240d0d16..92ae163d4c 100644 --- 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 diff --git a/demos/ebike/generated/img_ebike_whether.c b/demos/ebike/generated/img_ebike_whether.c index 14a201a0ec..7b11e88b20 100644 --- 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