Merge branch 'master' into enable_rvc_python_tests_to_run_in_ci

project-chip · Feb 7, 2024 · 944ea2c · 944ea2c
2 parents 5088469 + 1a6bd3b
commit 944ea2c
Show file tree

Hide file tree

Showing 505 changed files with 45,025 additions and 208,782 deletions.
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -106,6 +106,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
+                     --runner darwin_framework_tool_python \
                      --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
                      --target-skip-glob '{TestAccessControlConstraints}' \
                      run \

diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
@@ -123,6 +123,13 @@ jobs:
               run: |
                   xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
               working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
+            - name: Uploading .ips files in Xcode derived data to debug the failure
+              uses: actions/upload-artifact@v4
+              if: ${{ failure() && !env.ACT }}
+              with:
+                  name: darwin-framework-derived-data
+                  path: ~/Library/Developer/Xcode/DerivedData/**/*.ips
+                  retention-days: 5
             - name: Uploading log files
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}

diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml
@@ -11,7 +11,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v3.3 #May not be the latest version
+    - uses: github/issue-labeler@v3.4 #May not be the latest version
       with:
         configuration-path: .github/issue-labeler.yml
         not-before: 2020-01-15T02:54:32Z

diff --git a/.github/workflows/kotlin-style.yaml b/.github/workflows/kotlin-style.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "detekt"
-        uses: natiginfo/[email protected].4
+        uses: natiginfo/[email protected].5
         # Detekt seems not to like circular symlinks, so we set up
         # explicit paths below
         with:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
diff --git a/BUILD.gn b/BUILD.gn
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
-import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
 
@@ -136,7 +135,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "${chip_root}/src/system",
       "${chip_root}/src/transport",
       "${nlassert_root}:nlassert",
-      "${nlio_root}:nlio",
       "${nlunit_test_root}:nlunit-test",
     ]
 

diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -185,6 +185,12 @@ if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
         endif()
 endif()
 
+if (CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS)
+    chip_gn_arg_append("chip_persist_subscriptions"                 "true")
+else()
+    chip_gn_arg_append("chip_persist_subscriptions"                 "false")
+endif()
+
 if (CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
     chip_gn_arg_append("chip_enable_ble_controller"             "true")
 endif()

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -130,6 +130,13 @@ menu "CHIP Core"
             help
                 Some device types don't require the read client. Enabling this option may save some flash/ram.
 
+        config ENABLE_PERSIST_SUBSCRIPTIONS
+            bool "Enable persist subscriptions"
+            default y
+            help
+                Enable persist subscriptions to make the device resume the subscriptions from the persist
+                subscriptions information after reboot.
+
         config BUILD_CHIP_TESTS
             bool "Build CHIP tests"
             default n
@@ -202,6 +209,13 @@ menu "CHIP Core"
             help
                 Enable this option to use LwIP default IPv6 route hook for Route Information Option(RIO) feature.
 
+        config ENABLE_ENDPOINT_QUEUE_FILTER
+            bool "Enable UDP Endpoint queue filter for mDNS Broadcast packets"
+            depends on USE_MINIMAL_MDNS
+            default y
+            help
+                Enable this option to start a UDP Endpoint queue filter for mDNS Broadcast packets
+
         config ENABLE_LWIP_THREAD_SAFETY
             bool "Enable LwIP Thread safety options"
             default y
@@ -1038,6 +1052,12 @@ menu "CHIP Device Layer"
 
     endmenu
 
+    config CHIP_ENABLE_BDX_LOG_TRANSFER
+        bool "Enable BDX log transfer"
+        default n
+        help
+            Enables the BDX protocol for diagnostics log transfer
+
     menu "Matter OTA Image"
 
         config CHIP_OTA_IMAGE_BUILD

diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -216,6 +216,10 @@ config CHIP_ENABLE_POWER_ON_FACTORY_RESET
 	  first 5 seconds after power on and this sequence repeated 5 times - factory
 	  reset will be involved.
 
+config CHIP_TASK_STACK_SIZE
+	int
+	default 8192
+
 config CHIP_USE_MARS_SENSOR
 	bool "Use Mars board sensor"
 	depends on SOC_SERIES_RISCV_TELINK_B9X && (BOARD_TLSR9518ADK80D || BOARD_TLSR9518ADK80D_RETENTION)

diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -211,7 +211,7 @@ config SETTINGS_NVS_SECTOR_SIZE_MULT
 
 # Set sector counter of NVS
 config SETTINGS_NVS_SECTOR_COUNT
-    default 10
+    default 12
 
 # Enable OpenThread
 
@@ -329,4 +329,7 @@ config PWM_SHELL
 config OPENTHREAD_SHELL
     default n
 
+config CHIP_TASK_STACK_SIZE
+	default 4864 if PM
+
 endif
diff --git a/docs/clusters.md b/docs/clusters.md
@@ -77,12 +77,14 @@ Generally regenerate using one of:
 |        114 |       0x72 | ActivatedCarbonFilterMonitoring                         |
 |        128 |       0x80 | BooleanStateConfiguration                               |
 |        129 |       0x81 | ValveConfigurationAndControl                            |
+|        144 |       0x90 | ElectricalPowerMeasurement                              |
 |        145 |       0x91 | ElectricalEnergyMeasurement                             |
 |        150 |       0x96 | DemandResponseLoadControl                               |
 |        151 |       0x97 | Messages                                                |
 |        152 |       0x98 | DeviceEnergyManagement                                  |
 |        153 |       0x99 | EnergyEvse                                              |
 |        155 |       0x9B | EnergyPreference                                        |
+|        156 |       0x9C | PowerTopology                                           |
 |        157 |       0x9D | EnergyEvseMode                                          |
 |        159 |       0x9F | DeviceEnergyManagementMode                              |
 |        257 |      0x101 | DoorLock                                                |

diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
@@ -94,6 +94,33 @@ Complete the following steps:
 
 1. Reboot your Raspberry Pi after installing `pi-bluetooth`.
 
+#### Enable experimental Bluetooth support in BlueZ
+
+The Matter application on Linux uses BlueZ to communicate with the Bluetooth
+controller. The BlueZ version that comes with Ubuntu 22.04 does not support all
+the features required by the Matter application by default. To enable these
+features, you need to enable experimental Bluetooth support in BlueZ.
+
+1. Edit the `bluetooth.service` unit by running the following command:
+
+    ```sh
+    sudo systemctl edit bluetooth.service
+    ```
+
+1. Add the following content to the override file:
+
+    ```ini
+    [Service]
+    ExecStart=
+    ExecStart=/usr/lib/bluetooth/bluetoothd -E
+    ```
+
+1. Restart the Bluetooth service by running the following command:
+
+    ```sh
+    sudo systemctl restart bluetooth.service
+    ```
+
 #### Configuring wpa_supplicant for storing permanent changes
 
 By default, wpa_supplicant is not allowed to update (overwrite) configuration.