From a4ed721666a0fb2417f620615dadd86f98e1c75a Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 3 Feb 2022 10:49:41 -0500 Subject: [PATCH 1/4] Switch default 'Network Commissioning'::'FeatureMap' attribute to 2 This makes the default in-ram setting claim 'I am a thread device'. This is because most wifi devices already support a spec-compliant network cluster: - linux reports as wifi - esp32 reports as wifi - darwin has an intentional 'report as 0' for unit tests which needs to be altered and ZAP defaults will not apply anyway. Found files to be changed and validated via: fd 'zap$' | xargs rg 'Network Commissioning' | cut -f1 -d: | uniq | xargs -n1 jq '.endpointTypes[].clusters[] | select(.name == "Network Commissioning") | {name: .name, attr: .attributes[] | {name:.name, default:.defaultValue, file: input_filename}} | select(.attr.name == "FeatureMap" and .attr.default != "2")' --- .../all-clusters-app/all-clusters-common/all-clusters-app.zap | 4 ++-- examples/bridge-app/bridge-common/bridge-app.zap | 2 +- examples/door-lock-app/door-lock-common/door-lock-app.zap | 2 +- .../light-switch-app/light-switch-common/light-switch-app.zap | 2 +- examples/lighting-app/lighting-common/lighting-app.zap | 2 +- examples/lock-app/lock-common/lock-app.zap | 2 +- .../ota-provider-app/ota-provider-common/ota-provider-app.zap | 2 +- .../ota-requestor-common/ota-requestor-app.zap | 2 +- examples/placeholder/linux/apps/app1/config.zap | 2 +- examples/placeholder/linux/apps/app2/config.zap | 2 +- examples/pump-app/pump-common/pump-app.zap | 2 +- .../pump-controller-common/pump-controller-app.zap | 2 +- .../esp32/main/temperature-measurement.zap | 2 +- examples/thermostat/thermostat-common/thermostat.zap | 2 +- examples/tv-app/tv-common/tv-app.zap | 4 ++-- examples/tv-casting-app/tv-casting-common/tv-casting-app.zap | 2 +- examples/window-app/common/window-app.zap | 2 +- src/controller/data_model/controller-clusters.zap | 4 ++-- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 30b91cdecbf400..e8caf0655e10ea 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -2311,7 +2311,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -9888,7 +9888,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 59e5fdaace75de..a3da52612173d4 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1128,7 +1128,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.zap b/examples/door-lock-app/door-lock-common/door-lock-app.zap index c32bb22435db77..e267097628840f 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.zap +++ b/examples/door-lock-app/door-lock-common/door-lock-app.zap @@ -2069,7 +2069,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 020e8d9ab8d524..a7fa1a0cf7a60d 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 @@ -2186,7 +2186,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index b85a8d84053818..1c216aa2505c9e 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -2169,7 +2169,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 274f0965086b99..4d3de54d40e645 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -2069,7 +2069,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 9df471778319d9..ab91c982877215 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 @@ -1846,7 +1846,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 1313fe938b8b90..477827979f7c7b 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 @@ -1929,7 +1929,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 18e0e738231030..40ec542aa10046 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -870,7 +870,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 18e0e738231030..40ec542aa10046 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -870,7 +870,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 02c445935c2ea3..ced61f8630765d 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1827,7 +1827,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 36264b51e7d16c..0cfc957690702f 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 @@ -1827,7 +1827,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index 76869e62541bab..393b42d58de5f1 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -1515,7 +1515,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 26131979baa2b0..4c3bdc8caf9d54 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1975,7 +1975,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 39c029beaf0f46..726e512041774b 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1804,7 +1804,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2005,7 +2005,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, 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 bcefd02ed6b7e4..fc35b7b87fcc2f 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 @@ -1975,7 +1975,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 9552f2465188ad..4471bd8c534ec6 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1764,7 +1764,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index f9d93c54f294b2..9b243c45dc9ea2 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -4466,7 +4466,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4697,7 +4697,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "2", "reportable": 1, "minInterval": 0, "maxInterval": 65344, From 24c81e1ff3c9071a5589d9640e827a03b62574fa Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 3 Feb 2022 10:55:57 -0500 Subject: [PATCH 2/4] Ran zap regen --- .../all-clusters-app/zap-generated/endpoint_config.h | 8 ++++---- zzz_generated/bridge-app/zap-generated/endpoint_config.h | 4 ++-- .../controller-clusters/zap-generated/endpoint_config.h | 4 ++-- .../door-lock-app/zap-generated/endpoint_config.h | 4 ++-- .../light-switch-app/zap-generated/endpoint_config.h | 4 ++-- .../lighting-app/zap-generated/endpoint_config.h | 4 ++-- zzz_generated/lock-app/zap-generated/endpoint_config.h | 4 ++-- .../ota-provider-app/zap-generated/endpoint_config.h | 4 ++-- .../ota-requestor-app/zap-generated/endpoint_config.h | 4 ++-- .../placeholder/app1/zap-generated/endpoint_config.h | 4 ++-- .../placeholder/app2/zap-generated/endpoint_config.h | 4 ++-- zzz_generated/pump-app/zap-generated/endpoint_config.h | 4 ++-- .../pump-controller-app/zap-generated/endpoint_config.h | 4 ++-- .../zap-generated/endpoint_config.h | 4 ++-- zzz_generated/thermostat/zap-generated/endpoint_config.h | 4 ++-- zzz_generated/tv-app/zap-generated/endpoint_config.h | 8 ++++---- .../tv-casting-app/zap-generated/endpoint_config.h | 4 ++-- zzz_generated/window-app/zap-generated/endpoint_config.h | 4 ++-- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 6e5f34c3ae2d0d..03a9a3c72efad5 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -86,7 +86,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 546 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -326,7 +326,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 919 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 1, Cluster: Bridged Device Basic (server), big-endian */ \ \ @@ -777,7 +777,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 546 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ @@ -1017,7 +1017,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 919 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Bridged Device Basic (server), little-endian */ \ \ diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 28153924225ede..19dadcdaf9b10c 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -353,7 +353,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h index bedda6baa69515..36b0c9ee6a985d 100644 --- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h @@ -40,7 +40,7 @@ /* Endpoint: 1, Cluster: Network Commissioning (client), big-endian */ \ \ /* 8 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 1, Cluster: Software Diagnostics (client), big-endian */ \ \ @@ -80,7 +80,7 @@ /* Endpoint: 1, Cluster: Network Commissioning (client), little-endian */ \ \ /* 8 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Software Diagnostics (client), little-endian */ \ \ diff --git a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h index c641052ab1e1b5..34a5fee1d968bd 100644 --- a/zzz_generated/door-lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/door-lock-app/zap-generated/endpoint_config.h @@ -76,7 +76,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 300 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -356,7 +356,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 300 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index 4ef659648ad16d..b2abb6af95aeab 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -41,7 +41,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 16 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -267,7 +267,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 16 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 08c08dffa7e913..15c448cb7094e1 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -65,7 +65,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -325,7 +325,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index a568e96c9f04e0..8d6749d4f91135 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -76,7 +76,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 300 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -350,7 +350,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 300 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h index 82bd1f0a28c215..2ecf2eb9417a04 100644 --- a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h @@ -65,7 +65,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ } #else // !BIGENDIAN_CPU @@ -110,7 +110,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index d2b9591261bbdc..1548430722a6cf 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -65,7 +65,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ } #else // !BIGENDIAN_CPU @@ -110,7 +110,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 288 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index e08506bb6b4796..0da9ebb28d136e 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -57,7 +57,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 278 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: Operational Credentials (server), big-endian */ \ \ @@ -115,7 +115,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 278 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Operational Credentials (server), little-endian */ \ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index e08506bb6b4796..0da9ebb28d136e 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -57,7 +57,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 278 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: Operational Credentials (server), big-endian */ \ \ @@ -115,7 +115,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 278 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Operational Credentials (server), little-endian */ \ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index f081dce3251f65..7b4ab685c3c6e5 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -287,7 +287,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index da660681ea4055..e61c96324c1126 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -325,7 +325,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index add9d8b8d5a1b7..4b01ea1b1f6a90 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -188,7 +188,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index b214fe51e9adeb..20e228b91899ef 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -364,7 +364,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 5afe38269797c2..12ada387240dcf 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -64,7 +64,7 @@ /* Endpoint: 0, Cluster: Network Commissioning (client), big-endian */ \ \ /* 276 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: Network Commissioning (server), big-endian */ \ \ @@ -75,7 +75,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 296 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -545,7 +545,7 @@ /* Endpoint: 0, Cluster: Network Commissioning (client), little-endian */ \ \ /* 276 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Network Commissioning (server), little-endian */ \ \ @@ -556,7 +556,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 296 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 4f49b29616ed9b..e1acde85437324 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -70,7 +70,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -461,7 +461,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 292 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index 5701acd2cef9c7..512ead7253e4a2 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -79,7 +79,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 308 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x02, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ @@ -353,7 +353,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 308 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ From e63fa48b0697dce91cc8589084a2fe2459b7b22e Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 4 Feb 2022 08:59:41 -0500 Subject: [PATCH 3/4] Disable features on network configuration cluster on EP1. Not sure why we have 2 of them, likely they do not work --- .../all-clusters-app/all-clusters-common/all-clusters-app.zap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 135d2f4cb92985..f3dc16ddef207f 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -9888,7 +9888,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, From a5855cedc7106b7b3ec40bd62d49925f27348398 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 4 Feb 2022 09:04:04 -0500 Subject: [PATCH 4/4] Ran zap regen --- .../all-clusters-app/zap-generated/endpoint_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 581797611575e3..af18f808004973 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -310,7 +310,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 665 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x02, \ + 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Bridged Device Basic (server), big-endian */ \ \ @@ -985,7 +985,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 665 - FeatureMap, */ \ - 0x02, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Bridged Device Basic (server), little-endian */ \ \