Merge 998ad66c84 into dev

2021-01-05 14:47:37 +00:00
parent 70a9e486c6 998ad66c84
commit e0eb79043f
1 changed files with 8 additions and 6 deletions
--- a/src/lv_conf_kconfig.h
+++ b/src/lv_conf_kconfig.h
@@ -404,12 +404,14 @@ extern "C" {
 * SPRINTF DISABLE FLOAT
 *-----------------*/

-#ifndef LV_SPRINTF_DISABLE_FLOAT
-#ifndef CONFIG_LV_SPRINTF_DISABLE_FLOAT
-#define LV_SPRINTF_DISABLE_FLOAT    0
-#else
-#define LV_SPRINTF_DISABLE_FLOAT    1
-#endif
+#if CONFIG_LV_CONF_SKIP || LV_CONF_SKIP
+#  ifndef LV_SPRINTF_DISABLE_FLOAT
+#    ifndef CONFIG_LV_SPRINTF_DISABLE_FLOAT
+#      define LV_SPRINTF_DISABLE_FLOAT    0
+#    else
+#      define LV_SPRINTF_DISABLE_FLOAT    1
+#    endif
+#  endif
 #endif

 #ifdef __cplusplus