From bb48530a17b9e37812c3abfb2d31d301054409c6 Mon Sep 17 00:00:00 2001 From: Liu Zhongwei Date: Wed, 31 Jul 2024 10:02:58 +0800 Subject: [PATCH 1/2] fix(examples): fix WiFiClock description closes https://github.com/esp-arduino-libs/ESP32_Display_Panel/issues/95 --- CHANGELOG.md | 1 + examples/SquareLine/v8/WiFiClock/README.md | 4 +++- examples/SquareLine/v8/WiFiClock/WiFiClock.ino | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07cd1968..cbd9dc3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * fix(examples): fix `LV_USE_DEMO_WIDGETS` typo by @lboue (#98) * fix(examples): fix `Tearing fucntion` typo by @lboue (#96) * fix(examples): fix WiFiClock log HTTP error code to serial console by @lboue (#97) +* fix(examples): fix WiFiClock description * fix(gt911): allow to set the GT911 touch device address by @lboue (#86) * fix(conf): fix the issue that the `ESP_PANEL_EXPANDER_HOST_ID` flag is not working properly * fix(conf): fix `LCD Venbdor` typo (#92) diff --git a/examples/SquareLine/v8/WiFiClock/README.md b/examples/SquareLine/v8/WiFiClock/README.md index b55aadb4..88ca9f57 100644 --- a/examples/SquareLine/v8/WiFiClock/README.md +++ b/examples/SquareLine/v8/WiFiClock/README.md @@ -1,6 +1,8 @@ # Squareline Simple Wi-Fi Clock Example -This example implements a simple Wi-Fi clock demo, which UI is created by Squareline Studio. And this example applies to LCDs with resolutions between *320x240* and *800x480*. +This example implements a simple Wi-Fi clock demo, which UI is created by Squareline Studio. + +This example can run on various LCD resolutions, but since the UI itself is designed based on a 320x240 resolution, it will look very uncoordinated if the actual resolution is too large. ## How to Use diff --git a/examples/SquareLine/v8/WiFiClock/WiFiClock.ino b/examples/SquareLine/v8/WiFiClock/WiFiClock.ino index 686d963f..4cc6fb9f 100644 --- a/examples/SquareLine/v8/WiFiClock/WiFiClock.ino +++ b/examples/SquareLine/v8/WiFiClock/WiFiClock.ino @@ -1,7 +1,9 @@ /** * # Squareline Simple Wi-Fi Clock Example * - * This example implements a simple Wi-Fi clock demo, which UI is created by Squareline Studio. And this example applies to LCDs with resolutions between *320x240* and *800x480*. + * This example implements a simple Wi-Fi clock demo, which UI is created by Squareline Studio. + * + * This example can run on various LCD resolutions, but since the UI itself is designed based on a 320x240 resolution, it will look very uncoordinated if the actual resolution is too large. * * ## How to Use * From 3d1937db81350d0788d8e261693425deae145226 Mon Sep 17 00:00:00 2001 From: Liu Zhongwei Date: Wed, 31 Jul 2024 11:44:19 +0800 Subject: [PATCH 2/2] fix(version): correct version compare patch --- ESP_Panel_Board_Custom.h | 5 ++++- ESP_Panel_Board_Supported.h | 7 +++++-- ESP_Panel_Conf.h | 4 ++-- examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h | 4 ++-- examples/LCD/QSPI/ESP_Panel_Conf.h | 4 ++-- examples/LCD/RGB/ESP_Panel_Conf.h | 4 ++-- examples/LCD/SPI/ESP_Panel_Conf.h | 4 ++-- .../LVGL/v8/Porting/ESP_Panel_Board_Custom.h | 5 ++++- .../LVGL/v8/Porting/ESP_Panel_Board_Supported.h | 7 +++++-- examples/LVGL/v8/Porting/ESP_Panel_Conf.h | 4 ++-- .../LVGL/v8/Rotation/ESP_Panel_Board_Custom.h | 5 ++++- .../LVGL/v8/Rotation/ESP_Panel_Board_Supported.h | 7 +++++-- examples/LVGL/v8/Rotation/ESP_Panel_Conf.h | 4 ++-- .../Panel/PanelTest/ESP_Panel_Board_Custom.h | 5 ++++- .../Panel/PanelTest/ESP_Panel_Board_Supported.h | 7 +++++-- examples/Panel/PanelTest/ESP_Panel_Conf.h | 4 ++-- examples/PlatformIO/src/ESP_Panel_Board_Custom.h | 5 ++++- .../PlatformIO/src/ESP_Panel_Board_Supported.h | 7 +++++-- examples/PlatformIO/src/ESP_Panel_Conf.h | 4 ++-- .../v8/Porting/ESP_Panel_Board_Custom.h | 5 ++++- .../v8/Porting/ESP_Panel_Board_Supported.h | 7 +++++-- examples/SquareLine/v8/Porting/ESP_Panel_Conf.h | 4 ++-- .../v8/WiFiClock/ESP_Panel_Board_Custom.h | 5 ++++- .../v8/WiFiClock/ESP_Panel_Board_Supported.h | 7 +++++-- .../SquareLine/v8/WiFiClock/ESP_Panel_Conf.h | 4 ++-- examples/Touch/I2C/ESP_Panel_Conf.h | 4 ++-- examples/Touch/SPI/ESP_Panel_Conf.h | 4 ++-- src/ESP_PanelVersions.h | 16 ++++++++-------- 28 files changed, 97 insertions(+), 55 deletions(-) diff --git a/ESP_Panel_Board_Custom.h b/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/ESP_Panel_Board_Custom.h +++ b/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/ESP_Panel_Board_Supported.h b/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/ESP_Panel_Board_Supported.h +++ b/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/ESP_Panel_Conf.h b/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/ESP_Panel_Conf.h +++ b/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h b/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h +++ b/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LCD/QSPI/ESP_Panel_Conf.h b/examples/LCD/QSPI/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LCD/QSPI/ESP_Panel_Conf.h +++ b/examples/LCD/QSPI/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LCD/RGB/ESP_Panel_Conf.h b/examples/LCD/RGB/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LCD/RGB/ESP_Panel_Conf.h +++ b/examples/LCD/RGB/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LCD/SPI/ESP_Panel_Conf.h b/examples/LCD/SPI/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LCD/SPI/ESP_Panel_Conf.h +++ b/examples/LCD/SPI/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h +++ b/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h b/examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h +++ b/examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Conf.h b/examples/LVGL/v8/Porting/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LVGL/v8/Porting/ESP_Panel_Conf.h +++ b/examples/LVGL/v8/Porting/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h +++ b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h +++ b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h b/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h +++ b/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h b/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h +++ b/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/Panel/PanelTest/ESP_Panel_Board_Supported.h b/examples/Panel/PanelTest/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/Panel/PanelTest/ESP_Panel_Board_Supported.h +++ b/examples/Panel/PanelTest/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/Panel/PanelTest/ESP_Panel_Conf.h b/examples/Panel/PanelTest/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/Panel/PanelTest/ESP_Panel_Conf.h +++ b/examples/Panel/PanelTest/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/PlatformIO/src/ESP_Panel_Board_Custom.h b/examples/PlatformIO/src/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/PlatformIO/src/ESP_Panel_Board_Custom.h +++ b/examples/PlatformIO/src/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/PlatformIO/src/ESP_Panel_Board_Supported.h b/examples/PlatformIO/src/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/PlatformIO/src/ESP_Panel_Board_Supported.h +++ b/examples/PlatformIO/src/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/PlatformIO/src/ESP_Panel_Conf.h b/examples/PlatformIO/src/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/PlatformIO/src/ESP_Panel_Conf.h +++ b/examples/PlatformIO/src/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h +++ b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h +++ b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h b/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h +++ b/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h index 93d34b61..5ed0f923 100644 --- a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h +++ b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h @@ -363,6 +363,9 @@ // #define ESP_PANEL_BEGIN_BACKLIGHT_END_FUNCTION( panel ) // #define ESP_PANEL_BEGIN_END_FUNCTION( panel ) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: @@ -376,7 +379,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 2 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Supported.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Supported.h index 58d065c3..a1b8821c 100644 --- a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Supported.h +++ b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Supported.h @@ -83,6 +83,9 @@ */ // #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// File Version /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with * the current version of `ESP_Panel_Board_Supported.h` in the library. The detailed rules are as follows: @@ -95,7 +98,7 @@ * */ #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h +++ b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/Touch/I2C/ESP_Panel_Conf.h b/examples/Touch/I2C/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/Touch/I2C/ESP_Panel_Conf.h +++ b/examples/Touch/I2C/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/examples/Touch/SPI/ESP_Panel_Conf.h b/examples/Touch/SPI/ESP_Panel_Conf.h index e90f8ccd..d860e8e1 100644 --- a/examples/Touch/SPI/ESP_Panel_Conf.h +++ b/examples/Touch/SPI/ESP_Panel_Conf.h @@ -63,7 +63,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** * Do not change the following versions, they are used to check if the configurations in this file are compatible with - * the current version of `ESP_Panel_Board_Custom.h` in the library. The detailed rules are as follows: + * the current version of `ESP_Panel_Conf.h` in the library. The detailed rules are as follows: * * 1. If the major version is not consistent, then the configurations in this file are incompatible with the library * and must be replaced with the file from the library. @@ -74,4 +74,4 @@ */ #define ESP_PANEL_CONF_FILE_VERSION_MAJOR 0 #define ESP_PANEL_CONF_FILE_VERSION_MINOR 1 -#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 2 diff --git a/src/ESP_PanelVersions.h b/src/ESP_PanelVersions.h index e0b3ffff..d9ee68b6 100644 --- a/src/ESP_PanelVersions.h +++ b/src/ESP_PanelVersions.h @@ -16,17 +16,17 @@ /* File `ESP_Panel_Conf.h` */ #define ESP_PANEL_CONF_VERSION_MAJOR 0 #define ESP_PANEL_CONF_VERSION_MINOR 1 -#define ESP_PANEL_CONF_VERSION_PATCH 1 +#define ESP_PANEL_CONF_VERSION_PATCH 2 /* File `ESP_Panel_Board_Custom.h` */ #define ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 2 /* File `ESP_Panel_Board_Supported.h` */ #define ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR 2 -#define ESP_PANEL_BOARD_SUPPORTED_VERSION_PATCH 1 +#define ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR 3 +#define ESP_PANEL_BOARD_SUPPORTED_VERSION_PATCH 0 /* Check if the current configuration file version is compatible with the library version */ // File `ESP_Panel_Conf.h` @@ -43,7 +43,7 @@ #error "The file `ESP_Panel_Conf.h` version is not compatible. Please update it with the file from the library" #elif ESP_PANEL_CONF_FILE_VERSION_MINOR < ESP_PANEL_CONF_VERSION_MINOR #warning "The file `ESP_Panel_Conf.h` version is outdated. Some new configurations are missing" -#elif ESP_PANEL_CONF_FILE_VERSION_MINOR > ESP_PANEL_CONF_VERSION_MINOR +#elif ESP_PANEL_CONF_FILE_VERSION_PATCH > ESP_PANEL_VERSION_PATCH #warning "The file `ESP_Panel_Conf.h` version is newer than the library. Some new configurations are not supported" #endif /* ESP_PANEL_CONF_INCLUDE_INSIDE */ @@ -56,7 +56,7 @@ !defined(ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR) && \ !defined(ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH) #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0 -#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2 +#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 1 #define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0 #endif // Check if the current configuration file version is compatible with the library version @@ -64,7 +64,7 @@ #error "The file `ESP_Panel_Board_Supported.h` version is not compatible. Please update it with the file from the library" #elif ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR < ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR #warning "The file `ESP_Panel_Board_Supported.h` version is outdated. Some new configurations are missing" -#elif ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR > ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR +#elif ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH > ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR #warning "The file `ESP_Panel_Board_Supported.h` version is newer than the library. Some new configurations are not supported" #endif @@ -83,7 +83,7 @@ #error "The file `ESP_Panel_Board_Custom.h` version is not compatible. Please update it with the file from the library" #elif ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR < ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR #warning "The file `ESP_Panel_Board_Custom.h` version is outdated. Some new configurations are missing" -#elif ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR > ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR +#elif ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH > ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH #warning "The file `ESP_Panel_Board_Custom.h` version is newer than the library. Some new configurations are not supported" #endif #endif /* CONFIG_ESP_PANEL_USE_SUPPORTED_BOARD || ESP_PANEL_USE_SUPPORTED_BOARD */