Merge pull request #45 from NabuCasa/update-matter-v1.1-ref

Update to Matter v1.1.0.2
NabuCasa · Dec 19, 2023 · 37acd2f · 37acd2f
2 parents dd97169 + 8333b7c
commit 37acd2f
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 6 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,43 +29,43 @@ jobs:
               "root": "examples/lighting-app/esp32/",
               "appbin": "chip-lighting-app.bin",
               "idf_target": "esp32c3",
-              "chip_ref": "v1.1.0.1"
+              "chip_ref": "v1.1.0.2"
             }
           - {
               "name": "lighting-app-esp32-atom-lite",
               "dir": "lighting-app-example/esp32-atom-lite/",
               "root": "examples/lighting-app/esp32/",
               "appbin": "chip-lighting-app.bin",
               "idf_target": "esp32",
-              "chip_ref": "v1.1.0.1"
+              "chip_ref": "v1.1.0.2"
             }
           - {
               "name": "lighting-app-esp32-c3-m5stamp",
               "dir": "lighting-app-example/esp32-c3-m5stamp/",
               "root": "examples/lighting-app/esp32/",
               "appbin": "chip-lighting-app.bin",
               "idf_target": "esp32c3",
-              "chip_ref": "v1.1.0.1"
+              "chip_ref": "v1.1.0.2"
             }
           - {
               "name": "light-switch-app-esp32-c3",
               "dir": "light-switch-app-example/esp32-c3/",
               "root": "examples/light-switch-app/esp32/",
               "appbin": "chip-light-switch-app.bin",
               "idf_target": "esp32c3",
-              "chip_ref": "v1.1.0.1"
+              "chip_ref": "v1.1.0.2"
             }
           - {
               "name": "all-clusters-app-esp32-m5-basic-core",
               "dir": "all-clusters-app-example/esp32-m5-basic-core/",
               "root": "examples/all-clusters-app/esp32/",
               "appbin": "chip-all-clusters-app.bin",
               "idf_target": "esp32",
-              "chip_ref": "v1.1.0.1"
+              "chip_ref": "v1.1.0.2"
             }
 
     container:
-      image: connectedhomeip/chip-build-esp32:0.6.18
+      image: connectedhomeip/chip-build-esp32:0.7.0
 
     outputs:
       git-hash: ${{ steps.git-version.outputs.hash }}
@@ -82,6 +82,18 @@ jobs:
           submodules: true
           path: connectedhomeip
 
+      # Fixup for Matter v1.1 (see https://github.com/project-chip/connectedhomeip/pull/28507/files)
+      - name: Fixup GdbGui requirement
+        run: perl -i -pe 's/^gdbgui==/# gdbgui==/' /opt/espressif/esp-idf/requirements.txt
+
+      - name: Apply global patches
+        shell: bash
+        run: |
+          cd connectedhomeip
+          for patch in ../*.patch; do
+              patch -p1 < "${patch}"
+          done
+
       - name: Get firmware git hash
         run: |
           ghash=$(git -C connectedhomeip rev-parse --short HEAD)

diff --git a/0001-Bump-prompt-toolkit-requirement-to-fix-ptpython-vers.patch b/0001-Bump-prompt-toolkit-requirement-to-fix-ptpython-vers.patch
@@ -0,0 +1,27 @@
+From 1a2e71258fe03fc009ca67e5150c6006d834736d Mon Sep 17 00:00:00 2001
+Message-ID: <1a2e71258fe03fc009ca67e5150c6006d834736d.1702907703.git.stefan@agner.ch>
+From: Andrei Litvin <andy314@gmail.com>
+Date: Wed, 13 Dec 2023 13:27:16 -0500
+Subject: [PATCH] Bump prompt-toolkit requirement to fix ptpython version
+ update (#30987)
+
+---
+ scripts/setup/constraints.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
+index 5322b58f7f..892e91964a 100644
+--- a/scripts/setup/constraints.txt
++++ b/scripts/setup/constraints.txt
+@@ -237,7 +237,7 @@ prettytable==2.5.0
+     # via
+     #   mbed-ls
+     #   mbed-os-tools
+-prompt-toolkit==3.0.38
++prompt-toolkit==3.0.43
+     # via ipython
+ protobuf==3.20.1
+     # via
+-- 
+2.43.0
+
diff --git a/all-clusters-app-example/esp32-m5-basic-core/sdkconfig.defaults b/all-clusters-app-example/esp32-m5-basic-core/sdkconfig.defaults
@@ -65,6 +65,9 @@ CONFIG_BTDM_CTRL_MODEM_SLEEP=n
 CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=n
 CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
 
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 CONFIG_DEVICE_SOFTWARE_VERSION="UNKNOWN"
 CONFIG_USE_TEST_SERIAL_NUMBER=""

diff --git a/light-switch-app-example/esp32-c3/sdkconfig.defaults b/light-switch-app-example/esp32-c3/sdkconfig.defaults
@@ -50,6 +50,9 @@ CONFIG_ENABLE_CHIP_SHELL=y
 # Disable softap support by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 CONFIG_DEVICE_SOFTWARE_VERSION="UNKNOWN"
 CONFIG_DEINIT_BLE_ON_COMMISSIONING_COMPLETE=n

diff --git a/lighting-app-example/esp32-atom-lite/sdkconfig.defaults b/lighting-app-example/esp32-atom-lite/sdkconfig.defaults
@@ -52,6 +52,10 @@ CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 
 # Disable softap support by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
+
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
 # This example uses the older version of RMT driver to work with both
 # idf-v4.4.3 and idf-v5.0, so suppressing the warnings by setting below option
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y

diff --git a/lighting-app-example/esp32-c3-m5stamp/sdkconfig.defaults b/lighting-app-example/esp32-c3-m5stamp/sdkconfig.defaults
@@ -56,6 +56,9 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 # idf-v4.4.3 and idf-v5.0, so suppressing the warnings by setting below option
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
 CONFIG_ENABLE_CHIP_SHELL=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 CONFIG_DEVICE_SOFTWARE_VERSION="UNKNOWN"

diff --git a/lighting-app-example/esp32-c3/sdkconfig.defaults b/lighting-app-example/esp32-c3/sdkconfig.defaults
@@ -52,6 +52,10 @@ CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 
 # Disable softap support by default
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
+
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
 # This example uses the older version of RMT driver to work with both
 # idf-v4.4.3 and idf-v5.0, so suppressing the warnings by setting below option
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y