Skip to content

Commit 6013fa6

Browse files
andy31415andy31415
committed
Merge branch 'list-metadata-prototype' of github.com:andy31415/connectedhomeip into list-metadata-prototype
2 parents d15b0d2 + 63dd9a9 commit 6013fa6

27 files changed

+486
-961
lines changed

‎examples/common/pigweed/rpc_services/Attributes.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <app/InteractionModelEngine.h>
2828
#include <app/MessageDef/AttributeReportIBs.h>
2929
#include <app/data-model-provider/ActionReturnStatus.h>
30+
#include <app/data-model-provider/MetadataSearch.h>
3031
#include <app/data-model-provider/OperationTypes.h>
3132
#include <app/data-model-provider/Provider.h>
3233
#include <app/util/attribute-storage.h>
@@ -221,7 +222,9 @@ class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
221222
request.operationFlags.Set(app::DataModel::OperationFlags::kInternal);
222223
request.subjectDescriptor = &subjectDescriptor;
223224

224-
std::optional<app::DataModel::ClusterInfo> info = provider->GetServerClusterInfo(path);
225+
app::DataModel::ServerClusterFinder serverClusterFinder(provider);
226+
auto info = serverClusterFinder.Find(path);
227+
225228
if (!info.has_value())
226229
{
227230
return ::pw::Status::NotFound();

‎examples/thermostat/nxp/zap/thermostat_matter_br.matter

-51
Original file line numberDiff line numberDiff line change
@@ -291,56 +291,6 @@ cluster Identify = 3 {
291291
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
292292
}
293293

294-
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
295-
cluster Identify = 3 {
296-
revision 4;
297-
298-
enum EffectIdentifierEnum : enum8 {
299-
kBlink = 0;
300-
kBreathe = 1;
301-
kOkay = 2;
302-
kChannelChange = 11;
303-
kFinishEffect = 254;
304-
kStopEffect = 255;
305-
}
306-
307-
enum EffectVariantEnum : enum8 {
308-
kDefault = 0;
309-
}
310-
311-
enum IdentifyTypeEnum : enum8 {
312-
kNone = 0;
313-
kLightOutput = 1;
314-
kVisibleIndicator = 2;
315-
kAudibleBeep = 3;
316-
kDisplay = 4;
317-
kActuator = 5;
318-
}
319-
320-
attribute int16u identifyTime = 0;
321-
readonly attribute IdentifyTypeEnum identifyType = 1;
322-
readonly attribute command_id generatedCommandList[] = 65528;
323-
readonly attribute command_id acceptedCommandList[] = 65529;
324-
readonly attribute event_id eventList[] = 65530;
325-
readonly attribute attrib_id attributeList[] = 65531;
326-
readonly attribute bitmap32 featureMap = 65532;
327-
readonly attribute int16u clusterRevision = 65533;
328-
329-
request struct IdentifyRequest {
330-
int16u identifyTime = 0;
331-
}
332-
333-
request struct TriggerEffectRequest {
334-
EffectIdentifierEnum effectIdentifier = 0;
335-
EffectVariantEnum effectVariant = 1;
336-
}
337-
338-
/** Command description for Identify */
339-
command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
340-
/** Command description for TriggerEffect */
341-
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
342-
}
343-
344294
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
345295
cluster Descriptor = 29 {
346296
revision 2;
@@ -2423,7 +2373,6 @@ endpoint 0 {
24232373
endpoint 1 {
24242374
device type ma_thermostat = 769, version 1;
24252375

2426-
binding cluster Identify;
24272376

24282377
server cluster Identify {
24292378
ram attribute identifyTime default = 0x0000;

‎examples/thermostat/nxp/zap/thermostat_matter_br.zap

-26
Original file line numberDiff line numberDiff line change
@@ -2999,32 +2999,6 @@
29992999
"deviceTypeCode": 769,
30003000
"deviceTypeProfileId": 259,
30013001
"clusters": [
3002-
{
3003-
"name": "Identify",
3004-
"code": 3,
3005-
"mfgCode": null,
3006-
"define": "IDENTIFY_CLUSTER",
3007-
"side": "client",
3008-
"enabled": 1,
3009-
"commands": [
3010-
{
3011-
"name": "Identify",
3012-
"code": 0,
3013-
"mfgCode": null,
3014-
"source": "client",
3015-
"isIncoming": 0,
3016-
"isEnabled": 1
3017-
},
3018-
{
3019-
"name": "TriggerEffect",
3020-
"code": 64,
3021-
"mfgCode": null,
3022-
"source": "client",
3023-
"isIncoming": 0,
3024-
"isEnabled": 1
3025-
}
3026-
]
3027-
},
30283002
{
30293003
"name": "Identify",
30303004
"code": 3,

‎examples/thermostat/nxp/zap/thermostat_matter_thread.matter

-51
Original file line numberDiff line numberDiff line change
@@ -291,56 +291,6 @@ cluster Identify = 3 {
291291
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
292292
}
293293

294-
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
295-
cluster Identify = 3 {
296-
revision 4;
297-
298-
enum EffectIdentifierEnum : enum8 {
299-
kBlink = 0;
300-
kBreathe = 1;
301-
kOkay = 2;
302-
kChannelChange = 11;
303-
kFinishEffect = 254;
304-
kStopEffect = 255;
305-
}
306-
307-
enum EffectVariantEnum : enum8 {
308-
kDefault = 0;
309-
}
310-
311-
enum IdentifyTypeEnum : enum8 {
312-
kNone = 0;
313-
kLightOutput = 1;
314-
kVisibleIndicator = 2;
315-
kAudibleBeep = 3;
316-
kDisplay = 4;
317-
kActuator = 5;
318-
}
319-
320-
attribute int16u identifyTime = 0;
321-
readonly attribute IdentifyTypeEnum identifyType = 1;
322-
readonly attribute command_id generatedCommandList[] = 65528;
323-
readonly attribute command_id acceptedCommandList[] = 65529;
324-
readonly attribute event_id eventList[] = 65530;
325-
readonly attribute attrib_id attributeList[] = 65531;
326-
readonly attribute bitmap32 featureMap = 65532;
327-
readonly attribute int16u clusterRevision = 65533;
328-
329-
request struct IdentifyRequest {
330-
int16u identifyTime = 0;
331-
}
332-
333-
request struct TriggerEffectRequest {
334-
EffectIdentifierEnum effectIdentifier = 0;
335-
EffectVariantEnum effectVariant = 1;
336-
}
337-
338-
/** Command description for Identify */
339-
command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
340-
/** Command description for TriggerEffect */
341-
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
342-
}
343-
344294
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
345295
cluster Descriptor = 29 {
346296
revision 2;
@@ -2348,7 +2298,6 @@ endpoint 0 {
23482298
endpoint 1 {
23492299
device type ma_thermostat = 769, version 1;
23502300

2351-
binding cluster Identify;
23522301

23532302
server cluster Identify {
23542303
ram attribute identifyTime default = 0x0000;

‎examples/thermostat/nxp/zap/thermostat_matter_thread.zap

-26
Original file line numberDiff line numberDiff line change
@@ -3752,32 +3752,6 @@
37523752
"deviceTypeCode": 769,
37533753
"deviceTypeProfileId": 259,
37543754
"clusters": [
3755-
{
3756-
"name": "Identify",
3757-
"code": 3,
3758-
"mfgCode": null,
3759-
"define": "IDENTIFY_CLUSTER",
3760-
"side": "client",
3761-
"enabled": 1,
3762-
"commands": [
3763-
{
3764-
"name": "Identify",
3765-
"code": 0,
3766-
"mfgCode": null,
3767-
"source": "client",
3768-
"isIncoming": 0,
3769-
"isEnabled": 1
3770-
},
3771-
{
3772-
"name": "TriggerEffect",
3773-
"code": 64,
3774-
"mfgCode": null,
3775-
"source": "client",
3776-
"isIncoming": 0,
3777-
"isEnabled": 1
3778-
}
3779-
]
3780-
},
37813755
{
37823756
"name": "Identify",
37833757
"code": 3,

‎examples/thermostat/nxp/zap/thermostat_matter_wifi.matter

-51
Original file line numberDiff line numberDiff line change
@@ -291,56 +291,6 @@ cluster Identify = 3 {
291291
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
292292
}
293293

294-
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
295-
cluster Identify = 3 {
296-
revision 4;
297-
298-
enum EffectIdentifierEnum : enum8 {
299-
kBlink = 0;
300-
kBreathe = 1;
301-
kOkay = 2;
302-
kChannelChange = 11;
303-
kFinishEffect = 254;
304-
kStopEffect = 255;
305-
}
306-
307-
enum EffectVariantEnum : enum8 {
308-
kDefault = 0;
309-
}
310-
311-
enum IdentifyTypeEnum : enum8 {
312-
kNone = 0;
313-
kLightOutput = 1;
314-
kVisibleIndicator = 2;
315-
kAudibleBeep = 3;
316-
kDisplay = 4;
317-
kActuator = 5;
318-
}
319-
320-
attribute int16u identifyTime = 0;
321-
readonly attribute IdentifyTypeEnum identifyType = 1;
322-
readonly attribute command_id generatedCommandList[] = 65528;
323-
readonly attribute command_id acceptedCommandList[] = 65529;
324-
readonly attribute event_id eventList[] = 65530;
325-
readonly attribute attrib_id attributeList[] = 65531;
326-
readonly attribute bitmap32 featureMap = 65532;
327-
readonly attribute int16u clusterRevision = 65533;
328-
329-
request struct IdentifyRequest {
330-
int16u identifyTime = 0;
331-
}
332-
333-
request struct TriggerEffectRequest {
334-
EffectIdentifierEnum effectIdentifier = 0;
335-
EffectVariantEnum effectVariant = 1;
336-
}
337-
338-
/** Command description for Identify */
339-
command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
340-
/** Command description for TriggerEffect */
341-
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
342-
}
343-
344294
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
345295
cluster Descriptor = 29 {
346296
revision 2;
@@ -2213,7 +2163,6 @@ endpoint 0 {
22132163
endpoint 1 {
22142164
device type ma_thermostat = 769, version 1;
22152165

2216-
binding cluster Identify;
22172166

22182167
server cluster Identify {
22192168
ram attribute identifyTime default = 0x0000;

‎examples/thermostat/nxp/zap/thermostat_matter_wifi.zap

-26
Original file line numberDiff line numberDiff line change
@@ -2999,32 +2999,6 @@
29992999
"deviceTypeCode": 769,
30003000
"deviceTypeProfileId": 259,
30013001
"clusters": [
3002-
{
3003-
"name": "Identify",
3004-
"code": 3,
3005-
"mfgCode": null,
3006-
"define": "IDENTIFY_CLUSTER",
3007-
"side": "client",
3008-
"enabled": 1,
3009-
"commands": [
3010-
{
3011-
"name": "Identify",
3012-
"code": 0,
3013-
"mfgCode": null,
3014-
"source": "client",
3015-
"isIncoming": 0,
3016-
"isEnabled": 1
3017-
},
3018-
{
3019-
"name": "TriggerEffect",
3020-
"code": 64,
3021-
"mfgCode": null,
3022-
"source": "client",
3023-
"isIncoming": 0,
3024-
"isEnabled": 1
3025-
}
3026-
]
3027-
},
30283002
{
30293003
"name": "Identify",
30303004
"code": 3,

‎scripts/setup/zap.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"mac-amd64",
99
"windows-amd64"
1010
],
11-
"tags": ["version:2@v2024.10.24-nightly.1"]
11+
"tags": ["version:2@v2025.01.10-nightly.1"]
1212
},
1313
{
1414
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
1515
"path": "fuchsia/third_party/zap/mac-amd64",
1616
"platforms": ["mac-arm64"],
17-
"tags": ["version:2@v2024.10.24-nightly.1"]
17+
"tags": ["version:2@v2025.01.10-nightly.1"]
1818
}
1919
]
2020
}

‎scripts/setup/zap.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2024.10.24-nightly
1+
v2025.01.10-nightly

‎scripts/tools/zap/zap_execution.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
2424
# files may need updating for versions
2525
#
26-
MIN_ZAP_VERSION = '2024.10.24'
26+
MIN_ZAP_VERSION = '2025.1.10'
2727

2828

2929
class ZapTool:

0 commit comments

Comments
 (0)