merge master

2020-12-01 15:30:57 +01:00
parent 9688935c8f 2aad9aaebd
commit 87a49f25c1
5 changed files with 6 additions and 6 deletions
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-    "version": ".7.0",
+    "version": "7.8.0",
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=lvgl
-version=.7.0
+version=7.8.0
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems
--- a/lv_conf_template.h
+++ b/lv_conf_template.h
@@ -1,6 +1,6 @@
 /**
 * @file lv_conf.h
- * Configuration file for v7.8.0-dev
+ * Configuration file for v7.8.1-dev
 */

 /*
--- a/lvgl.h
+++ b/lvgl.h
@@ -16,8 +16,8 @@ extern "C" {
 ***************************/
 #define LVGL_VERSION_MAJOR 7
 #define LVGL_VERSION_MINOR 8
-#define LVGL_VERSION_PATCH 0
-#define LVGL_VERSION_INFO ""
+#define LVGL_VERSION_PATCH 1
+#define LVGL_VERSION_INFO "dev"

 /*********************
 *      INCLUDES
--- a/src/lv_api_map.h
+++ b/src/lv_api_map.h
@@ -188,7 +188,7 @@ static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page)
 #if LV_USE_API_EXTENSION_V7

 #if LV_USE_ROLLER
-#define LV_ROLLER_MODE_INFINITE LV_ROLLER_MODE_INIFINITE
+#define LV_ROLLER_MODE_INIFINITE LV_ROLLER_MODE_INFINITE 
 #endif

 #if LV_USE_WIN