Update IDF to v4.4.7 (#2895)

nanoframework · Mar 4, 2024 · 1808aeb · 1808aeb
1 parent 19738b2
commit 1808aeb
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.devcontainer/All/Dockerfile.All b/.devcontainer/All/Dockerfile.All
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-all:v2.44
+FROM ghcr.io/nanoframework/dev-container-all:v2.45
diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC
@@ -90,7 +90,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
 RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
 
 # Clone ESP-IDF
-RUN git clone --branch v4.4.6 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
+RUN git clone --branch v4.4.7 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 \

diff --git a/.devcontainer/ESP32/Dockerfile.ESP32 b/.devcontainer/ESP32/Dockerfile.ESP32
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-esp32:v2.28
+FROM ghcr.io/nanoframework/dev-container-esp32:v2.29
diff --git a/.devcontainer/ESP32/Dockerfile.ESP32.SRC b/.devcontainer/ESP32/Dockerfile.ESP32.SRC
@@ -48,7 +48,7 @@ RUN mkdir -p /usr/local/bin/gcc
 RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
 
 # Clone ESP-IDF
-RUN git clone --branch v4.4.6 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
+RUN git clone --branch v4.4.7 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 \

diff --git a/azure-pipelines-nightly.yml b/azure-pipelines-nightly.yml
@@ -14,7 +14,7 @@ resources:
       type: github
       name: espressif/esp-idf
       endpoint: nanoframework
-      ref: refs/tags/v4.4.6
+      ref: refs/tags/v4.4.7
 
 # scheduled build
 # the schedule is defined at the AZDO web interface because of inconsistencies with time zones

diff --git a/azure-pipelines-templates/download-install-esp32-build-components.yml b/azure-pipelines-templates/download-install-esp32-build-components.yml
@@ -7,8 +7,8 @@ steps:
   - task: Cache@2
     displayName: Cache ESP32 tools
     inputs:
-      key: 'esp32_tools | 4_4_6'
-      restoreKeys: 4_4_6
+      key: 'esp32_tools | 4_4_7'
+      restoreKeys: 4_4_7
       path: $(UserProfile)\.espressif\tools
       cacheHitVar: ESP32_TOOLS_CACHE_RESTORED
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -45,7 +45,7 @@ resources:
       type: github
       name: espressif/esp-idf
       endpoint: nanoframework
-      ref: refs/tags/v4.4.6
+      ref: refs/tags/v4.4.7
     - repository: mscorlib
       type: github
       name: nanoframework/CoreLibrary

diff --git a/targets/ESP32/CMakeLists.txt b/targets/ESP32/CMakeLists.txt
@@ -60,7 +60,7 @@ endif()
 # WHEN CHANGING THIS MAKE SURE TO UPDATE:
 # 1. the dev containers
 # 2. ref in AZDO pipeline yaml in Community Targets repo
-set(ESP32_IDF_TAG "4.4.6" CACHE INTERNAL "ESP32 IDF tag")
+set(ESP32_IDF_TAG "4.4.7" CACHE INTERNAL "ESP32 IDF tag")
 
 if(NO_ESP32_IDF_PATH)
     # no ESP32 IDF source specified, download it from official repo

diff --git a/...s/ESP32/_nanoCLR/System.Device.Adc/sys_dev_adc_native_System_Device_Adc_AdcController.cpp b/...s/ESP32/_nanoCLR/System.Device.Adc/sys_dev_adc_native_System_Device_Adc_AdcController.cpp
@@ -39,7 +39,7 @@ HRESULT Library_sys_dev_adc_native_System_Device_Adc_AdcController::NativeOpenCh
     esp_err_t result;
     // default to MAX bit width for SoC
     adc_bits_width_t width_bit = (adc_bits_width_t)SOC_ADC_MAX_BITWIDTH;
-    adc_atten_t atten = ADC_ATTEN_DB_11;
+    adc_atten_t atten = ADC_ATTEN_DB_12;
 
     // get a pointer to the managed object instance and check that it's not NULL
     CLR_RT_HeapBlock *pThis = stack.This();

diff --git a/targets/ESP32/_nanoCLR/System.Device.I2s/sys_dev_i2s_native_System_Device_I2s_I2sDevice.cpp b/targets/ESP32/_nanoCLR/System.Device.I2s/sys_dev_i2s_native_System_Device_I2s_I2sDevice.cpp
@@ -239,7 +239,7 @@ HRESULT SetI2sConfig(i2s_port_t bus, CLR_RT_HeapBlock *config)
         if (mode & I2S_MODE_ADC_BUILT_IN)
         {
             // TODO - make attenuation configurable?
-            adc_atten_t atten = ADC_ATTEN_DB_11;
+            adc_atten_t atten = ADC_ATTEN_DB_12;
 
             // TODO Re-use logic in ADC?
             int channelNumber = -1;