Merge branch 'master' into 31690-13-drlc-cluster-is-in-the-wrong-doma…

…in-in-zap-should-be-energy-management-not-energy
project-chip · Feb 2, 2024 · c9ca15c · c9ca15c
2 parents 1a0a9e3 + e4c4c38
commit c9ca15c
Show file tree

Hide file tree

Showing 743 changed files with 56,066 additions and 19,120 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -634,6 +634,7 @@ GPL
 GPLv
 Gradle
 gradlew
+graphviz
 Groupcast
 GroupId
 GroupKeyManagement

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -49,7 +49,7 @@ jobs:
               with:
                 platform: nrfconnect
             - name: Detect changed paths
-              uses: dorny/paths-filter@v2
+              uses: dorny/paths-filter@v3
               id: changed_paths
               with:
                   filters: |

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,7 @@ examples/thermostat/ameba/build
 # https://github.com/espressif/idf-component-manager#using-with-a-project
 examples/*/esp32/managed_components
 examples/*/esp32/dependencies.lock
+
+# jupyter temporary files
+.ipynb_checkpoints
+
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/data_model/ValveConfigurationControl.xml b/data_model/ValveConfigurationControl.xml
diff --git a/docs/clusters.md b/docs/clusters.md
@@ -77,8 +77,10 @@ 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                                        |
-Original file line number
+Diff line change
@@ Expand Up / @@ -634,6 +634,7 @@ GPL @@
     GPLv
     Gradle
     gradlew
+    graphviz
     Groupcast
     GroupId
     GroupKeyManagement
@@ Expand Down @@