From f736ea288d3745556dbbcff13a660bee0a4aa210 Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Wed, 3 May 2023 21:25:42 +0900 Subject: [PATCH 1/6] Change github action for making release --- .github/workflows/push.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 261214628..097e429b4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,10 +1,11 @@ name: ESP32 Arduino Libs CI on: - push: - branches: - - master - pull_request: + workflow_dispatch: # Manually start a workflow + # push: + # branches: + # - master + # pull_request: concurrency: group: esp-idf-libs-${{github.event.pull_request.number || github.ref}} @@ -20,13 +21,20 @@ jobs: target: [esp32] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: bash ./tools/prepare-ci.sh - name: Build Libs for ${{ matrix.target }} run: bash ./build.sh -t ${{ matrix.target }} - - name: Upload archive - uses: actions/upload-artifact@v1 + - name: Release + uses: jason2866/action-gh-release@v1.2 with: - name: artifacts-${{ matrix.target }} - path: dist + tag_name: ${{ github.run_number }} + body_path: release-info.txt + prerelease: true + files: | + dist/framework* + release-info.txt + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From fb949e112592dcda9ddf3f7d5e9f6121e972b9da Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Wed, 3 May 2023 21:59:07 +0900 Subject: [PATCH 2/6] Output release-info.txt for tools/config.sh --- tools/config.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/config.sh b/tools/config.sh index e3f739800..a2698e4a3 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -46,6 +46,17 @@ AR_PLATFORM_TXT="$AR_OUT/platform.txt" AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py" AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET" +if [ "$IDF_COMMIT" ]; then + echo "Using specific commit $IDF_COMMIT for IDF" +else + IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "") +fi + +AR_COMMIT=$(git -C "$AR_COMPS/arduino" rev-parse --short HEAD || echo "") + +rm -rf release-info.txt +echo "Framework built from Tasmota IDF branch $IDF_BRANCH commit $IDF_COMMIT and $AR_REPO commit $AR_COMMIT" >> release-info.txt + function get_os(){ OSBITS=`arch` if [[ "$OSTYPE" == "linux"* ]]; then From b007d3e30bb3c94b44c0608b1bf282855d76840b Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Wed, 3 May 2023 22:13:11 +0900 Subject: [PATCH 3/6] Remove cron and repository_dispatch github actions --- .github/workflows/cron.yml | 39 ----------------------- .github/workflows/repository_dispatch.yml | 23 ------------- .gitignore | 2 ++ 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/cron.yml delete mode 100644 .github/workflows/repository_dispatch.yml diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml deleted file mode 100644 index 49afcdc29..000000000 --- a/.github/workflows/cron.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Cron Build - -on: - schedule: -# ┌───────────── minute (0 - 59) -# │ ┌───────────── hour (0 - 23) -# │ │ ┌───────────── day of the month (1 - 31) -# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) -# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) -# │ │ │ │ │ -# │ │ │ │ │ -# │ │ │ │ │ -# * * * * * - - cron: '0 */6 * * *' - -jobs: - run: - name: Build with IDF ${{ matrix.idf_branch }} - runs-on: ubuntu-latest - - strategy: - matrix: - idf_branch: [release/v5.1, release/v4.4] #, release/v3.3] - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - run: bash ./tools/prepare-ci.sh - - name: Build - env: - GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }} - GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }} - GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }} - IDF_BRANCH: ${{ matrix.idf_branch }} - run: bash ./tools/cron.sh - - name: Upload archive - uses: actions/upload-artifact@v1 - with: - name: artifacts - path: dist diff --git a/.github/workflows/repository_dispatch.yml b/.github/workflows/repository_dispatch.yml deleted file mode 100644 index 016b84831..000000000 --- a/.github/workflows/repository_dispatch.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Remote Trigger - -on: repository_dispatch - -jobs: - run: - name: Dispatch Event - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - run: bash ./tools/prepare-ci.sh - - name: Handle Event - env: - GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }} - GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }} - GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }} - run: bash ./tools/repository_dispatch.sh - - name: Upload archive - uses: actions/upload-artifact@v1 - with: - name: artifacts - path: dist diff --git a/.gitignore b/.gitignore index 4cd4f7804..65edb3f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +release-info.txt + .DS_Store .vscode managed_components/ From 6ff6a83143d0ed06ff3057ffb6575ca904873b53 Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Thu, 4 May 2023 03:29:34 +0900 Subject: [PATCH 4/6] Customize sdkconfig to disable Classic BT and enable BLTE --- build.sh | 4 ++++ configs/defconfig.common | 17 ++++++++++++++++- configs/defconfig.esp32 | 35 ++++++++++++++++++++++++++--------- 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 7e4b1c190..f4d544386 100755 --- a/build.sh +++ b/build.sh @@ -192,18 +192,22 @@ if [ "$BUILD_TYPE" = "all" ]; then python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/" if [ $? -ne 0 ]; then exit 1; fi fi +echo "Done update package_esp32_index.template.json" # archive the build if [ "$BUILD_TYPE" = "all" ]; then ./tools/archive-build.sh if [ $? -ne 0 ]; then exit 1; fi fi +echo "Done archive the build" # copy everything to arduino-esp32 installation if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then ./tools/copy-to-arduino.sh fi +echo "Done copy everything to arduino-esp32 installation" if [ $DEPLOY_OUT -eq 1 ]; then ./tools/push-to-arduino.sh fi +echo "Done tools/push-to-arduino.sh" diff --git a/configs/defconfig.common b/configs/defconfig.common index cbcfd8d2c..051a01bbc 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -6,7 +6,8 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_BT_ENABLED=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y -CONFIG_BLE_MESH=y +#CONFIG_BLE_MESH=y +CONFIG_BLE_MESH=n CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_CXX_EXCEPTIONS=y CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y @@ -92,3 +93,17 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=1024 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y + +CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2048 +#CONFIG_BT_BLUEDROID_ENABLED=n +CONFIG_BT_BLUEDROID_ENABLED=y +#CONFIG_BT_NIMBLE_ENABLED=y +#CONFIG_BT_CLASSIC_ENABLED=y +CONFIG_BT_CLASSIC_ENABLED=n +CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y +CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 +CONFIG_BT_BLE_ENABLED=y +CONFIG_BT_GATTS_ENABLE=y +CONFIG_BT_GATTC_ENABLE=y +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index c3637436e..022540845 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -2,10 +2,13 @@ CONFIG_BTDM_CTRL_MODE_BTDM=y CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20 CONFIG_BT_BTC_TASK_STACK_SIZE=8192 CONFIG_BT_BTU_TASK_STACK_SIZE=8192 -CONFIG_BT_CLASSIC_ENABLED=y -CONFIG_BT_A2DP_ENABLE=y -CONFIG_BT_SPP_ENABLED=y -CONFIG_BT_HFP_ENABLE=y +#CONFIG_BT_CLASSIC_ENABLED=y +#CONFIG_BT_A2DP_ENABLE=y +CONFIG_BT_A2DP_ENABLE=n +#CONFIG_BT_SPP_ENABLED=y +CONFIG_BT_SPP_ENABLED=n +#CONFIG_BT_HFP_ENABLE=y +CONFIG_BT_HFP_ENABLE=n CONFIG_BT_STACK_NO_LOG=y CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y CONFIG_ESP32_SPIRAM_SUPPORT=y @@ -22,8 +25,22 @@ CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y -# Enable dynamic buffer for mbedTLS -CONFIG_MBEDTLS_DYNAMIC_BUFFER=y -CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y -CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y - +## Enable dynamic buffer for mbedTLS +#CONFIG_MBEDTLS_DYNAMIC_BUFFER=y +#CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y +#CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y +# +#CONFIG_BT_BLUEDROID_ENABLED=n +#CONFIG_BT_NIMBLE_ENABLED=y +#CONFIG_BT_CLASSIC_ENABLED=n +##CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +##CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY= +##CONFIG_BTDM_CTRL_MODE_BTDM= +# +## CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 +#CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=6384 +# +## Enable TLS asymmetric in/out content length +#CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y +#CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 +# From 5ec8ae2759146001837a49421c01db401e5fa78a Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Thu, 4 May 2023 04:40:39 +0900 Subject: [PATCH 5/6] Add CONFIG_ESP32_ALLOW_RTC_FAST_MEM_AS_HEAP=y --- configs/defconfig.common | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configs/defconfig.common b/configs/defconfig.common index 051a01bbc..e67ce1266 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -107,3 +107,23 @@ CONFIG_BT_GATTS_ENABLE=y CONFIG_BT_GATTC_ENABLE=y CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_ESP32_ALLOW_RTC_FAST_MEM_AS_HEAP=y + +#CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 +#CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 +#CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8 +#CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED= +#CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=16 +#CONFIG_LWIP_TCP_SND_BUF_DEFAULT=6144 +#CONFIG_LWIP_TCP_WND_DEFAULT=6144 +#CONFIG_LWIP_TCP_RECVMBOX_SIZE=8 +#CONFIG_LWIP_UDP_RECVMBOX_SIZE=8 +#CONFIG_ESP32_WIFI_IRAM_OPT=y +#CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +#CONFIG_LWIP_IRAM_OPTIMIZATION=y + +#CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=1024 + +#CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y +#CONFIG_MBEDTLS_IRAM_8BIT_MEM_ALLOC=y + From 65dc11882180956f21e0f4ade049ab4da1dc632e Mon Sep 17 00:00:00 2001 From: Hideyuki Takei Date: Thu, 4 May 2023 17:58:56 +0900 Subject: [PATCH 6/6] Tried NimBLE but the remaining RAM is less than Bluedroid, so disable NimBLE --- configs/defconfig.common | 45 +++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index e67ce1266..7c3566ea8 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -95,18 +95,23 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2048 -#CONFIG_BT_BLUEDROID_ENABLED=n +CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y +CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 + +CONFIG_MBEDTLS_IRAM_8BIT_MEM_ALLOC=y +CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y + CONFIG_BT_BLUEDROID_ENABLED=y -#CONFIG_BT_NIMBLE_ENABLED=y +#CONFIG_BT_BLUEDROID_ENABLED=n #CONFIG_BT_CLASSIC_ENABLED=y CONFIG_BT_CLASSIC_ENABLED=n -CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y -CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 + CONFIG_BT_BLE_ENABLED=y CONFIG_BT_GATTS_ENABLE=y CONFIG_BT_GATTC_ENABLE=y CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y + CONFIG_ESP32_ALLOW_RTC_FAST_MEM_AS_HEAP=y #CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 @@ -122,8 +127,34 @@ CONFIG_ESP32_ALLOW_RTC_FAST_MEM_AS_HEAP=y #CONFIG_ESP32_WIFI_RX_IRAM_OPT=y #CONFIG_LWIP_IRAM_OPTIMIZATION=y -#CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=1024 +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 -#CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y -#CONFIG_MBEDTLS_IRAM_8BIT_MEM_ALLOC=y +##NimBLE +##https://github.com/h2zero/NimBLE-Arduino/issues/1#issuecomment-599987760 +#CONFIG_BT_NIMBLE_ENABLED=y +#CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y +#CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 +#CONFIG_BT_NIMBLE_MAX_BONDS=3 +#CONFIG_BT_NIMBLE_MAX_CCCDS=8 +#CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0 +#CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y +#CONFIG_BT_NIMBLE_PINNED_TO_CORE=n +#CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096 +#CONFIG_BT_NIMBLE_ROLE_CENTRAL=y +#CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y +#CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y +#CONFIG_BT_NIMBLE_ROLE_OBSERVER=y +#CONFIG_BT_NIMBLE_NVS_PERSIST=y +#CONFIG_BT_NIMBLE_SM_LEGACY=y +#CONFIG_BT_NIMBLE_SM_SC=y +#CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble" +#CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31 +#CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256 +#CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0x0 +#CONFIG_BT_NIMBLE_ACL_BUF_COUNT=12 +#CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255 +#CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 +#CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30 +#CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8 +CONFIG_BLE_SMP_ENABLE=n pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy