Skip to content

Commit 443bda0

Browse files
authored
Merge branch 'esp-arduino-libs:master' into Waveshare_ESP32_S3_Touch_LCD_4_3
2 parents 762be45 + c747dbe commit 443bda0

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ The following example demonstrates how to develop built-in or custom development
293293

294294
For configuring LVGL (v8.3.x), please refer to [here](#configuring-lvgl) for more detailed information.
295295

296-
* [Porting](examples/LVGL/v8/Porting/): This example demonstrates how to port LVGL (v8.3.x). And for RGB LCD, it can enable the avoid tearing fucntion.
296+
* [Porting](examples/LVGL/v8/Porting/): This example demonstrates how to port LVGL (v8.3.x). And for RGB LCD, it can enable the avoid tearing function.
297297
* [Rotation](examples/LVGL/v8/Rotation/): This example demonstrates how to use LVGL to rotate the display.
298298

299299
> [!WARNING]

examples/LVGL/v8/Porting/Porting.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* # LVGL Porting Example
33
*
4-
* The example demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing fucntion.
4+
* The example demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing function.
55
*
66
* ## How to Use
77
*
@@ -99,7 +99,7 @@ void setup()
9999

100100
/**
101101
* Or try out a demo.
102-
* Don't forget to uncomment header and enable the demos in `lv_conf.h`. E.g. `LV_USE_DEMOS_WIDGETS`
102+
* Don't forget to uncomment header and enable the demos in `lv_conf.h`. E.g. `LV_USE_DEMO_WIDGETS`
103103
*/
104104
// lv_demo_widgets();
105105
// lv_demo_benchmark();

examples/LVGL/v8/Porting/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# LVGL Porting Example
22

3-
The example demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing fucntion.
3+
The example demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing function.
44

55
## How to Use
66

examples/PlatformIO/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PlatformIO Example
22

3-
The example is used to guide how to use this library in PlatformIO. It also demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing fucntion.
3+
The example is used to guide how to use this library in PlatformIO. It also demonstrates how to port LVGL(v8). And for RGB LCD, it can enable the avoid tearing function.
44

55
It is by default suitable for **ESP32-S3-LCD-EV-Board** and **ESP32-S3-LCD-EV-Board-2** boards. Users should modify the [boards/ESP-LCD.json](boards/ESP-LCD.json) file as needed.
66

examples/PlatformIO/src/app.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void setup()
5555

5656
/**
5757
* Or try out a demo.
58-
* Don't forget to uncomment header and enable the demos in `lv_conf.h`. E.g. `LV_USE_DEMOS_WIDGETS`
58+
* Don't forget to uncomment header and enable the demos in `lv_conf.h`. E.g. `LV_USE_DEMO_WIDGETS`
5959
*/
6060
// lv_demo_widgets();
6161
// lv_demo_benchmark();

examples/SquareLine/v8/Porting/Porting.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* # SquareLine Porting Example
33
*
4-
* The example demonstrates how to port SquareLine (v1.3.x) project. And for RGB LCD, it can enable the avoid tearing fucntion.
4+
* The example demonstrates how to port SquareLine (v1.3.x) project. And for RGB LCD, it can enable the avoid tearing function.
55
*
66
* ## How to Use
77
*

examples/SquareLine/v8/Porting/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SquareLine Porting Example
22

3-
The example demonstrates how to port SquareLine (v1.3.x) project. And for RGB LCD, it can enable the avoid tearing fucntion.
3+
The example demonstrates how to port SquareLine (v1.3.x) project. And for RGB LCD, it can enable the avoid tearing function.
44

55
## How to Use
66

examples/SquareLine/v8/WiFiClock/WiFiClock.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ void ParseWeather(String url)
312312
Serial.printf("Weather: %s\n", Weather);
313313
Serial.printf("temperature: %d\n", temperature);
314314
} else {
315-
Serial.printf("ERROR: HTTP_CODE Weather\n");
315+
Serial.printf("ERROR: [ParseWeather] OpenWeather API --> HTTP code %d\n", httpGet);
316316
}
317317
} else {
318318
Serial.printf("ERROR: httpGet Weather\n");
@@ -338,7 +338,7 @@ void Parselatlon(String url)
338338
Serial.printf("lat: %s\n", lat);
339339
Serial.printf("lon: %s\n", lon);
340340
} else {
341-
Serial.printf("ERROR: HTTP_CODE latlon\n");
341+
Serial.printf("ERROR: [Parselatlon] OpenWeather API --> HTTP code %d\n", httpGet);
342342
}
343343
} else {
344344
Serial.printf("ERROR: httpGet latlon\n");

0 commit comments

Comments
 (0)