merge master

This commit is contained in:
Gabor Kiss-Vamosi
2021-01-23 23:50:00 +01:00
180 changed files with 774 additions and 2806 deletions

24
lvgl.h
View File

@@ -10,7 +10,6 @@
extern "C" {
#endif
/***************************
* CURRENT VERSION OF LVGL
***************************/
@@ -106,6 +105,29 @@ extern "C" {
* */
#define LV_VERSION_CHECK(x,y,z) (x == LVGL_VERSION_MAJOR && (y < LVGL_VERSION_MINOR || (y == LVGL_VERSION_MINOR && z <= LVGL_VERSION_PATCH)))
/**
* Wrapper functions for VERSION macros
*/
static inline int lv_version_major()
{
return LVGL_VERSION_MAJOR;
}
static inline int lv_version_minor()
{
return LVGL_VERSION_MINOR;
}
static inline int lv_version_patch()
{
return LVGL_VERSION_PATCH;
}
static inline const char *lv_version_info()
{
return LVGL_VERSION_INFO;
}
#ifdef __cplusplus
}