Fix buf name error for "lv_port_disp_template.c" and optimize the arduino example (#2475)

* fix(buf) correct the name error

* fix(format) make the indent become 4 space

* fix(print) use lv_version_xxx  to serial for debug

* fix(arduino) optimize the code

* fix(arduino) use lv_version_xxx to serial

1 files changed, 81 insertions, 77 deletions

diff --git a/examples/arduino/LVGL_Arduino/LVGL_Arduino.ino b/examples/arduino/LVGL_Arduino/LVGL_Arduino.ino
index a22859040..9ba575b23 100644
--- a/examples/arduino/LVGL_Arduino/LVGL_Arduino.ino
+++ b/examples/arduino/LVGL_Arduino/LVGL_Arduino.ino
@@ -8,129 +8,133 @@
 
 #include <lv_demo.h>
 
-TFT_eSPI tft = TFT_eSPI(); /* TFT instance */
-
 /*Change to your screen resolution*/
-static const uint32_t screenWidth  = 480;
-static const uint32_t screenHeight = 320;
+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 ];
 
+TFT_eSPI tft = TFT_eSPI(screenWidth, screenHeight); /* TFT instance */
+
 #if LV_USE_LOG != 0
 /* Serial debugging */
 void my_print( lv_log_level_t level, const char * file, uint32_t line, const char * fn_name, const char * dsc )
 {
-   Serial.printf( "%s(%s)@%d->%s\r\n", file, fn_name, line, dsc );
-   Serial.flush();
+    Serial.printf( "%s(%s)@%d->%s\r\n", file, fn_name, line, dsc );
+    Serial.flush();
 }
 #endif
 
 /* Display flushing */
 void my_disp_flush( lv_disp_drv_t *disp, 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 );
+    uint32_t w = ( area->x2 - area->x1 + 1 );
+    uint32_t h = ( area->y2 - area->y1 + 1 );
 
-   tft.startWrite();
-   tft.setAddrWindow( area->x1, area->y1, w, h );
-   tft.pushColors( ( uint16_t * )&color_p->full, w * h, true );
-   tft.endWrite();
+    tft.startWrite();
+    tft.setAddrWindow( area->x1, area->y1, w, h );
+    tft.pushColors( ( uint16_t * )&color_p->full, w * h, true );
+    tft.endWrite();
 
-   lv_disp_flush_ready( disp );
+    lv_disp_flush_ready( disp );
 }
 
 /*Read the touchpad*/
 void my_touchpad_read( lv_indev_drv_t * indev_driver, lv_indev_data_t * data )
 {
-   uint16_t touchX, touchY;
+    uint16_t touchX, touchY;
 
-   bool touched = tft.getTouch( &touchX, &touchY, 600 );
+    bool touched = tft.getTouch( &touchX, &touchY, 600 );
 
-   if( !touched )
-   {
-      data->state = LV_INDEV_STATE_REL;
-   }
-   else
-   {
-      data->state = LV_INDEV_STATE_PR;
+    if( !touched )
+    {
+        data->state = LV_INDEV_STATE_REL;
+    }
+    else
+    {
+        data->state = LV_INDEV_STATE_PR;
 
-      /*Set the coordinates*/
-      data->point.x = touchX;
-      data->point.y = touchY;
+        /*Set the coordinates*/
+        data->point.x = touchX;
+        data->point.y = touchY;
 
-      Serial.print( "Data x " );
-      Serial.println( touchX );
+        Serial.print( "Data x " );
+        Serial.println( touchX );
 
-      Serial.print( "Data y " );
-      Serial.println( touchY );
-   }
+        Serial.print( "Data y " );
+        Serial.println( touchY );
+    }
 }
 
 void setup()
 {
-   Serial.begin( 115200 ); /* prepare for possible serial debug */
-   Serial.println( "Hello Arduino! (V8.0.X)" );
-   Serial.println( "I am LVGL_Arduino" );
+    Serial.begin( 115200 ); /* prepare for possible serial debug */
+
+    String LVGL_Arduino = "Hello Arduino! ";
+    LVGL_Arduino += String('V') + lv_version_major() + "." + lv_version_minor() + "." + lv_version_patch();
 
-   lv_init();
+    Serial.println( LVGL_Arduino );
+    Serial.println( "I am LVGL_Arduino" );
+
+    lv_init();
 
 #if LV_USE_LOG != 0
-   lv_log_register_print_cb( my_print ); /* register print function for debugging */
+    lv_log_register_print_cb( my_print ); /* register print function for debugging */
 #endif
 
-   tft.begin();          /* TFT init */
-   tft.setRotation( 3 ); /* Landscape orientation, flipped */
+    tft.begin();          /* TFT init */
+    tft.setRotation( 3 ); /* Landscape orientation, flipped */
 
-   /*Set the touchscreen calibration data,
+    /*Set the touchscreen calibration data,
      the actual data for your display can be aquired using
      the Generic -> Touch_calibrate example from the TFT_eSPI library*/
-   uint16_t calData[5] = { 275, 3620, 264, 3532, 1 };
-   tft.setTouch( calData );
-
-   lv_disp_draw_buf_init( &draw_buf, buf, NULL, screenWidth * 10 );
-
-   /*Initialize the display*/
-   static lv_disp_drv_t disp_drv;
-   lv_disp_drv_init( &disp_drv );
-   /*Change the following line to your display resolution*/
-   disp_drv.hor_res = screenWidth;
-   disp_drv.ver_res = screenHeight;
-   disp_drv.flush_cb = my_disp_flush;
-   disp_drv.draw_buf = &draw_buf;
-   lv_disp_drv_register( &disp_drv );
-
-   /*Initialize the (dummy) input device driver*/
-   static lv_indev_drv_t indev_drv;
-   lv_indev_drv_init( &indev_drv );
-   indev_drv.type = LV_INDEV_TYPE_POINTER;
-   indev_drv.read_cb = my_touchpad_read;
-   lv_indev_drv_register( &indev_drv );
+    uint16_t calData[5] = { 275, 3620, 264, 3532, 1 };
+    tft.setTouch( calData );
+
+    lv_disp_draw_buf_init( &draw_buf, buf, NULL, screenWidth * 10 );
+
+    /*Initialize the display*/
+    static lv_disp_drv_t disp_drv;
+    lv_disp_drv_init( &disp_drv );
+    /*Change the following line to your display resolution*/
+    disp_drv.hor_res = screenWidth;
+    disp_drv.ver_res = screenHeight;
+    disp_drv.flush_cb = my_disp_flush;
+    disp_drv.draw_buf = &draw_buf;
+    lv_disp_drv_register( &disp_drv );
+
+    /*Initialize the (dummy) input device driver*/
+    static lv_indev_drv_t indev_drv;
+    lv_indev_drv_init( &indev_drv );
+    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, "Hello Arduino! (V8.0.X)" );
-   lv_obj_align( label, LV_ALIGN_CENTER, 0, 0 );
+    /* Create simple label */
+    lv_obj_t *label = lv_label_create( lv_scr_act() );
+    lv_label_set_text( label, LVGL_Arduino.c_str() );
+    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();
+    /* 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
-   // lv_demo_printer();
-   // lv_demo_stress();             // seems to be OK
+    // 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
+    // lv_demo_printer();
+    // lv_demo_stress();             // seems to be OK
 #endif
-   Serial.println( "Setup done" );
+    Serial.println( "Setup done" );
 }
 
 void loop()
 {
-   lv_timer_handler(); /* let the GUI do its work */
-   delay( 5 );
-}
\ No newline at end of file
+    lv_timer_handler(); /* let the GUI do its work */
+    delay( 5 );
+}