Switch to lvgl7

This commit is contained in:
fvanroie 2020-03-25 18:09:51 +01:00
parent a991d5530a
commit e45168f26f
2 changed files with 4 additions and 4 deletions

View File

@ -622,7 +622,7 @@ typedef uint8_t lv_obj_user_data_t;
#endif #endif
/*Table (dependencies: lv_label)*/ /*Table (dependencies: lv_label)*/
#define LV_USE_TABLE (LV_HIGH_RESOURCE_MCU) #define LV_USE_TABLE 1 //(LV_HIGH_RESOURCE_MCU)
#if LV_USE_TABLE #if LV_USE_TABLE
# define LV_TABLE_COL_MAX 12 # define LV_TABLE_COL_MAX 12
#endif #endif
@ -642,7 +642,7 @@ typedef uint8_t lv_obj_user_data_t;
#endif #endif
/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ /*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/
#define LV_USE_WIN 1 #define LV_USE_WIN (LV_HIGH_RESOURCE_MCU)
/*================== /*==================
* Non-user section * Non-user section

View File

@ -7,7 +7,7 @@
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lvgl.h" #include "lvgl.h"
#include "lv_objx/lv_canvas.h" #include "lv_widgets/lv_canvas.h"
#include "lv_qrcode.h" #include "lv_qrcode.h"
#include "qrcodegen.h" #include "qrcodegen.h"
@ -71,7 +71,7 @@ lv_res_t lv_qrcode_update(lv_obj_t * qrcode, const void * data, uint32_t data_le
{ {
lv_color_t c; lv_color_t c;
c.full = 1; c.full = 1;
lv_canvas_fill_bg(qrcode, c); lv_canvas_fill_bg(qrcode, c, 0);
// lv_canvas_zoom(); // lv_canvas_zoom();
if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV; if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV;