Merge branch 'bugfix/fix_version_check' into 'master'

fix(version): fix minor number check

Closes #149

See merge request ae_group/ESP32_Display_Panel!8

Author: Lzw655

CHANGELOG.md

@@ -1,5 +1,16 @@
 # ChangeLog
 
+## v0.2.3 - 2025-01-09
+
+### Enhancements:
+
+* feat(examples): update PlatformIO build_flags
+
+### Bugfixes:
+
+* fix(touch): fix GT911 build warning
+* fix(version): fix minor number check @arduinomnomnom (#148)
+
 ## v0.2.2 - 2025-01-09
 
 ### Bugfixes:

examples/PlatformIO/platformio.ini

@@ -8,12 +8,16 @@ platform_packages =
 upload_speed = 921600
 monitor_speed = 115200
 build_flags =
-        -DBOARD_HAS_PSRAM
+; Arduino related:
+        -DBOARD_HAS_PSRAM               ; Enable PSRAM
+; -DARDUINO_USB_CDC_ON_BOOT=0     ; If using UART port
+        -DARDUINO_USB_CDC_ON_BOOT=1     ; If using USB port
+        -DCORE_DEBUG_LEVEL=1            ; Set to `5` for full debug output, `0` for none
+; LVGL related:
         -DLV_CONF_INCLUDE_SIMPLE
-        -DDISABLE_ALL_LIBRARY_WARNINGS
-        -DARDUINO_USB_CDC_ON_BOOT=1
-        -DCORE_DEBUG_LEVEL=1
         -DLV_LVGL_H_INCLUDE_SIMPLE
+; Others:
+        ; -DDISABLE_ALL_LIBRARY_WARNINGS  ; Disable all library warnings
         -I src
 lib_deps =
         https://github.com/esp-arduino-libs/ESP32_Display_Panel.git

idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.2.2"
+version: "0.2.3"
 description: ESP32_Display_Panel is a library designed for ESP SoCs to drive display panels and facilitate rapid GUI development.
 url: https://github.com/esp-arduino-libs/ESP32_Display_Panel
 repository: https://github.com/esp-arduino-libs/ESP32_Display_Panel.git

library.properties

@@ -1,5 +1,5 @@
 name=ESP32_Display_Panel
-version=0.2.2
+version=0.2.3
 author=espressif
 maintainer=espressif
 sentence=ESP32_Display_Panel is a library designed for ESP SoCs to drive display panels and facilitate rapid GUI development.

src/ESP_PanelVersions.h

@@ -11,7 +11,7 @@
 /* Library Version */
 #define ESP_PANEL_VERSION_MAJOR 0
 #define ESP_PANEL_VERSION_MINOR 2
-#define ESP_PANEL_VERSION_PATCH 2
+#define ESP_PANEL_VERSION_PATCH 3
 
 /* File `ESP_Panel_Conf.h` */
 #define ESP_PANEL_CONF_VERSION_MAJOR 0
@@ -49,7 +49,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_PATCH > ESP_PANEL_VERSION_PATCH
+    #elif ESP_PANEL_CONF_FILE_VERSION_MINOR > ESP_PANEL_CONF_VERSION_MINOR
         #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 */
 #endif /* ESP_PANEL_CONF_FILE_SKIP */
@@ -91,11 +91,11 @@
     #if ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR != ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR
         #error "The file `ESP_Panel_Board_Custom.h` version is not compatible. Please update it with the file from the library"
     #endif
-    // Only check the other versions if not skip the file
-    #if !defined(ESP_PANEL_BOARD_FILE_SKIP)
+    // Only check the other versions if not skip the file and not use the supported board
+    #if !defined(ESP_PANEL_BOARD_FILE_SKIP) && !ESP_PANEL_USE_SUPPORTED_BOARD
         #if 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_PATCH
+        #elif ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR > ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR
             #warning "The file `ESP_Panel_Board_Custom.h` version is newer than the library. Some new configurations are not supported"
         #endif
     #endif

src/touch/GT911.cpp

@@ -43,7 +43,7 @@ bool ESP_PanelTouch_GT911::begin(void)
 
     ESP_PanelBus_I2C *i2c_bus = static_cast<ESP_PanelBus_I2C *>(bus);
     esp_lcd_touch_io_gt911_config_t tp_gt911_config = {
-        .dev_addr = i2c_bus->getI2cAddress(),
+        .dev_addr = static_cast<uint8_t>(i2c_bus->getI2cAddress()),
     };
     if (config.driver_data == NULL) {
         ESP_LOGD(TAG, "Use default GT911 driver data(address: 0x%02x)", tp_gt911_config.dev_addr);