moved lvgl to current master branch, and updated project to work with most up-to-date lvgl branch

Penguin 2 years ago
parent cbf97e8372
commit 177b56fb38

@ -337,7 +337,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i
/* Montserrat fonts with bpp = 4
* https://fonts.google.com/specimen/Montserrat */
#define LV_FONT_MONTSERRAT_12 0
#define LV_FONT_MONTSERRAT_14 0
#define LV_FONT_MONTSERRAT_14 1
#define LV_FONT_MONTSERRAT_16 1
#define LV_FONT_MONTSERRAT_18 0
#define LV_FONT_MONTSERRAT_20 0

@ -9,7 +9,7 @@
#include "lvgl/lvgl.h"
#include "hornet.h"
static lv_disp_buf_t disp_buf;
static lv_disp_draw_buf_t disp_buf;
static lv_color_t buf[LV_HOR_RES_MAX * 10]; /*Declare a buffer for 10 lines*/
void p_screen_init(void)
@ -20,20 +20,20 @@ void p_screen_init(void)
ssd1963_init();
lv_disp_buf_init(&disp_buf, buf, NULL, LV_HOR_RES_MAX * 10); /*Initialize the display buffer*/
lv_disp_draw_buf_init(&disp_buf, buf, NULL, LV_HOR_RES_MAX * 10); /*Initialize the display buffer*/
lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/
lv_disp_drv_init(&disp_drv); /*Basic initialization*/
disp_drv.flush_cb = ssd1963_flush; /*Set your driver function*/
disp_drv.buffer = &disp_buf; /*Assign the buffer to the display*/
disp_drv.draw_buf = &disp_buf;
lv_disp_drv_register(&disp_drv); /*Finally register the driver*/
lv_obj_t* scr = lv_disp_get_scr_act(NULL);
lv_obj_t* hornet_image = lv_img_create(scr, NULL);
lv_obj_t* hornet_image = lv_img_create(scr);
lv_img_set_src(hornet_image, &hornet);
lv_obj_set_pos(hornet_image, 0, 0);
lv_obj_t* random_text = lv_label_create(scr, NULL);
lv_obj_t* random_text = lv_label_create(scr);
lv_obj_set_pos(random_text, 90, 35);
lv_label_set_text(random_text, "Hello World");
}

@ -3,7 +3,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "lvgl/src/lv_misc/lv_log.h"
#include "lvgl/src/misc/lv_log.h"
#include "p_tcc.h"
#define DEBUG_USART_EX_BUFF_SIZE 16

@ -1 +1 @@
Subproject commit c4f15c33a665c8cece51e0b54a800d489a33b109
Subproject commit 6a179e2c8e67afbcd30fbd7a1f6134799e602828

@ -1 +1 @@
Subproject commit 966b4b11f62e744106a5f4e9f712ab975a70f18c
Subproject commit a6c4c134902f9a4c156672a70108e809b58fa18c