diff --git a/.github/scripts/check_versions.sh b/.github/scripts/check_lib_versions.sh similarity index 100% rename from .github/scripts/check_versions.sh rename to .github/scripts/check_lib_versions.sh diff --git a/.github/workflows/check_versions.yml b/.github/workflows/check_lib_versions.yml similarity index 88% rename from .github/workflows/check_versions.yml rename to .github/workflows/check_lib_versions.yml index eb2d1168..a70f5403 100644 --- a/.github/workflows/check_versions.yml +++ b/.github/workflows/check_lib_versions.yml @@ -1,4 +1,4 @@ -name: Check Versions +name: Check Library Versions on: pull_request: @@ -26,5 +26,5 @@ jobs: echo "prerelease: ${{ steps.last_release.outputs.prerelease }}" echo "url: ${{ steps.last_release.outputs.url }}" - name: Check & Compare versions - run: bash ./.github/scripts/check_versions.sh ${{ steps.last_release.outputs.tag_name }} + run: bash ./.github/scripts/check_lib_versions.sh ${{ steps.last_release.outputs.tag_name }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 61a876c2..c0bfffa1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,6 +39,14 @@ repos: hooks: - id: sync-conf-files name: Update when configuration files change - entry: python .github/ci/sync_conf_files.py ./ + entry: python tools/sync_conf_files.py ./ language: system files: '.*ESP_Panel_(Board_Custom|Board_Supported|Conf)\.h' + + - repo: local + hooks: + - id: check-file-versions + name: Update when versions change + entry: python tools/check_file_version.py ./ + language: system + files: '(.*ESP_Panel_(Board_Custom|Board_Supported|Conf)\.h|library.properties|.*ESP_PanelVersions.h)' diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e3bfe6..354bf6b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # ChangeLog -## v0.1.2 - 2024-05-27 +## v0.1.2 - 2024-06-01 ### Enhancements: * feat(config): add version control for all configuration files by @lzw655 (#32) +* feat(touch): add i2c st1633 by @lzw655 (#22) +* feat(pre-commit): support to check file versions ### Bugfixes: diff --git a/ESP_Panel_Board_Custom.h b/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/ESP_Panel_Board_Custom.h +++ b/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/ESP_Panel_Conf.h b/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/ESP_Panel_Conf.h +++ b/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h b/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h +++ b/examples/LCD/3wireSPI_RGB/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LCD/QSPI/ESP_Panel_Conf.h b/examples/LCD/QSPI/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LCD/QSPI/ESP_Panel_Conf.h +++ b/examples/LCD/QSPI/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LCD/RGB/ESP_Panel_Conf.h b/examples/LCD/RGB/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LCD/RGB/ESP_Panel_Conf.h +++ b/examples/LCD/RGB/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LCD/SPI/ESP_Panel_Conf.h b/examples/LCD/SPI/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LCD/SPI/ESP_Panel_Conf.h +++ b/examples/LCD/SPI/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h +++ b/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Conf.h b/examples/LVGL/v8/Porting/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LVGL/v8/Porting/ESP_Panel_Conf.h +++ b/examples/LVGL/v8/Porting/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h +++ b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h b/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h +++ b/examples/LVGL/v8/Rotation/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h b/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h +++ b/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/Panel/PanelTest/ESP_Panel_Conf.h b/examples/Panel/PanelTest/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/Panel/PanelTest/ESP_Panel_Conf.h +++ b/examples/Panel/PanelTest/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h +++ b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h b/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h +++ b/examples/SquareLine/v8/Porting/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h index 9916371a..dfa8f855 100644 --- a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h +++ b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h @@ -362,7 +362,7 @@ */ #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 1 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */ diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h +++ b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/Touch/I2C/ESP_Panel_Conf.h b/examples/Touch/I2C/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/Touch/I2C/ESP_Panel_Conf.h +++ b/examples/Touch/I2C/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/examples/Touch/SPI/ESP_Panel_Conf.h b/examples/Touch/SPI/ESP_Panel_Conf.h index 07e7d69c..e90f8ccd 100644 --- a/examples/Touch/SPI/ESP_Panel_Conf.h +++ b/examples/Touch/SPI/ESP_Panel_Conf.h @@ -6,28 +6,27 @@ #pragma once -/** - * Debug configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////// Debug Configurations ///////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Set to 1 if assert on error. Otherwise print error message */ #define ESP_PANEL_CHECK_RESULT_ASSERT (0) // 0/1 /* Set to 1 if print log message for debug */ #define ESP_PANEL_ENABLE_LOG (0) // 0/1 -/** - * Touch driver configurations - * - */ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////// Touch Driver Configurations ////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /* Maximum point number */ #define ESP_PANEL_TOUCH_MAX_POINTS (5) - /* Maximum button number */ #define ESP_PANEL_TOUCH_MAX_BUTTONS (1) -/* Model configurations */ -// XPT2046 +/** + * XPT2046 related + * + */ #define ESP_PANEL_TOUCH_XPT2046_Z_THRESHOLD (400) // Minimum Z pressure threshold /** * Enable Interrupt (PENIRQ) output, also called Full Power Mode. @@ -59,6 +58,9 @@ */ #define ESP_PANEL_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////// 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: @@ -72,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 0 +#define ESP_PANEL_CONF_FILE_VERSION_PATCH 1 diff --git a/src/ESP_PanelVersions.h b/src/ESP_PanelVersions.h index a5108cf2..b2b0844f 100644 --- a/src/ESP_PanelVersions.h +++ b/src/ESP_PanelVersions.h @@ -16,12 +16,12 @@ /* 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 0 +#define ESP_PANEL_CONF_VERSION_PATCH 1 /* File `ESP_Panel_Board_Custom.h` */ #define ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR 0 #define ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR 1 -#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 0 +#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 1 /* File `ESP_Panel_Board_Supported.h` */ #define ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR 0 @@ -42,7 +42,9 @@ #if ESP_PANEL_CONF_FILE_VERSION_MAJOR != ESP_PANEL_CONF_VERSION_MAJOR #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 might be missing" +#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 +#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 */ // File `ESP_Panel_Board_Custom.h` & `ESP_Panel_Board_Supported.h` @@ -61,7 +63,9 @@ #if ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR != ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR #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 might be missing" +#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 +#warning "The file `ESP_Panel_Board_Supported.h` version is newer than the library. Some new configurations are not supported" #endif #else /* For using a custom board */ @@ -78,7 +82,9 @@ #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" #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 might be missing" +#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 +#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 */ #endif /* ESP_PANEL_USE_BOARD */ diff --git a/src/touch/README.md b/src/touch/README.md index ed006b9c..b0827937 100644 --- a/src/touch/README.md +++ b/src/touch/README.md @@ -7,6 +7,7 @@ | [FT5x06](https://components.espressif.com/components/espressif/esp_lcd_touch_ft5x06) | 1.0.6 | | [GT911](https://components.espressif.com/components/espressif/esp_lcd_touch_gt911) | 1.1.0 | | [GT1151](https://components.espressif.com/components/espressif/esp_lcd_touch_gt1151) | 1.0.5~1 | +| ST1633 | 0.1.0 | | [ST7123](https://components.espressif.com/components/espressif/esp_lcd_touch_st7123) | 0.0.1 | | [TT21100](https://components.espressif.com/components/espressif/esp_lcd_touch_tt21100) | 1.1.0 | | [XPT2046](https://components.espressif.com/components/atanisoft/esp_lcd_touch_xpt2046) | 1.0.4 | diff --git a/tools/check_file_version.py b/tools/check_file_version.py new file mode 100644 index 00000000..9f0cb223 --- /dev/null +++ b/tools/check_file_version.py @@ -0,0 +1,157 @@ +# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: Apache-2.0 + +import os +import sys +import re + +internal_version_file = "src/ESP_PanelVersions.h" +internal_version_macross = [ + { + "file": "library.properties", + "macro": { + "major": "ESP_PANEL_VERSION_MAJOR", + "minor": "ESP_PANEL_VERSION_MINOR", + "patch": "ESP_PANEL_VERSION_PATCH" + }, + }, + { + "file": "ESP_Panel_Conf.h", + "macro": { + "major": "ESP_PANEL_CONF_VERSION_MAJOR", + "minor": "ESP_PANEL_CONF_VERSION_MINOR", + "patch": "ESP_PANEL_CONF_VERSION_PATCH" + }, + }, + { + "file": "ESP_Panel_Board_Custom.h", + "macro": { + "major": "ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR", + "minor": "ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR", + "patch": "ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH" + }, + }, + { + "file": "ESP_Panel_Board_Supported.h", + "macro": { + "major": "ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR", + "minor": "ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR", + "patch": "ESP_PANEL_BOARD_SUPPORTED_VERSION_PATCH" + }, + }, +] +file_version_macros = [ + { + "file": "ESP_Panel_Conf.h", + "macro": { + "major": "ESP_PANEL_CONF_FILE_VERSION_MAJOR", + "minor": "ESP_PANEL_CONF_FILE_VERSION_MINOR", + "patch": "ESP_PANEL_CONF_FILE_VERSION_PATCH" + }, + }, + { + "file": "ESP_Panel_Board_Custom.h", + "macro": { + "major": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR", + "minor": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR", + "patch": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH" + }, + }, + { + "file": "ESP_Panel_Board_Supported.h", + "macro": { + "major": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR", + "minor": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR", + "patch": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH" + }, + }, +] +arduino_version_file = "library.properties" + + +def extract_file_version(file_path, version_dict): + file_contents = [] + content_str = "" + with open(file_path, 'r') as file: + file_contents.append(file.readlines()) + for content in file_contents: + content_str = ''.join(content) + + version_macro = version_dict['macro'] + major_version = re.search(r'#define ' + version_macro["major"] + r' (\d+)', content_str) + minor_version = re.search(r'#define ' + version_macro["minor"] + r' (\d+)', content_str) + patch_version = re.search(r'#define ' + version_macro["patch"] + r' (\d+)', content_str) + + if major_version and minor_version and patch_version: + return {"file": version_dict['file'], "version": major_version.group(1) + '.' + minor_version.group(1) + '.' + patch_version.group(1)} + + return None + + +def extract_arduino_version(file_path): + file_contents = [] + content_str = "" + with open(file_path, 'r') as file: + file_contents.append(file.readlines()) + for content in file_contents: + content_str = ''.join(content) + + version = re.search(r'version=(\d+\.\d+\.\d+)', content_str) + + if version: + return {"file": os.path.basename(file_path), "version": version.group(1)} + + return None + + +if __name__ == "__main__": + if len(sys.argv) >= 3: + search_directory = sys.argv[1] + + # Extract internal versions + internal_version_path = os.path.join(search_directory, internal_version_file) + internal_versions = [] + print(f"Internal version extracted from '{internal_version_path}") + for internal_version_macros in internal_version_macross: + version = extract_file_version(internal_version_path, internal_version_macros) + if version: + print(f"Internal version: '{internal_version_macros['file']}': {version}") + internal_versions.append(version) + else: + print(f"'{internal_version_macros['file']}' version not found") + sys.exit(1) + + # Check file versions + for i in range(2, len(sys.argv)): + file_path = sys.argv[i] + + if file_path in internal_version_file: + print(f"Skipping '{file_path}'") + continue + + src_file = os.path.join(search_directory, os.path.basename(file_path)) + for file_version in file_version_macros: + versions = extract_file_version(src_file, file_version) + if versions: + print(f"File version extracted from '{src_file}': {versions}") + for internal_version in internal_versions: + if (internal_version['file'] == versions['file']) and (internal_version['version'] != versions['version']): + print(f"Version mismatch: '{internal_version['file']}'") + sys.exit(1) + print(f"Version matched") + + # Extract arduino version + arduino_version_path = os.path.join(search_directory, arduino_version_file) + arduino_version = extract_arduino_version(arduino_version_path) + print(f"Arduino version extracted from '{arduino_version_path}") + if arduino_version: + print(f"Arduino version: {arduino_version}") + else: + print(f"Arduino version not found") + + # Check arduino version + for internal_version in internal_versions: + if (internal_version['file'] == arduino_version_file) and (internal_version['version'] != arduino_version['version']): + print(f"Arduino version mismatch: '{internal_version['file']}'") + sys.exit(1) + print(f"Arduino Version matched") diff --git a/.github/ci/sync_conf_files.py b/tools/sync_conf_files.py similarity index 99% rename from .github/ci/sync_conf_files.py rename to tools/sync_conf_files.py index 657ed4b6..503c1da9 100644 --- a/.github/ci/sync_conf_files.py +++ b/tools/sync_conf_files.py @@ -5,7 +5,6 @@ import sys import shutil - exclude_dirs = ["./build"]