Update IDF v5.5.4 (#3279)

Author: josesimoes

.devcontainer/All/Dockerfile.All

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-all:v2.60
+FROM ghcr.io/nanoframework/dev-container-all:v2.61

.devcontainer/All/Dockerfile.All.SRC

@@ -2,7 +2,7 @@
 # IDF MIGRATION CHECKLIST
 # When upgrading ESP-IDF to a new version, review and update the following:
 #
-# 1. ESP-IDF version: search for the git clone --branch tag below (currently v5.5.3)
+# 1. ESP-IDF version: search for the git clone --branch tag below (currently v5.5.4)
 # 2. ESP_PATCH_VER: the GCC toolchain patch version installed by IDF.
 #    After running install.sh in the new IDF, check the toolchain version at:
 #      ~/.espressif/tools/xtensa-esp-elf/ and ~/.espressif/tools/riscv32-esp-elf/
@@ -117,7 +117,7 @@ RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.g
 
 # Clone ESP-IDF
 # >>> IDF MIGRATION: update the branch tag to the new IDF version <<<
-RUN git clone --branch v5.5.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
+RUN git clone --branch v5.5.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
 
 # Clone what is needed for TI
 RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \

.devcontainer/ESP32/Dockerfile.ESP32

@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-esp32:v2.38
+FROM ghcr.io/nanoframework/dev-container-esp32:v2.39

.devcontainer/ESP32/Dockerfile.ESP32.SRC

@@ -2,7 +2,7 @@
 # IDF MIGRATION CHECKLIST
 # When upgrading ESP-IDF to a new version, review and update the following:
 #
-# 1. ESP-IDF version: search for the git clone --branch tag below (currently v5.5.3)
+# 1. ESP-IDF version: search for the git clone --branch tag below (currently v5.5.4)
 # 2. ESP_PATCH_VER: the GCC toolchain patch version installed by IDF.
 #    After running install.sh in the new IDF, check the toolchain version at:
 #      ~/.espressif/tools/xtensa-esp-elf/ and ~/.espressif/tools/riscv32-esp-elf/
@@ -71,7 +71,7 @@ RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./so
 
 # Clone ESP-IDF
 # >>> IDF MIGRATION: update the branch tag to the new IDF version <<<
-RUN git clone --branch v5.5.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
+RUN git clone --branch v5.5.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
 
 # Creating static link python for pyhton3
 RUN ln -fs /usr/bin/python3 /usr/bin/python \

CMake/binutils.ESP32.cmake

@@ -151,65 +151,6 @@ macro(nf_fix_esp32c3_rom_file)
 
 endmacro()
 
-# fixes the NimBLE version for IDF 5.5.3 which causes connection issues
-function(nf_fix_nimble_idf553)
-
-    # Check we are running on IDF v5.5.3, if not, no need to do anything
-    string(FIND "${MY_IDF_VER}" "v5.5.3" ESP32_IDF_VERSION_INDEX)
-    if(ESP32_IDF_VERSION_INDEX EQUAL -1)
-        return()
-    endif()
-
-    set(TRANSPORT_PATH ${esp32_idf_SOURCE_DIR}/components/bt/host/nimble/nimble/nimble/transport/src/transport.c)
-    file(READ
-        ${TRANSPORT_PATH}
-        ESP32_NIMBLE_TRANSPORT_CONTENT)
-
-    message(STATUS "Check if Nimble on IDF v5.5.3 needs patching")
-    
-    # Check if the file already has the correct include to avoid doing the replacement multiple times
-    string(FIND "${ESP32_NIMBLE_TRANSPORT_CONTENT}" "#include <nimble/nimble_opt.h>" ESP32_NIMBLE_TRANSPORT_FOUND_INDEX)
-    if(NOT ${ESP32_NIMBLE_TRANSPORT_FOUND_INDEX} EQUAL -1)
-            # the file already has the correct include, no need to do anything
-            message(STATUS "Nimble on IDF v5.5.3 already patched")
-            return()
-    endif()
-        
-    message(STATUS "Patching Nimble on IDF v5.5.3 - transport.c")
-
-    string(REPLACE
-        "#include <nimble/hci_common.h>"
-        "#include <nimble/hci_common.h>
-#include <nimble/nimble_opt.h>"
-        ESP32_NIMBLE_TRANSPORT_NEW_CONTENT
-        "${ESP32_NIMBLE_TRANSPORT_CONTENT}")
-        
-    file(WRITE 
-        ${TRANSPORT_PATH}
-        "${ESP32_NIMBLE_TRANSPORT_NEW_CONTENT}")
-
-    set(HCI_UART_PATH ${esp32_idf_SOURCE_DIR}/components/bt/host/nimble/nimble/nimble/transport/uart/src/hci_uart.c)
-
-    message(STATUS "Patching Nimble on IDF v5.5.3 - hci_uart.c")
-
-    file(READ
-        ${HCI_UART_PATH}
-        ESP32_NIMBLE_HCI_UART_CONTENT)
-        
-    string(REPLACE
-        "#include \"hal/hal_uart.h\""
-        "#include \"hal/hal_uart.h\"
-#include \"nimble/nimble_opt.h\""
-        ESP32_NIMBLE_HCI_UART_NEW_CONTENT
-        "${ESP32_NIMBLE_HCI_UART_CONTENT}")
-        
-    file(WRITE 
-        ${HCI_UART_PATH}
-        "${ESP32_NIMBLE_HCI_UART_NEW_CONTENT}")
-
-    message(STATUS "Patching Nimble on IDF v5.5.3 - complete")
-
-endfunction()
 
 # setting compile definitions for a target based on general build options
 # TARGET parameter to set the target that's setting them for
@@ -1092,9 +1033,6 @@ macro(nf_add_idf_as_library)
 
     nf_fix_esp32c3_rom_file()
 
-    # Check if nimble needs patching, only relevant for IDF v5.5.3
-    nf_fix_nimble_idf553()
-
     # find out if there is support for BLE
     string(FIND ${SDKCONFIG_DEFAULT_CONTENTS} "CONFIG_BT_ENABLED=y" CONFIG_BT_ENABLED_POS)
 

azure-pipelines-nightly.yml

@@ -17,7 +17,7 @@ resources:
       type: github
       name: espressif/esp-idf
       endpoint: nanoframework
-      ref: refs/tags/v5.5.3
+      ref: refs/tags/v5.5.4
 
 # scheduled build
 # the schedule is defined at the AZDO web interface because of inconsistencies with time zones
@@ -642,7 +642,7 @@ jobs:
       IDF_PATH: "D:/a/1/s/esp-idf"
       PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
       TargetPlatform: "esp32"
-      IDF_TAG: "v5.5.3"
+      IDF_TAG: "v5.5.4"
 
     steps:
       - checkout: self

azure-pipelines.yml

@@ -44,7 +44,7 @@ resources:
       type: github
       name: espressif/esp-idf
       endpoint: nanoframework
-      ref: refs/tags/v5.5.3
+      ref: refs/tags/v5.5.4
     - repository: mscorlib
       type: github
       name: nanoframework/CoreLibrary
@@ -543,7 +543,7 @@ jobs:
       IDF_PATH: "D:/a/1/s/esp-idf"
       PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
       TargetPlatform: "esp32"
-      IDF_TAG: "v5.5.3"
+      IDF_TAG: "v5.5.4"
 
     steps:
       - checkout: self

targets/ESP32/CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 # 3. cache tag in build and download AZDO yaml templates                        #
 #################################################################################
 #################################################################################
-set(ESP32_IDF_TAG "5.5.3" CACHE INTERNAL "ESP32 IDF tag")
+set(ESP32_IDF_TAG "5.5.4" CACHE INTERNAL "ESP32 IDF tag")
 #################################################################################
 #################################################################################
 

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "assemblyVersion": {
     "precision": "revision"
   },