Update lvgl to v8.4.0
This commit is contained in:
@@ -1,19 +1,20 @@
|
||||
/*Using LVGL with Arduino requires some extra steps:
|
||||
*Be sure to read the docs here: https://docs.lvgl.io/master/get-started/platforms/arduino.html */
|
||||
|
||||
#include <lvgl.h>
|
||||
#include <TFT_eSPI.h>
|
||||
/*If you want to use the LVGL examples,
|
||||
make sure to install the lv_examples Arduino library
|
||||
and uncomment the following line.
|
||||
#include <lv_examples.h>
|
||||
*/
|
||||
|
||||
#include <lv_demo.h>
|
||||
/*To use the built-in examples and demos of LVGL uncomment the includes below respectively.
|
||||
*You also need to copy `lvgl/examples` to `lvgl/src/examples`. Similarly for the demos `lvgl/demos` to `lvgl/src/demos`.
|
||||
Note that the `lv_examples` library is for LVGL v7 and you shouldn't install it for this version (since LVGL v8)
|
||||
as the examples and demos are now part of the main LVGL library. */
|
||||
|
||||
/*Change to your screen resolution*/
|
||||
static const uint16_t screenWidth = 480;
|
||||
static const uint16_t screenHeight = 320;
|
||||
|
||||
static lv_disp_draw_buf_t draw_buf;
|
||||
static lv_color_t buf[ screenWidth * 10 ];
|
||||
static lv_color_t buf[ screenWidth * screenHeight / 10 ];
|
||||
|
||||
TFT_eSPI tft = TFT_eSPI(screenWidth, screenHeight); /* TFT instance */
|
||||
|
||||
@@ -27,7 +28,7 @@ void my_print(const char * buf)
|
||||
#endif
|
||||
|
||||
/* Display flushing */
|
||||
void my_disp_flush( lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p )
|
||||
void my_disp_flush( lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p )
|
||||
{
|
||||
uint32_t w = ( area->x2 - area->x1 + 1 );
|
||||
uint32_t h = ( area->y2 - area->y1 + 1 );
|
||||
@@ -37,11 +38,11 @@ void my_disp_flush( lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *colo
|
||||
tft.pushColors( ( uint16_t * )&color_p->full, w * h, true );
|
||||
tft.endWrite();
|
||||
|
||||
lv_disp_flush_ready( disp );
|
||||
lv_disp_flush_ready( disp_drv );
|
||||
}
|
||||
|
||||
/*Read the touchpad*/
|
||||
void my_touchpad_read( lv_indev_drv_t * indev_driver, lv_indev_data_t * data )
|
||||
void my_touchpad_read( lv_indev_drv_t * indev_drv, lv_indev_data_t * data )
|
||||
{
|
||||
uint16_t touchX, touchY;
|
||||
|
||||
@@ -92,7 +93,7 @@ void setup()
|
||||
uint16_t calData[5] = { 275, 3620, 264, 3532, 1 };
|
||||
tft.setTouch( calData );
|
||||
|
||||
lv_disp_draw_buf_init( &draw_buf, buf, NULL, screenWidth * 10 );
|
||||
lv_disp_draw_buf_init( &draw_buf, buf, NULL, screenWidth * screenHeight / 10 );
|
||||
|
||||
/*Initialize the display*/
|
||||
static lv_disp_drv_t disp_drv;
|
||||
@@ -110,26 +111,25 @@ void setup()
|
||||
indev_drv.type = LV_INDEV_TYPE_POINTER;
|
||||
indev_drv.read_cb = my_touchpad_read;
|
||||
lv_indev_drv_register( &indev_drv );
|
||||
|
||||
#if 0
|
||||
|
||||
/* Create simple label */
|
||||
lv_obj_t *label = lv_label_create( lv_scr_act() );
|
||||
lv_label_set_text( label, LVGL_Arduino.c_str() );
|
||||
lv_label_set_text( label, "Hello Ardino and LVGL!");
|
||||
lv_obj_align( label, LV_ALIGN_CENTER, 0, 0 );
|
||||
#else
|
||||
/* Try an example from the lv_examples Arduino library
|
||||
make sure to include it as written above.
|
||||
lv_example_btn_1();
|
||||
*/
|
||||
|
||||
// uncomment one of these demos
|
||||
lv_demo_widgets(); // OK
|
||||
// lv_demo_benchmark(); // OK
|
||||
// lv_demo_keypad_encoder(); // works, but I haven't an encoder
|
||||
// lv_demo_music(); // NOK
|
||||
|
||||
/* Try an example. See all the examples
|
||||
* online: https://docs.lvgl.io/master/examples.html
|
||||
* source codes: https://github.com/lvgl/lvgl/tree/e7f88efa5853128bf871dde335c0ca8da9eb7731/examples */
|
||||
//lv_example_btn_1();
|
||||
|
||||
/*Or try out a demo. Don't forget to enable the demos in lv_conf.h. E.g. LV_USE_DEMOS_WIDGETS*/
|
||||
//lv_demo_widgets();
|
||||
// lv_demo_benchmark();
|
||||
// lv_demo_keypad_encoder();
|
||||
// lv_demo_music();
|
||||
// lv_demo_printer();
|
||||
// lv_demo_stress(); // seems to be OK
|
||||
#endif
|
||||
// lv_demo_stress();
|
||||
|
||||
Serial.println( "Setup done" );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user