github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lv_conf_internal): re-generate to add LV_FONT_UNSCII_16

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-11-05 12:42:20 +01:00
parent ef81e0fbc3
commit 2d986871c9
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lv_conf_internal.h
View File

@@ -8,11 +8,18 @@
#define LV_CONF_INTERNAL_H #define LV_CONF_INTERNAL_H
/* clang-format off */ /* clang-format off */
/*Handle special Kconfig options*/
#include "lv_conf_kconfig.h"
#include <stdint.h> #include <stdint.h>
/* Add ESP-IDF related includes */
#if defined (ESP_PLATFORM)
# include "sdkconfig.h"
# include "esp_attr.h"
#endif
/* Handle special Kconfig options */
#include "lv_conf_kconfig.h"
/* If "lv_conf.h" is available from here try to use it later.*/
#if defined __has_include #if defined __has_include
# if __has_include("lv_conf.h") # if __has_include("lv_conf.h")
# ifndef LV_CONF_INCLUDE_SIMPLE # ifndef LV_CONF_INCLUDE_SIMPLE
@@ -22,7 +29,7 @@
#endif #endif
/*If lv_conf.h is not skipped include it*/ /*If lv_conf.h is not skipped include it*/
#if !defined(LV_CONF_SKIP) && !defined(CONFIG_LV_CONF_SKIP) #if !defined(LV_CONF_SKIP)
# if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/ # if defined(LV_CONF_PATH) /*If there is a path defined for lv_conf.h use it*/
# define __LV_TO_STR_AUX(x) #x # define __LV_TO_STR_AUX(x) #x
# define __LV_TO_STR(x) __LV_TO_STR_AUX(x) # define __LV_TO_STR(x) __LV_TO_STR_AUX(x)
@@ -1058,6 +1065,13 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
# define LV_FONT_UNSCII_8 0 # define LV_FONT_UNSCII_8 0
# endif # endif
#endif #endif
#ifndef LV_FONT_UNSCII_16
# ifdef CONFIG_LV_FONT_UNSCII_16
# define LV_FONT_UNSCII_16 CONFIG_LV_FONT_UNSCII_16
# else
# define LV_FONT_UNSCII_16 0
# endif
#endif
/* Optionally declare your custom fonts here. /* Optionally declare your custom fonts here.
* You can use these fonts as default font too * You can use these fonts as default font too
@@ -1975,7 +1989,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
/*If running without lv_conf.h add typdesf with default value*/ /*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP) || defined(CONFIG_LV_CONF_SKIP) #if defined(LV_CONF_SKIP)
/* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */ /* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */
typedef int16_t lv_coord_t; typedef int16_t lv_coord_t;