diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index a3116b1b7..da5dd8e0d 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -30,7 +30,25 @@ fout.write( #define LV_CONF_INTERNAL_H /* clang-format off */ -#include "misc/lv_types.h" +/*Config options*/ +#define LV_OS_NONE 0 +#define LV_OS_PTHREAD 1 +#define LV_OS_FREERTOS 2 +#define LV_OS_CMSIS_RTOS2 3 +#define LV_OS_RTTHREAD 4 +#define LV_OS_WINDOWS 5 +#define LV_OS_CUSTOM 255 + +#define LV_STDLIB_BUILTIN 0 +#define LV_STDLIB_CLIB 1 +#define LV_STDLIB_MICROPYTHON 2 +#define LV_STDLIB_RTTHREAD 3 +#define LV_STDLIB_CUSTOM 255 + +#define LV_DRAW_SW_ASM_NONE 0 +#define LV_DRAW_SW_ASM_NEON 1 +#define LV_DRAW_SW_ASM_MVE 2 +#define LV_DRAW_SW_ASM_CUSTOM 255 /* Handle special Kconfig options */ #ifndef LV_KCONFIG_IGNORE @@ -156,14 +174,6 @@ LV_EXPORT_CONST_INT(LV_DPI_DEF); #undef _LV_KCONFIG_PRESENT -#ifndef __ASSEMBLY__ -#if LV_USE_FLOAT - typedef float lv_value_precise_t; -#else - typedef int32_t lv_value_precise_t; -#endif -#endif - /*Set some defines if a dependency is disabled*/ #if LV_USE_LOG == 0 #define LV_LOG_LEVEL LV_LOG_LEVEL_NONE diff --git a/src/layouts/lv_layout.h b/src/layouts/lv_layout.h index 0266d4386..685ba5628 100644 --- a/src/layouts/lv_layout.h +++ b/src/layouts/lv_layout.h @@ -14,6 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_conf_internal.h" +#include "../misc/lv_types.h" /********************* * DEFINES diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index f6575338c..8c329b3ef 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -8,7 +8,25 @@ #define LV_CONF_INTERNAL_H /* clang-format off */ -#include "misc/lv_types.h" +/*Config options*/ +#define LV_OS_NONE 0 +#define LV_OS_PTHREAD 1 +#define LV_OS_FREERTOS 2 +#define LV_OS_CMSIS_RTOS2 3 +#define LV_OS_RTTHREAD 4 +#define LV_OS_WINDOWS 5 +#define LV_OS_CUSTOM 255 + +#define LV_STDLIB_BUILTIN 0 +#define LV_STDLIB_CLIB 1 +#define LV_STDLIB_MICROPYTHON 2 +#define LV_STDLIB_RTTHREAD 3 +#define LV_STDLIB_CUSTOM 255 + +#define LV_DRAW_SW_ASM_NONE 0 +#define LV_DRAW_SW_ASM_NEON 1 +#define LV_DRAW_SW_ASM_MVE 2 +#define LV_DRAW_SW_ASM_CUSTOM 255 /* Handle special Kconfig options */ #ifndef LV_KCONFIG_IGNORE @@ -2944,14 +2962,6 @@ LV_EXPORT_CONST_INT(LV_DPI_DEF); #undef _LV_KCONFIG_PRESENT -#ifndef __ASSEMBLY__ -#if LV_USE_FLOAT - typedef float lv_value_precise_t; -#else - typedef int32_t lv_value_precise_t; -#endif -#endif - /*Set some defines if a dependency is disabled*/ #if LV_USE_LOG == 0 #define LV_LOG_LEVEL LV_LOG_LEVEL_NONE diff --git a/src/misc/lv_area.h b/src/misc/lv_area.h index bbc77e930..a284c041f 100644 --- a/src/misc/lv_area.h +++ b/src/misc/lv_area.h @@ -14,6 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_conf_internal.h" +#include "lv_types.h" #include #include diff --git a/src/misc/lv_types.h b/src/misc/lv_types.h index bed66f4ee..ff51b5963 100644 --- a/src/misc/lv_types.h +++ b/src/misc/lv_types.h @@ -13,6 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ +#include "../lv_conf_internal.h" #ifndef __ASSEMBLY__ #include @@ -35,25 +36,6 @@ extern "C" { #endif -#define LV_OS_NONE 0 -#define LV_OS_PTHREAD 1 -#define LV_OS_FREERTOS 2 -#define LV_OS_CMSIS_RTOS2 3 -#define LV_OS_RTTHREAD 4 -#define LV_OS_WINDOWS 5 -#define LV_OS_CUSTOM 255 - -#define LV_STDLIB_BUILTIN 0 -#define LV_STDLIB_CLIB 1 -#define LV_STDLIB_MICROPYTHON 2 -#define LV_STDLIB_RTTHREAD 3 -#define LV_STDLIB_CUSTOM 255 - -#define LV_DRAW_SW_ASM_NONE 0 -#define LV_DRAW_SW_ASM_NEON 1 -#define LV_DRAW_SW_ASM_MVE 2 -#define LV_DRAW_SW_ASM_CUSTOM 255 - /********************** * TYPEDEFS **********************/ @@ -94,6 +76,12 @@ typedef int32_t lv_intptr_t; #endif +#if LV_USE_FLOAT +typedef float lv_value_precise_t; +#else +typedef int32_t lv_value_precise_t; +#endif + #endif /*__ASSEMBLY__*/ /**********************