Merge branch 'master' into telink_lock_app_updates

project-chip · Dec 13, 2023 · 817d8f1 · 817d8f1
2 parents 1aa16ef + d389403
commit 817d8f1
Show file tree

Hide file tree

Showing 986 changed files with 135,336 additions and 35,313 deletions.
diff --git a/.github/workflows/docbuild.yaml b/.github/workflows/docbuild.yaml
@@ -27,7 +27,7 @@ jobs:
           path: matter
           fetch-depth: 0
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
           cache-dependency-path: matter/docs/requirements.txt

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:26
+            image: ghcr.io/project-chip/chip-build-k32w:27
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/protocol_compatibility.yaml b/.github/workflows/protocol_compatibility.yaml
@@ -28,7 +28,7 @@ jobs:
        - name: Checkout
          uses: actions/checkout@v4
        - name: Setup python
-         uses: actions/setup-python@v4
+         uses: actions/setup-python@v5
          with:
            python-version: 3.11
        - name: Install dependencies

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -113,6 +113,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -51,6 +51,11 @@ jobs:
               run: |
                 apt-get update
                 DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing openjdk-17-jre
+            # Clean out java generated files: since java codegen will generate one file per
+            # structure/cluster, if clusters and structures are ever changed (for in progress work)
+            # this may leave obsolete files. Ensure we always check for clean regen.
+            - name: Ensure clean java
+              run: rm -rf src/controller/java/generated/
             - name: Generate all
               run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py
             - name: Generate script-maintained items (ERROR_CODES.md)

diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -262,6 +262,10 @@ if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
   chip_gn_arg_append("matter_trace_config" "\"${CHIP_ROOT}/src/tracing/esp32_trace:esp32_trace_tracing\"")
 endif()
 
+if (CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS)
+     chip_gn_arg_append("matter_enable_esp_insights_system_stats"            "true")
+endif()
+
 if (CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
     chip_gn_arg_append("chip_use_esp32_ecdsa_peripheral" "true")
 endif()
@@ -489,7 +493,7 @@ foreach(phy_blob ${phy_blobs})
     list(APPEND chip_libraries "${esp_phy_dir}/lib/${target_name}/lib${phy_blob}.a")
 endforeach()
 
-set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos)
+set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos esp_timer)
 idf_build_get_property(build_components BUILD_COMPONENTS)
 foreach(component ${components_to_link})
     # Some of the components are not present in IDF v4.x

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -876,6 +876,12 @@ menu "CHIP Device Layer"
                Enabling the above option will enable the esp32 specific tracing functionality and report the
                diagnostic information to the insights cloud.
 
+      config ENABLE_ESP_INSIGHTS_SYSTEM_STATS
+           bool "Enable System Stats for insights"
+           depends on ESP_INSIGHTS_ENABLED
+           default n
+           help
+               This option enables the system statistics to be sent to the insights cloud.
     endmenu
 
 

diff --git a/docs/ERROR_CODES.md b/docs/ERROR_CODES.md
@@ -126,6 +126,7 @@ This file was **AUTOMATICALLY** generated by
 | 182       | 0xB6  | `CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB`            |
 | 185       | 0xB9  | `CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB`          |
 | 186       | 0xBA  | `CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB`            |
+| 187       | 0xBB  | `CHIP_ERROR_MAXIMUM_PATHS_PER_INVOKE_EXCEEDED`     |
 | 188       | 0xBC  | `CHIP_ERROR_PEER_NODE_NOT_FOUND`                   |
 | 189       | 0xBD  | `CHIP_ERROR_HSM`                                   |
 | 191       | 0xBF  | `CHIP_ERROR_REAL_TIME_NOT_SYNCED`                  |
@@ -254,5 +255,6 @@ This file was **AUTOMATICALLY** generated by
 | 1481      | 0x5C9 | `TIMED_REQUEST_MISMATCH`   |
 | 1482      | 0x5CA | `FAILSAFE_REQUIRED`        |
 | 1483      | 0x5CB | `INVALID_IN_STATE`         |
+| 1484      | 0x5CC | `NO_COMMAND_RESPONSE`      |
 | 1520      | 0x5F0 | `WRITE_IGNORED`            |
 
diff --git a/docs/clusters.md b/docs/clusters.md
@@ -77,7 +77,9 @@ Generally regenerate using one of:
 |        114 |       0x72 | ActivatedCarbonFilterMonitoring                         |
 |        128 |       0x80 | BooleanSensorConfiguration                              |
 |        129 |       0x81 | ValveConfigurationAndControl                            |
+|        145 |       0x91 | ElectricalEnergyMeasurement                             |
 |        150 |       0x96 | DemandResponseLoadControl                               |
+|        152 |       0x98 | DeviceEnergyManagement                                  |
 |        153 |       0x99 | EnergyEvse                                              |
 |        257 |      0x101 | DoorLock                                                |
 |        258 |      0x102 | WindowCovering                                          |

diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -320,3 +320,12 @@ air-purifier-app/**/README
 
 network-manager-app/README
 ```
+
+## Lit ICD example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+lit-icd-app/**/README
+```