Merge branch 'master' into UpdateTIApplications_OTA_Documentation

project-chip · Jun 28, 2024 · e927c12 · e927c12
2 parents 81a1a09 + 99e20a9
commit e927c12
Show file tree

Hide file tree

Showing 187 changed files with 16,140 additions and 2,695 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -40,7 +40,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:54
+      image: ghcr.io/project-chip/chip-build-efr32:56
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:54
+            image: ghcr.io/project-chip/chip-build-efr32:56
         steps:
             - name: Checkout
               uses: actions/checkout@v4

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
diff --git a/.gitmodules b/.gitmodules
@@ -231,10 +231,10 @@
 	url = https://github.com/SiliconLabs/sdk_support.git
 	branch = main
 	platforms = silabs,silabs_docker
-[submodule "third_party/silabs/gecko_sdk"]
-	path = third_party/silabs/gecko_sdk
-	url = https://github.com/SiliconLabs/gecko_sdk.git
-	branch = v4.4.2
+[submodule "third_party/silabs/simplicity_sdk"]
+	path = third_party/silabs/simplicity_sdk
+	url = https://github.com/SiliconLabs/simplicity_sdk.git
+	branch = v2024.6.0
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
 [submodule "third_party/silabs/wifi_sdk"]
 	path = third_party/silabs/wifi_sdk
 	url = https://github.com/SiliconLabs/wiseconnect.git
-	branch = v3.1.3-matter-hotfix.4
+	branch = v3.3.0
 	platforms = silabs
 [submodule "editline"]
 	path = third_party/editline/repo

diff --git a/docs/zap_clusters.md b/docs/zap_clusters.md
@@ -90,6 +90,7 @@ Generally regenerate using one of:
 |        257 |      0x101 | DoorLock                                                |
 |        258 |      0x102 | WindowCovering                                          |
 |        259 |      0x103 | BarrierControl                                          |
+|        336 |      0x150 | ServiceArea                                             |
 |        512 |      0x200 | PumpConfigurationAndControl                             |
 |        513 |      0x201 | Thermostat                                              |
 |        514 |      0x202 | FanControl                                              |

diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
@@ -1681,17 +1681,19 @@ endpoint 1 {
     callback attribute attributeList;
     callback attribute featureMap;
     ram      attribute clusterRevision default = 1;
+
+    handle command ResetCondition;
   }
 
   server cluster FanControl {
     ram      attribute fanMode default = 0;
     ram      attribute fanModeSequence default = 2;
     ram      attribute percentSetting default = 0;
     ram      attribute percentCurrent default = 0;
-    ram      attribute speedMax default = 100;
+    ram      attribute speedMax default = 10;
     ram      attribute speedSetting default = 0;
     ram      attribute speedCurrent default = 0;
-    ram      attribute rockSupport default = 0x03;
+    ram      attribute rockSupport default = 0x07;
     ram      attribute rockSetting default = 0x00;
     ram      attribute windSupport default = 0x03;
     ram      attribute windSetting default = 0x00;

diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
@@ -19,18 +19,18 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/zcl/zcl.json",
-      "type": "zcl-properties",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
       "category": "matter",
-      "version": 1,
-      "description": "Matter SDK ZCL data"
+      "version": "chip-v1"
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
+      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "type": "zcl-properties",
       "category": "matter",
-      "version": "chip-v1"
+      "version": 1,
+      "description": "Matter SDK ZCL data"
     }
   ],
   "endpointTypes": [
@@ -2529,7 +2529,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2545,7 +2545,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2561,7 +2561,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2577,7 +2577,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3006,6 +3006,16 @@
           "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "commands": [
+            {
+              "name": "ResetCondition",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
           "attributes": [
             {
               "name": "Condition",
@@ -3293,7 +3303,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "100",
+              "defaultValue": "10",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3341,7 +3351,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x03",
+              "defaultValue": "0x07",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -2326,7 +2326,7 @@ endpoint 0 {
     callback attribute windowStatus;
     callback attribute adminFabricIndex;
     callback attribute adminVendorId;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 0x0001;
     ram      attribute clusterRevision default = 0x0001;
 
     handle command OpenCommissioningWindow;
@@ -2386,7 +2386,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 4;
 
     handle command Identify;
     handle command TriggerEffect;
@@ -2399,7 +2399,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 4;
 
     handle command AddGroup;
     handle command AddGroupResponse;
@@ -2431,25 +2431,33 @@ endpoint 1 {
     callback attribute degradationDirection;
     callback attribute changeIndication;
     callback attribute inPlaceIndicator;
+    callback attribute lastChangedTime;
+    callback attribute replacementProductList;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap;
     ram      attribute clusterRevision default = 1;
+
+    handle command ResetCondition;
   }
 
   server cluster ActivatedCarbonFilterMonitoring {
     callback attribute condition;
     callback attribute degradationDirection;
     callback attribute changeIndication;
     callback attribute inPlaceIndicator;
+    callback attribute lastChangedTime;
+    callback attribute replacementProductList;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap;
     ram      attribute clusterRevision default = 1;
+
+    handle command ResetCondition;
   }
 
   server cluster FanControl {
@@ -2460,7 +2468,7 @@ endpoint 1 {
     ram      attribute speedMax default = 10;
     ram      attribute speedSetting default = 0;
     ram      attribute speedCurrent default = 0;
-    ram      attribute rockSupport default = 0x01;
+    ram      attribute rockSupport default = 0x07;
     ram      attribute rockSetting default = 0x00;
     ram      attribute windSupport default = 0x03;
     ram      attribute windSetting default = 0x00;
@@ -2469,8 +2477,10 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 0x3F;
     ram      attribute clusterRevision default = 4;
+
+    handle command Step;
   }
 }
 endpoint 2 {
@@ -2521,6 +2531,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2540,6 +2551,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2548,7 +2560,7 @@ endpoint 2 {
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 3;
   }
 
   server cluster NitrogenDioxideConcentrationMeasurement {
@@ -2559,6 +2571,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2578,6 +2591,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2597,6 +2611,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2616,6 +2631,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2635,6 +2651,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2654,6 +2671,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2673,6 +2691,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2692,6 +2711,7 @@ endpoint 2 {
     callback attribute peakMeasuredValueWindow;
     callback attribute averageMeasuredValue;
     callback attribute averageMeasuredValueWindow;
+    callback attribute uncertainty;
     callback attribute measurementUnit;
     callback attribute measurementMedium;
     callback attribute levelValue;
@@ -2735,15 +2755,16 @@ endpoint 3 {
   }
 
   server cluster TemperatureMeasurement {
-    ram      attribute measuredValue;
-    ram      attribute minMeasuredValue default = 0x8000;
-    ram      attribute maxMeasuredValue default = 0x8000;
+    persist  attribute measuredValue default = 0;
+    persist  attribute minMeasuredValue default = -5000;
+    persist  attribute maxMeasuredValue default = 7500;
+    persist  attribute tolerance default = 10;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 4;
   }
 }
 endpoint 4 {
@@ -2778,9 +2799,10 @@ endpoint 4 {
   }
 
   server cluster RelativeHumidityMeasurement {
-    ram      attribute measuredValue;
-    ram      attribute minMeasuredValue;
-    ram      attribute maxMeasuredValue;
+    ram      attribute measuredValue default = 4600;
+    ram      attribute minMeasuredValue default = 0;
+    ram      attribute maxMeasuredValue default = 10000;
+    ram      attribute tolerance default = 1;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
@@ -2821,12 +2843,15 @@ endpoint 5 {
   }
 
   server cluster Thermostat {
-    ram      attribute localTemperature;
+    ram      attribute localTemperature default = 2000;
+    ram      attribute absMinHeatSetpointLimit default = 700;
+    ram      attribute absMaxHeatSetpointLimit default = 3000;
+    persist  attribute PIHeatingDemand default = 0;
     ram      attribute occupiedHeatingSetpoint default = 2000;
-    ram      attribute minHeatSetpointLimit default = 1700;
+    ram      attribute minHeatSetpointLimit default = 700;
     ram      attribute maxHeatSetpointLimit default = 3000;
-    ram      attribute controlSequenceOfOperation default = 0x02;
-    ram      attribute systemMode default = 0x00;
+    ram      attribute controlSequenceOfOperation default = 2;
+    ram      attribute systemMode default = 4;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;