Merge branch 'dev-6.0' into event

2019-03-03 04:29:17 +01:00
parent 2c4ea022b9 2b4185ec23
commit c713c4135b
7 changed files with 78 additions and 10 deletions
--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@@ -82,6 +82,7 @@ static const char * kb_map_num[] = {
 };

 static const lv_btnm_ctrl_t kb_ctrl_num_map[] = {
+     1, 1, 1, 2,
     1, 1, 1, 2,
     1, 1, 1, 2,
     1, 1, 1, 1, 1