merge master

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### New features
 -  make DMA2D non blocking 
 
+## v7.7.2 (Planned to 28.11.2020)
+### Bugfixes
+
 ## v7.7.1 (04.11.2020)
 ### Bugfixes
 - Respect btnmatrix's `one_check` in `lv_btnmatrix_set_btn_ctrl`

library.json

@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-    "version": "7.7.1",
+    "version": "7.7.2",
 	"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": {

library.properties

@@ -1,5 +1,5 @@
 name=lvgl
-version=7.7.1
+version=7.7.2
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems

lv_conf_template.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_conf.h
- * Configuration file for v7.7.1-dev
+ * Configuration file for v7.7.2-dev
  */
 
 /*

scripts/release/com.py

@@ -13,7 +13,7 @@ def cmd(c, ask_on_err = True):
   r = os.system(c)       
   if r:
     print("### Error: " + str(r))
-    if exit_on_err: 
+    if ask_on_err: 
         input("Press Enter to continue exectution...")
     
 def define_set(fn, name, value):    
@@ -77,8 +77,7 @@ def get_lvgl_version(br):
     return ver
         
 def push(c):
-    return
-    cmd(c)
+    cmd("git push " + c)
         
 def update_version(ver):
     ver_str = ver_format(ver)

scripts/release/dev.py

@@ -7,7 +7,7 @@ from os import path
 from datetime import date
 import com
 
-def lvgl_upadte_ver(ver, br):
+def lvgl_update_ver(ver, br):
     os.chdir("./lvgl")
 
     com.cmd("git checkout " + br)
@@ -45,26 +45,26 @@ def merge_dev_to_master():
     
     
 def make(mode):
-    ver = com.get_lvgl_version("dev")
-    ver[3] = "dev"
     if(mode == "bugfix"):
-         ver[2] = ver[2] + 1
-         lvgl_update_ver(ver, "master")
-         docs_update_ver(ver, "latest")
+        ver = com.get_lvgl_version("master")
+        ver[3] = "dev"
+        ver[2] = str(int(ver[2]) + 1)
+        lvgl_update_ver(ver, "master")
+        docs_update_ver(ver, "latest")
     else:
-         merge_dev_to_master()
-         if(mode == "major"):
-             ver[0] = str(int(ver[0]) + 1)
-             ver[1] = '0'
-             ver[2] = '0'   
-         if(mode == "minor"):
-             ver[1] = str(int(ver[1]) + 1)
-             ver[2] = '0'   
-             
-         lvgl_upadte_ver(ver, "dev")
-         docs_update_ver(ver, "dev")
-         
+        ver = com.get_lvgl_version("dev")
+        ver[3] = "dev"
+        merge_dev_to_master()
+        if(mode == "major"):
+            ver[0] = str(int(ver[0]) + 1)
+            ver[1] = '0'
+            ver[2] = '0'   
+        if(mode == "minor"):
+            ver[1] = str(int(ver[1]) + 1)
+            ver[2] = '0'   
              
+        lvgl_upadte_ver(ver, "dev")
+        docs_update_ver(ver, "dev")
          
 if __name__ == '__main__':
      if(len(sys.argv) != 2):

scripts/release/main.py

@@ -43,7 +43,7 @@ def cleanup():
 
 if __name__ == '__main__':
     prepare_type = ['major', 'minor', 'bugfix']
-    dev_prepare = 'minor'    
+    dev_prepare = 'bugfix'    
 
 #    if(len(sys.argv) != 2):
 #        print("Missing argument. Usage ./release.py bugfix | minor | major")
@@ -57,6 +57,7 @@ if __name__ == '__main__':
      
     clone_repos()
     release.make()
+    os.chdir(workdir)
     for p in proj_list:
         proj.make(p, True)