From f68290bef87688b5c306e76d4c130b9330016385 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:55:00 +0800 Subject: [PATCH] Update CMakeLists.txt to revert default value Update scripts to take new line in account when doing setting --- .github/ci/ESP32S3_8048S070C.sh | 4 ++-- .github/ci/ESP32S3_FREENOVE.sh | 4 ++-- .github/ci/ESP32S3_HMI43V3.sh | 4 ++-- .github/ci/ESP32_2432S028R.sh | 4 ++-- .github/ci/ESP32_ROTRICS_DEXARM35.sh | 4 ++-- .github/ci/ZX3D50CE02S-SRC-4832.sh | 4 ++-- CMakeLists.txt | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/ci/ESP32S3_8048S070C.sh b/.github/ci/ESP32S3_8048S070C.sh index 99d6e2ad..74bcd661 100644 --- a/.github/ci/ESP32S3_8048S070C.sh +++ b/.github/ci/ESP32S3_8048S070C.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" ON/g' ./CMakeLists.txt idf.py fullclean head ./CMakeLists.txt -n 9 idf.py -DIDF_TARGET=esp32s3 reconfigure diff --git a/.github/ci/ESP32S3_FREENOVE.sh b/.github/ci/ESP32S3_FREENOVE.sh index 41d98eaa..146457d2 100644 --- a/.github/ci/ESP32S3_FREENOVE.sh +++ b/.github/ci/ESP32S3_FREENOVE.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" OFF/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" OFF/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" ON/g' ./CMakeLists.txt sed -i 's/OPTION(CAMERA_SERVICE "Camera service" OFF/OPTION(CAMERA_SERVICE "Camera service" ON/g' ./CMakeLists.txt sed -i 's/OPTION(TFT_UI_SERVICE "TFT UI service" ON/OPTION(TFT_UI_SERVICE "TFT UI service" OFF/g' ./CMakeLists.txt idf.py fullclean diff --git a/.github/ci/ESP32S3_HMI43V3.sh b/.github/ci/ESP32S3_HMI43V3.sh index 86bc6f67..24552e6c 100644 --- a/.github/ci/ESP32S3_HMI43V3.sh +++ b/.github/ci/ESP32S3_HMI43V3.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON/g' ./CMakeLists.txt idf.py fullclean head ./CMakeLists.txt -n 9 idf.py -DIDF_TARGET=esp32s3 reconfigure diff --git a/.github/ci/ESP32_2432S028R.sh b/.github/ci/ESP32_2432S028R.sh index 8fafbada..f61b0f60 100644 --- a/.github/ci/ESP32_2432S028R.sh +++ b/.github/ci/ESP32_2432S028R.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" OFF/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" OFF/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" ON/g' ./CMakeLists.txt idf.py fullclean head ./CMakeLists.txt -n 9 idf.py -DIDF_TARGET=esp32 reconfigure diff --git a/.github/ci/ESP32_ROTRICS_DEXARM35.sh b/.github/ci/ESP32_ROTRICS_DEXARM35.sh index 3196a620..f079e3fa 100644 --- a/.github/ci/ESP32_ROTRICS_DEXARM35.sh +++ b/.github/ci/ESP32_ROTRICS_DEXARM35.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" OFF/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" OFF/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" ON/g' ./CMakeLists.txt idf.py fullclean head ./CMakeLists.txt -n 9 idf.py -DIDF_TARGET=esp32 reconfigure diff --git a/.github/ci/ZX3D50CE02S-SRC-4832.sh b/.github/ci/ZX3D50CE02S-SRC-4832.sh index 1eb3699b..18d891b2 100644 --- a/.github/ci/ZX3D50CE02S-SRC-4832.sh +++ b/.github/ci/ZX3D50CE02S-SRC-4832.sh @@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf source ./export.sh cd $GITHUB_WORKSPACE idf.py fullclean -sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt -sed -i '1,32s/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" ON/g' ./CMakeLists.txt +sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt +sed -i '1,36s/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" ON/g' ./CMakeLists.txt idf.py fullclean head ./CMakeLists.txt -n 9 idf.py -DIDF_TARGET=esp32s3 reconfigure diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cb9c58d..d49ef25d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,10 @@ # ####################################### # With TFT: -OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF) +OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON) OPTION(ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF) OPTION(ESP32S3_BZM_TFT35_GT911 "TFT TARGET is ESP32S3 Panlee BZM 3.5inches" OFF) -OPTION (ESP32S3_8048_TOUCH_LCD_7 "TFT TARGET is ESP32S3 - 7.0in. 800x480 (Capacitive)" ON) +OPTION (ESP32S3_8048_TOUCH_LCD_7 "TFT TARGET is ESP32S3 - 7.0in. 800x480 (Capacitive)" OFF) OPTION(ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF) OPTION(ESP32S3_8048S050C "TFT TARGET is ESP32S3_8048S050C - 5.0in. 800x480 (Capacitive)" OFF) OPTION(ESP32S3_8048S043C "TFT TARGET is ESP32S3_8048S043C - 4.3in. 800x480 (Capacitive)" OFF) @@ -62,7 +62,7 @@ OPTION(WEBDAV_SERVICES "WebDav Services" ON) OPTION(TELNET_SERVICE "Telnet service" ON) OPTION(WS_SERVICE "WebSocket data service" ON) OPTION(TFT_UI_SERVICE "TFT UI service" ON) -OPTION(SD_CARD_SERVICE "SD card service" OFF) +OPTION(SD_CARD_SERVICE "SD card service" ON) OPTION(NOTIFICATIONS_SERVICE "Notifications service" ON) OPTION(UPDATE_SERVICE "Update service" ON) OPTION(USB_SERIAL_SERVICE "Use USB Serial if Available" OFF)