merge dev

2020-08-18 11:57:26 +02:00
parent 71e5618380 bcb6d02acf
commit d0cc9283e7
66 changed files with 6060 additions and 170 deletions
--- a/lvgl.h
+++ b/lvgl.h
@@ -40,6 +40,7 @@ extern "C" {
 #include "src/lv_themes/lv_theme.h"

 #include "src/lv_font/lv_font.h"
+#include "src/lv_font/lv_font_loader.h"
 #include "src/lv_font/lv_font_fmt_txt.h"
 #include "src/lv_misc/lv_printf.h"

@@ -81,6 +82,18 @@ extern "C" {

 #include "src/lv_api_map.h"

+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
 /**********************
 *      MACROS
 **********************/