Merge branch 'bugfix/lvgl_coffee' into 'master'

costaud · costaud · commit 0f087f85b522 · 2019-07-10T11:03:38.000+08:00
bugfix(lvgl coffee): bugfix: issue #40 See merge request rd/esp-iot-solution!371
diff --git a/examples/hmi/lvgl_coffee/main/app_main.cpp b/examples/hmi/lvgl_coffee/main/app_main.cpp
@@ -343,9 +343,10 @@ static void create_tab(lv_obj_t *parent, uint8_t wp_img_id, uint8_t coffee_type_
     lv_obj_animate(precent_label[id], LV_ANIM_FLOAT_BOTTOM | LV_ANIM_OUT, 400, 0, NULL);                                           /* animation of hide the object */
 }
 
-static void tabview_load_action(lv_obj_t *tabview, uint16_t tab_action_id)
+static lv_res_t tabview_load_action(lv_obj_t *tabview, uint16_t tab_action_id)
 {
     tab_id = tab_action_id;
+    return LV_RES_OK;
 }
 
 static void littlevgl_coffee(void)

Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,10 @@ static void create_tab(lv_obj_t *parent, uint8_t wp_img_id, uint8_t coffee_type_`
`343`	`343`	`lv_obj_animate(precent_label[id], LV_ANIM_FLOAT_BOTTOM \| LV_ANIM_OUT, 400, 0, NULL); /* animation of hide the object */`
`344`	`344`	`}`
`345`	`345`
`346`		`-static void tabview_load_action(lv_obj_t *tabview, uint16_t tab_action_id)`
	`346`	`+static lv_res_t tabview_load_action(lv_obj_t *tabview, uint16_t tab_action_id)`
`347`	`347`	`{`
`348`	`348`	`tab_id = tab_action_id;`
	`349`	`+ return LV_RES_OK;`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`static void littlevgl_coffee(void)`