merge master

This commit is contained in:
Gabor Kiss-Vamosi
2020-08-18 06:36:42 +02:00
3 changed files with 454 additions and 237 deletions

15
lvgl.h
View File

@@ -10,6 +10,16 @@
extern "C" {
#endif
/***************************
* CURRENT VERSION OF LVGL
***************************/
/*Current version of LVGL*/
#define LVGL_VERSION_MAJOR 7
#define LVGL_VERSION_MINOR 4
#define LVGL_VERSION_PATCH 0
#define LVGL_VERSION_INFO "dev"
/*********************
* INCLUDES
*********************/
@@ -76,11 +86,6 @@ extern "C" {
/*********************
* DEFINES
*********************/
/*Current version of LVGL*/
#define LVGL_VERSION_MAJOR 7
#define LVGL_VERSION_MINOR 4
#define LVGL_VERSION_PATCH 0
#define LVGL_VERSION_INFO "dev"
/**********************
* TYPEDEFS