From 97754bb9dd7e0390defc70932ebcf736e2542856 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 17 Oct 2023 17:20:51 -0400 Subject: [PATCH 1/7] Update Thermostat cluster version to 6. (#29820) * Update Thermostat cluster version to 6. It was updated in all-clusters-app, but not in the XML or other apps. * Regenerate generated files. --- .../all-clusters-common/all-clusters-minimal-app.matter | 2 +- .../all-clusters-common/all-clusters-minimal-app.zap | 5 ++--- ...aturesensor_humiditysensor_thermostat_56de3d5f45.matter | 2 +- ...peraturesensor_humiditysensor_thermostat_56de3d5f45.zap | 5 ++--- .../chef/devices/rootnode_airqualitysensor_e63187f6c9.zap | 3 +-- .../chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap | 3 +-- .../devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap | 3 +-- .../chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap | 3 +-- .../chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap | 3 +-- examples/chef/devices/rootnode_dishwasher_cc105034fe.zap | 3 +-- examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap | 3 +-- .../devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap | 3 +-- examples/chef/devices/rootnode_fan_7N2TobIlOX.zap | 3 +-- examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap | 3 +-- .../chef/devices/rootnode_genericswitch_9866e35d0b.zap | 3 +-- .../devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap | 5 ++--- .../chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap | 3 +-- .../chef/devices/rootnode_laundrywasher_fb10d238c8.zap | 3 +-- examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap | 3 +-- .../chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap | 3 +-- examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap | 3 +-- examples/chef/devices/rootnode_onofflight_samplemei.zap | 3 +-- .../chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap | 3 +-- .../chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 3 +-- .../chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap | 3 +-- examples/chef/devices/rootnode_pump_5f904818cc.zap | 3 +-- examples/chef/devices/rootnode_pump_a811bb33a0.zap | 3 +-- ...lledcabinet_temperaturecontrolledcabinet_ffdb696680.zap | 3 +-- .../devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap | 3 +-- .../devices/rootnode_roomairconditioner_9cf3607804.zap | 3 +-- examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap | 3 +-- examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap | 3 +-- .../chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap | 3 +-- examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap | 3 +-- .../chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap | 3 +-- examples/chef/devices/template.zap | 3 +-- .../chef/sample_app_util/test_files/sample_zap_file.zap | 3 +-- .../contact-sensor-common/contact-sensor-app.zap | 3 +-- .../dishwasher-app/dishwasher-common/dishwasher-app.zap | 3 +-- .../light-switch-common/light-switch-app.zap | 3 +-- .../bouffalolab/data_model/lighting-app-ethernet.zap | 3 +-- .../bouffalolab/data_model/lighting-app-thread.zap | 3 +-- .../bouffalolab/data_model/lighting-app-wifi.zap | 3 +-- examples/lighting-app/lighting-common/lighting-app.zap | 3 +-- examples/lighting-app/nxp/zap/lighting-on-off.zap | 3 +-- examples/lighting-app/qpg/zap/light.zap | 3 +-- .../lighting-app/silabs/data_model/lighting-thread-app.zap | 3 +-- .../lighting-app/silabs/data_model/lighting-wifi-app.zap | 3 +-- examples/lock-app/lock-common/lock-app.zap | 3 +-- examples/lock-app/nxp/zap/lock-app.zap | 3 +-- examples/lock-app/qpg/zap/lock.zap | 3 +-- .../log-source-app/log-source-common/log-source-app.zap | 3 +-- .../ota-provider-common/ota-provider-app.zap | 3 +-- .../ota-requestor-common/ota-requestor-app.zap | 3 +-- examples/placeholder/linux/apps/app1/config.matter | 2 +- examples/placeholder/linux/apps/app1/config.zap | 7 +++---- examples/placeholder/linux/apps/app2/config.matter | 2 +- examples/placeholder/linux/apps/app2/config.zap | 7 +++---- examples/pump-app/pump-common/pump-app.zap | 3 +-- examples/pump-app/silabs/data_model/pump-thread-app.zap | 3 +-- examples/pump-app/silabs/data_model/pump-wifi-app.zap | 3 +-- .../pump-controller-common/pump-controller-app.zap | 3 +-- .../refrigerator-common/refrigerator-app.zap | 3 +-- .../resource-monitoring-common/resource-monitoring-app.zap | 3 +-- examples/rvc-app/rvc-common/rvc-app.zap | 3 +-- .../smoke-co-alarm-common/smoke-co-alarm-app.zap | 3 +-- .../temperature-measurement.zap | 3 +-- examples/tv-app/tv-common/tv-app.zap | 3 +-- .../tv-casting-app/tv-casting-common/tv-casting-app.zap | 3 +-- .../virtual-device-common/virtual-device-app.zap | 3 +-- examples/window-app/common/window-app.zap | 3 +-- scripts/tools/zap/tests/inputs/all-clusters-app.zap | 5 ++--- scripts/tools/zap/tests/inputs/lighting-app.zap | 3 +-- .../all-clusters-app/app-templates/endpoint_config.h | 2 +- .../zcl/data-model/chip/thermostat-cluster.xml | 2 +- src/controller/data_model/controller-clusters.zap | 5 ++--- 76 files changed, 85 insertions(+), 155 deletions(-) diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index f82f69cca91682..73ac50358c13b4 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -4579,7 +4579,7 @@ endpoint 1 { ram attribute controlSequenceOfOperation default = 0x04; ram attribute systemMode default = 0x01; ram attribute featureMap default = 1; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command SetpointRaiseLower; } diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 5effdbf335962c..a900aea4ea362f 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -6935,7 +6935,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -12183,6 +12183,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index dc8729847167b6..becc2994f937e9 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -2351,7 +2351,7 @@ endpoint 5 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 1; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command SetpointRaiseLower; } diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index d4c638fa5e1fec..eb7fa565cc981a 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -7773,7 +7773,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7827,6 +7827,5 @@ "endpointId": 5, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap index fed115dfedd366..4c056edb8a36bc 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap @@ -6062,6 +6062,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index 31ecd62f113b40..3a7b75f2222908 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -3906,6 +3906,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index c874105c476b59..c5f588ab7e04e2 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -3902,6 +3902,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index b7b14922885e3f..876fc1f78b4813 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -3084,6 +3084,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index a0e30882f1caf4..84f05af85b53d1 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3516,6 +3516,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index 83904b4eac177b..7c0c25378d92b7 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -3517,6 +3517,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 6a0c6507da70a5..b7674880696e4f 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -3413,6 +3413,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index df4b4395ed2074..1b4f150a6ee06b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -4006,6 +4006,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 4494b1b60ab4b7..a3a44938d440bc 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -3226,6 +3226,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 5170e51bc49c64..693dc2f4ddad58 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -2986,6 +2986,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap index 8b93e45e598fd5..37347c96ac56ab 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap @@ -2390,6 +2390,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 28543ed7685c7f..bc22535b084253 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -3362,7 +3362,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "3", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -3590,6 +3590,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 384586db111caf..a46961552d7004 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -2986,6 +2986,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index 021363ad4bfd5f..066606dffe2ca4 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -3353,6 +3353,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 7d0cde4ea8d7df..5331bdb29a7091 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -2954,6 +2954,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 92893d77f52508..27e62b5b70232a 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -2970,6 +2970,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index ef0a6e3de53f4a..b59b25debe1562 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -3426,6 +3426,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 966acb5fad79ea..316cfd673f37eb 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -3558,6 +3558,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 870e60187ea01f..05116b69ffb317 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -3146,6 +3146,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 583db6367ea800..37312157bc9ad5 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -3174,6 +3174,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 1872d1a0e6d1bd..af5ec16b4b5046 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -2996,6 +2996,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index dac39398d4bed3..6c364341345a4b 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -3513,6 +3513,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index 2d271decd96267..1da6872a5c4c06 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -2971,6 +2971,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index fc7aeb54cf2d92..e023f4be9a5cb3 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -3777,6 +3777,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap index d32cddda8ec1b9..5c1ac4df4af665 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap @@ -3391,6 +3391,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index d6aec88d032f55..11fde93ff66874 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -3131,6 +3131,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index 55ff9424e8bb4f..fcf0eee0d0899e 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -3069,6 +3069,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index b3bedc9717dc43..db7ccef40802e4 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -3158,6 +3158,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 13691f0fd0f745..b4eb2d40ed3c26 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -2970,6 +2970,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 2a01c8baaf540f..fa3cecef5e5301 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -3800,6 +3800,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 202eaafe19aad0..ddc252e56b669c 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -3462,6 +3462,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap index 58be6df2036da9..4f8c011c1e12b8 100644 --- a/examples/chef/devices/template.zap +++ b/examples/chef/devices/template.zap @@ -2707,6 +2707,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap index 89ffdbd0cf77b4..eff6a00671d5b0 100644 --- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap +++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap @@ -5679,6 +5679,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 307d78ee056a4c..64a677860d5b0c 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -4698,6 +4698,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap index 2492137a69c8bd..12ec8977ca97de 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap @@ -3903,6 +3903,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 57b7979622bb43..073f9a677e102e 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -5831,6 +5831,5 @@ "endpointId": 2, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index c95a3c2b8c104d..218ddb42e801af 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -4277,6 +4277,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 16e652aef67183..3f540ed9f04d31 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -5253,6 +5253,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index 22ed27e63d2f29..52cc3d661efaa8 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -4460,6 +4460,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 6da4f28df7e4ac..d59fee5200f253 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -5975,6 +5975,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index b683150b725dfd..12a02d45e7a282 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -3930,6 +3930,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index 6096373a976fd2..a9e809e15b0498 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -6207,6 +6207,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 8090ca60b22545..02f8e06de63acb 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -5915,6 +5915,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 76f9b9e6b552f1..e3a6e68d427d8b 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -5091,6 +5091,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 5e33322d782e77..88205e634b3561 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -6644,6 +6644,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 54d341d7f2c92c..39ab65db171c8f 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -3393,6 +3393,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index 30a2305646bab5..ff7f8aa51c565e 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -5268,6 +5268,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index daed939d6fd7ed..80c02f74e6941b 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -737,6 +737,5 @@ "endpointId": 0, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 76f6239108e7cd..da75a6de71daaf 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -2267,6 +2267,5 @@ "endpointId": 0, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index edaf5355b8b231..9b6953e8f44e42 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -3296,6 +3296,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 2786bc09afc759..3dc67eaec358aa 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -7125,7 +7125,7 @@ endpoint 0 { callback attribute ACCoilTemperature; callback attribute ACCapacityformat default = 0x00; ram attribute featureMap default = 0x000b; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; } server cluster ThermostatUserInterfaceConfiguration { diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 6b4d014659110e..f4bdb87e424a67 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -7871,7 +7871,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -8681,7 +8681,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -15156,6 +15156,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index a8c8587901b6e9..daa24822170a95 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -7091,7 +7091,7 @@ endpoint 0 { callback attribute ACCoilTemperature; callback attribute ACCapacityformat default = 0x00; ram attribute featureMap default = 0x000b; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; } server cluster ThermostatUserInterfaceConfiguration { diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 1b07ecaa7ec551..f2158750097edc 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -7945,7 +7945,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -8755,7 +8755,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -14948,6 +14948,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index bd3996afbf19c7..3c85e060c2a95b 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -4590,6 +4590,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index c82c57c0fbd707..c41037144521db 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -4590,6 +4590,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index c82c57c0fbd707..c41037144521db 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -4590,6 +4590,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 1f8b24624e6c75..40a48ff65a05f1 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -3416,6 +3416,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index da0a8201da5cf9..ee25bbda679588 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -3717,6 +3717,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index 28d1790dacdb8e..8c7e341e96e664 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -5322,6 +5322,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index 243e1349ea6ee9..9c0844f84190aa 100644 --- a/examples/rvc-app/rvc-common/rvc-app.zap +++ b/examples/rvc-app/rvc-common/rvc-app.zap @@ -2799,6 +2799,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index 78751a7c266f91..5d3c2bfc203f0e 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -4833,6 +4833,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap index bebade92e79707..63fe575d9d2914 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap @@ -2970,6 +2970,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 3e5d7acc801bd9..82f970a56d21d2 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -7621,6 +7621,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 94a9328227b0fa..ffc7f1d33be2c8 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -4366,6 +4366,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index 6226ff1260cae8..1225c244bc57ef 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -6057,6 +6057,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 27f66c7d302090..024b9247c290ac 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -7057,6 +7057,5 @@ "endpointId": 2, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 26130dda10a28b..fe430bda1dbece 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -10104,7 +10104,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -16664,6 +16664,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index bfbf9ca5534bfc..e4f4e057b87896 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -5742,6 +5742,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 189a2aae8f3a7e..282deca1883650 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -1033,7 +1033,7 @@ { ZAP_MIN_MAX_DEFAULTS_INDEX(21), 0x0000001C, 1, ZAP_TYPE(ENUM8), \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* SystemMode */ \ { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000000, 1, ZAP_TYPE(ENUM8), \ diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index 81215f04874555..1c15c5fc8b7fc8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -114,7 +114,7 @@ limitations under the License. THERMOSTAT_CLUSTER true true - + LocalTemperature OutdoorTemperature Occupancy diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 6f951a72269dac..58e77227a508ab 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -3260,7 +3260,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -5077,6 +5077,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file From b599c8d3ed36b1454431324b59660ba5eb8a6baa Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Tue, 17 Oct 2023 14:36:00 -0700 Subject: [PATCH 2/7] Updating labels --- .github/labeler.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 31e310088a0a0b..5893e8d173a8bf 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -84,6 +84,8 @@ tools: # Tests ############################################################ tests: + - src/python_testing/* + - src/python_testing/**/* - src/app/tests/* - src/app/tests/**/* @@ -123,6 +125,12 @@ core: protocols: - src/lib/protocols/* - src/lib/protocols/**/* + - src/protocols/* + - src/protocols/**/* + +messaging: + - src/messaging/* + - src/messaging/**/* shell: - src/lib/shell/* From 51964d949c00697257144ff2bd56b78fb12923bd Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Tue, 17 Oct 2023 14:36:12 -0700 Subject: [PATCH 3/7] Updating notes to not be so large --- .github/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/release.yml b/.github/release.yml index c6fad3413dc59e..d33d2a3e6ddf48 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -6,6 +6,8 @@ changelog: - scripts - external dependency - submodules + - integrations + - documentation authors: - restyled-io - octocat @@ -31,9 +33,13 @@ changelog: - title: Spec Alignment Changes labels: - spec - - title: INet Layer Changes + - title: Transport/Messaging Layer Changes labels: - inet + - transport + - messaging + - protocols + - lwip - title: Crypto Changes labels: - crypto @@ -49,6 +55,7 @@ changelog: - title: System Level Changes labels: - system + - attestation - title: App Level Changes labels: - app @@ -67,6 +74,3 @@ changelog: labels: - gn - build - - title: Other Changes - labels: - - "*" From 769ac9f49ed349a9456b9c4aa84e9cec88e37400 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 17 Oct 2023 17:36:33 -0400 Subject: [PATCH 4/7] Run the replace (#29817) Co-authored-by: Andrei Litvin --- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 8 ++++---- .github/workflows/chef.yaml | 8 ++++---- .github/workflows/cirque.yaml | 2 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .github/workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-cc32xx.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 ++-- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .github/workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-openiotsdk.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-stm32.yaml | 2 +- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/minimal-build.yaml | 2 +- .github/workflows/qemu.yaml | 4 ++-- .github/workflows/release_artifacts.yaml | 4 ++-- .github/workflows/smoketest-android.yaml | 2 +- .github/workflows/tests.yaml | 4 ++-- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- examples/all-clusters-app/ameba/README.md | 4 ++-- examples/all-clusters-minimal-app/ameba/README.md | 4 ++-- examples/light-switch-app/ameba/README.md | 4 ++-- examples/lighting-app/ameba/README.md | 4 ++-- examples/ota-requestor-app/ameba/README.md | 4 ++-- examples/pigweed-app/ameba/README.md | 4 ++-- integrations/cloudbuild/build-all.yaml | 6 +++--- integrations/cloudbuild/chef.yaml | 6 +++--- integrations/cloudbuild/smoke-test.yaml | 14 +++++++------- src/test_driver/tizen/README.md | 4 ++-- 47 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index faad378d35a657..e6f02432b16793 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5d3adfa3bf3e16..bf6bc47597b6c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -131,7 +131,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -279,7 +279,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -414,7 +414,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 7b03a66931cb60..6767d78ea46cf3 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:20 + image: ghcr.io/project-chip/chip-build-esp32:21 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:20 + image: ghcr.io/project-chip/chip-build-nrf-platform:21 options: --user root steps: @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:20 + image: ghcr.io/project-chip/chip-build-telink:21 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 86007a7b7aad83..25f6484d4bf2ad 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -40,7 +40,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: ghcr.io/project-chip/chip-build-cirque:20 + # image: ghcr.io/project-chip/chip-build-cirque:21 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index eea17e3affd5b0..efc82b13c13f9f 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:20 + image: ghcr.io/project-chip/chip-build-doxygen:21 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 672214d546cbb2..2e8e9465d90dca 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:20 + image: ghcr.io/project-chip/chip-build-ameba:21 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index 6f39cfa75c001a..2257c9ed54a62a 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:20 + image: ghcr.io/project-chip/chip-build-asr:21 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index 532e1bfb963cce..6564a304ee0fe8 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:20 + image: ghcr.io/project-chip/chip-build-bouffalolab:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 6243ecd9f06fe5..e7548e6f5413d5 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:20 + image: ghcr.io/project-chip/chip-build-ti:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index 336dcf1fde5e97..1d0d65c30110fb 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:20 + image: ghcr.io/project-chip/chip-build-ti:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 40b3bb18dbf84e..ee7159475b14d1 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:20 + image: ghcr.io/project-chip/chip-build-efr32:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 084de904c7e269..8fbf75f9ebea37 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:20 + image: ghcr.io/project-chip/chip-build-esp32:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -130,7 +130,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:20 + image: ghcr.io/project-chip/chip-build-esp32:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 11a904625f1903..b7f5e201291522 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:20 + image: ghcr.io/project-chip/chip-build-infineon:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 21b4b4520ea028..df88c5a9dabaac 100644 --- 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:20 + image: ghcr.io/project-chip/chip-build-k32w:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 2ec789d65a5ff7..371ecac04d11a7 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:20 + image: ghcr.io/project-chip/chip-build-crosscompile:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index dae9832961b138..4508d39da3f438 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:20 + image: ghcr.io/project-chip/chip-build-imx:21 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 90f29da0d30ff0..d6740787696105 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index 3c03d0c78c1018..cfd022219b3cf4 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-mbed-os:20 + image: ghcr.io/project-chip/chip-build-mbed-os:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 8a0254b691f3c4..a879dc16e34e50 100644 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 757c32c02bdbde..5d05fb34f286ad 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:20 + image: ghcr.io/project-chip/chip-build-nrf-platform:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index a2fb61c1ceda79..4fd20ce854f31b 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-openiotsdk:20 + image: ghcr.io/project-chip/chip-build-openiotsdk:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index c62c8bd18b8b38..2fcb50ae6a339f 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 9abcbc240f0bdf..5c8189cbe01711 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 76537d15e037e5..f3e5cfb59e2d88 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:20 + image: ghcr.io/project-chip/chip-build-telink:21 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 84ca0651ae2ee4..1e375b1ff0ea91 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:20 + image: ghcr.io/project-chip/chip-build-tizen:21 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index ae6603f18d36e5..73eff529be6576 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:20 + image: ghcr.io/project-chip/chip-build-android:21 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index c27928850c8f14..42d8134470ba2b 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 6d0cd3e77a348f..f4711ca5bfb9ff 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:1 + image: ghcr.io/project-chip/chip-build-java:21 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0755b8afaea2f9..941598cc6d7b65 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index b3d4790c9a86d9..a6c95979f200fe 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:20 + image: ghcr.io/project-chip/chip-build-minimal:21 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index d029d3a010eaae..b16d073224d0af 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:20 + image: ghcr.io/project-chip/chip-build-esp32-qemu:21 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:20 + image: ghcr.io/project-chip/chip-build-tizen-qemu:21 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index cfb8991bd052da..f0c816125f6190 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-esp32:20 + image: ghcr.io/project-chip/chip-build-esp32:21 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:20 + image: ghcr.io/project-chip/chip-build-efr32:21 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 5a206aea079a93..456820deecedb3 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:20 + image: ghcr.io/project-chip/chip-build-android:21 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 134a288fa2ef0e..bb0a781f8b566c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -402,7 +402,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 6b816198d38197..9ae5f2df18b295 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 9910303eba3a7e..5e50d26365b2d0 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 2971823a653805..e84a8f6bc3e076 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:20 + image: ghcr.io/project-chip/chip-build:21 defaults: run: shell: sh diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index e5cff1adfdfe4b..a6c1684b997e50 100644 --- a/examples/all-clusters-app/ameba/README.md +++ b/examples/all-clusters-app/ameba/README.md @@ -27,11 +27,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 - Setup build environment: diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index 044352fa323cef..cf21a5a9cff37f 100644 --- a/examples/all-clusters-minimal-app/ameba/README.md +++ b/examples/all-clusters-minimal-app/ameba/README.md @@ -27,13 +27,13 @@ The CHIP demo application is supported on - Pull docker image: ``` - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 ``` - Setup build environment: diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 14d4e4aa92b2e3..67ed7c829c50f1 100644 --- a/examples/light-switch-app/ameba/README.md +++ b/examples/light-switch-app/ameba/README.md @@ -26,11 +26,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 - Setup build environment: diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index eeca656961da20..e81705889be1a9 100644 --- a/examples/lighting-app/ameba/README.md +++ b/examples/lighting-app/ameba/README.md @@ -23,11 +23,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 - Setup build environment: diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index cc070ed27b367c..c30a1fb435df59 100644 --- a/examples/ota-requestor-app/ameba/README.md +++ b/examples/ota-requestor-app/ameba/README.md @@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities. - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 - Setup build environment: diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 30e1b2b1c56f9d..361ab87509d2bb 100644 --- a/examples/pigweed-app/ameba/README.md +++ b/examples/pigweed-app/ameba/README.md @@ -31,11 +31,11 @@ following features are available: - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:20 + $ docker pull ghcr.io/project-chip/chip-build-ameba:21 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:20 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21 - Setup build environment: diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index ba048759705c7f..808c882ef7ac1f 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -6,7 +6,7 @@ steps: - "--init" - "--recursive" id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -21,7 +21,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -85,7 +85,7 @@ steps: --target k32w-shell build --create-archives /workspace/artifacts/ - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index be2f9e2dd1daeb..488d05c19f4097 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 2700s - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -27,7 +27,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index 9d5a85f5f4acab..8db671765d7b83 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" git submodule update --init --recursive id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -22,7 +22,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -43,7 +43,7 @@ steps: volumes: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -64,7 +64,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -86,7 +86,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -139,7 +139,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:2" + - name: "ghcr.io/project-chip/chip-build-vscode:21" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index c81ab1bf56b353..e4e3800c8c7239 100644 --- a/src/test_driver/tizen/README.md +++ b/src/test_driver/tizen/README.md @@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in ```sh # Pull the image from hub.docker.com -docker pull ghcr.io/project-chip/chip-build-tizen-qemu:20 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:21 ``` ## Building and Running Tests on QEMU @@ -21,7 +21,7 @@ All steps described below should be done inside the docker container. ```sh docker run -it --rm --name chip-tizen-qemu \ - ghcr.io/project-chip/chip-build-tizen-qemu:20 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:21 /bin/bash ``` ### Clone the connectedhomeip repository From aeda2bb2c9d00652719042bdd493fdb19aa150ec Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 17 Oct 2023 19:01:47 -0400 Subject: [PATCH 5/7] Use continue-on-error for jobs trying to save space by removing dir (#29827) --- .github/actions/checkout-submodules-and-bootstrap/action.yaml | 3 ++- .github/workflows/full-android.yaml | 1 + .github/workflows/smoketest-android.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/checkout-submodules-and-bootstrap/action.yaml b/.github/actions/checkout-submodules-and-bootstrap/action.yaml index f7db541c9f2140..d60a69ce6d62fd 100644 --- a/.github/actions/checkout-submodules-and-bootstrap/action.yaml +++ b/.github/actions/checkout-submodules-and-bootstrap/action.yaml @@ -33,8 +33,9 @@ runs: # there is roughly 1.4GB that remains in this cache that is useless from # this point onwards. shell: bash + continue-on-error: true run: | - du -sh $HOME/.cipd-cache-dir/ || true + du -sh $HOME/.cipd-cache-dir/ rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed" - name: Dump disk info after checkout submodule & Bootstrap shell: bash diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 73eff529be6576..319cce82a3c217 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -63,6 +63,7 @@ jobs: # This should not generally be needed, however android CI runs out of space # We do not need pigweed cross compile here because we use android NDK # compilers. Removing this package saves a significant amount of space. + continue-on-error: true run: | du -sh .environment/cipd/packages/arm rm -rf .environment/cipd/packages/arm diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 456820deecedb3..6b493cbb990627 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -52,6 +52,7 @@ jobs: # This should not generally be needed, however android CI runs out of space # We do not need pigweed cross compile here because we use android NDK # compilers. Removing this package save significant amount of space. + continue-on-error: true run: | du -sh .environment/cipd/packages/arm rm -rf .environment/cipd/packages/arm From 71ef633510be3b204dad99aa70e49e01f1f5ace5 Mon Sep 17 00:00:00 2001 From: Matthew Swartwout Date: Tue, 17 Oct 2023 16:19:49 -0700 Subject: [PATCH 6/7] Remove unused DiagnosticDataProviderImpl include from platform/android/ PlatformManagerImpl.cpp (#29831) --- src/platform/android/PlatformManagerImpl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platform/android/PlatformManagerImpl.cpp b/src/platform/android/PlatformManagerImpl.cpp index 4a6211b68713e0..ad95be14746b1c 100644 --- a/src/platform/android/PlatformManagerImpl.cpp +++ b/src/platform/android/PlatformManagerImpl.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include From 836ceec99919fca31fb29e2605ccc26dc041ebcc Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 17 Oct 2023 20:38:30 -0400 Subject: [PATCH 7/7] Add provisional and internal markers cluster-wide (#29765) * Update cluster data with api maturity * Pull in latest zap that supports api maturity * mark scenes provisional, mark unit testing and fault injection as internal * Mark more clusters as provisional * Undo domain move * Undo submodule change * make the scenes domain identical with how it was * Restyle --------- Co-authored-by: Andrei Litvin --- .../all-clusters-common/all-clusters-app.matter | 10 +++++----- .../all-clusters-minimal-app.matter | 8 ++++---- ...ensor_humiditysensor_thermostat_56de3d5f45.matter | 2 +- examples/chef/devices/rootnode_fan_7N2TobIlOX.matter | 2 +- .../rootnode_heatingcoolingunit_ncdGai1E5a.matter | 2 +- .../rootnode_roboticvacuumcleaner_1807ff0c49.matter | 2 +- .../rootnode_roomairconditioner_9cf3607804.matter | 2 +- .../devices/rootnode_thermostat_bm3fb8dhYi.matter | 2 +- .../light-switch-common/light-switch-app.matter | 2 +- .../lighting-app/lighting-common/lighting-app.matter | 2 +- .../silabs/data_model/lighting-thread-app.matter | 2 +- .../silabs/data_model/lighting-wifi-app.matter | 2 +- examples/placeholder/linux/apps/app1/config.matter | 2 +- examples/placeholder/linux/apps/app2/config.matter | 2 +- .../resource-monitoring-app.matter | 2 +- .../virtual-device-common/virtual-device-app.matter | 2 +- .../partials/idl/cluster_definition.zapt | 1 + .../chip/ballast-configuration-cluster.xml | 2 +- .../zcl/data-model/chip/fan-control-cluster.xml | 2 +- .../zcl/data-model/chip/fault-injection-cluster.xml | 2 +- .../zcl/data-model/chip/pwm-cluster.xml | 4 ++-- src/app/zap-templates/zcl/data-model/chip/scene.xml | 2 +- .../zcl/data-model/chip/test-cluster.xml | 2 +- src/controller/data_model/controller-clusters.matter | 12 ++++++------ 24 files changed, 37 insertions(+), 36 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index efd0d098cb872d..367388c7b2f015 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -4183,7 +4183,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -4574,7 +4574,7 @@ server cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -server cluster BallastConfiguration = 769 { +provisional server cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -5310,7 +5310,7 @@ server cluster ElectricalMeasurement = 2820 { } /** The Test Cluster is meant to validate the generated code */ -server cluster UnitTesting = 4294048773 { +internal server cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; @@ -5632,7 +5632,7 @@ server cluster UnitTesting = 4294048773 { } /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */ -server cluster FaultInjection = 4294048774 { +internal server cluster FaultInjection = 4294048774 { enum FaultType : ENUM8 { kUnspecified = 0; kSystemFault = 1; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 73ac50358c13b4..f7ae8b3196bc0e 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -2819,7 +2819,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -2978,7 +2978,7 @@ server cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -server cluster BallastConfiguration = 769 { +provisional server cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -3654,7 +3654,7 @@ server cluster AccountLogin = 1294 { } /** The Test Cluster is meant to validate the generated code */ -server cluster UnitTesting = 4294048773 { +internal server cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index becc2994f937e9..3e798fbc65b9c1 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -1088,7 +1088,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 9367e36ea00e89..af74d9b8417c8f 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1139,7 +1139,7 @@ server cluster FixedLabel = 64 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index e4aa78bbd25bdf..f2b3878dda758d 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1453,7 +1453,7 @@ client cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index e824e2cdc1b7b2..789188da2eeeb9 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index 3bccbecf18922b..29941df8ef18b5 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -1019,7 +1019,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 42f0736a950d47..57b611204f1081 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1261,7 +1261,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -client cluster FanControl = 514 { +provisional client cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index d05cbfa828b51d..f703cbfc4860b7 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -client cluster Scenes = 5 { +provisional client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 44cc85d26015dd..c0b6344bcab4aa 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 1ee2508f922b9a..e1951b6a9ba901 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index ccad91158a901d..ca9d823350b0b1 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 3dc67eaec358aa..990047f1259d9f 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index daa24822170a95..f11e7bb353e52c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 3f7be93a0d8b03..dd6e4bfb9b90b4 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1579,7 +1579,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 997aad965458a9..e20e6d41f29309 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/src/app/zap-templates/partials/idl/cluster_definition.zapt b/src/app/zap-templates/partials/idl/cluster_definition.zapt index 22550157b665f2..54f6f687c9538a 100644 --- a/src/app/zap-templates/partials/idl/cluster_definition.zapt +++ b/src/app/zap-templates/partials/idl/cluster_definition.zapt @@ -1,4 +1,5 @@ /** {{description}} */ +{{#if apiMaturity}}{{apiMaturity}} {{/if~}} {{#if generateClientCluster}}client {{else}}server {{/if~}} cluster {{asUpperCamelCase name}} = {{!}} {{~#if manufacturerCode}} diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml index 1b3a2d5ffb89be..7819e95cb7b3c6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml @@ -28,7 +28,7 @@ limitations under the License. - + Ballast Configuration Lighting Attributes and commands for configuring a lighting ballast. diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml index 9eb833bc5cf12c..3c30d960f18fe7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml @@ -73,7 +73,7 @@ limitations under the License. - + Fan Control HVAC An interface for controlling a fan in a heating/cooling system. diff --git a/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml index 76bc15ea6a904c..3d95c992c98ae0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml @@ -24,7 +24,7 @@ limitations under the License. - + CHIP Fault Injection 0xFFF1FC06 diff --git a/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml index b71c0f1090b707..ba31ad6d185b85 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml @@ -17,11 +17,11 @@ limitations under the License. - + General Pulse Width Modulation 0x001c PWM_CLUSTER Cluster to control pulse width modulation - \ No newline at end of file + diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index 8418f9c4a97eee..ff6769249dc4f0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -33,7 +33,7 @@ limitations under the License. - + Scenes General Attributes and commands for scene configuration and manipulation. diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml index 2f7e1376013ebd..9117389fa3f9c6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml @@ -136,7 +136,7 @@ limitations under the License. - + CHIP Unit Testing 0xFFF1FC05 diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index cf5a9d605c772a..e4dec560e8d8f2 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -125,7 +125,7 @@ client cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -client cluster Scenes = 5 { +provisional client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -526,7 +526,7 @@ client cluster BinaryInputBasic = 15 { } /** Cluster to control pulse width modulation */ -client cluster PulseWidthModulation = 28 { +provisional client cluster PulseWidthModulation = 28 { readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -4630,7 +4630,7 @@ client cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -client cluster FanControl = 514 { +provisional client cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -5041,7 +5041,7 @@ client cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -client cluster BallastConfiguration = 769 { +provisional client cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -6572,7 +6572,7 @@ client cluster ElectricalMeasurement = 2820 { } /** The Test Cluster is meant to validate the generated code */ -client cluster UnitTesting = 4294048773 { +internal client cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; @@ -7018,7 +7018,7 @@ client cluster UnitTesting = 4294048773 { } /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */ -client cluster FaultInjection = 4294048774 { +internal client cluster FaultInjection = 4294048774 { enum FaultType : ENUM8 { kUnspecified = 0; kSystemFault = 1;