Skip to content

Commit

Permalink
Update cluster revision and feature map definition to be closer to th…
Browse files Browse the repository at this point in the history 
…e spec (#8599)

* Update cluster revision and feature map definition to be closer to the spec

* Update gen/ folders
  • Loading branch information
@vivien-apple
vivien-apple authored Aug 4, 2021
1 parent 4f3fa5f commit 55e5f19
Show file tree
Hide file tree
Showing 28 changed files with 1,216 additions and 1,194 deletions.
338 changes: 169 additions & 169 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -132,7 +132,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand All @@ -158,7 +158,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -374,7 +374,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -425,7 +425,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -506,7 +506,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -605,7 +605,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -696,7 +696,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -741,7 +741,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -797,7 +797,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -832,7 +832,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -873,7 +873,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -1799,7 +1799,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand All @@ -1825,7 +1825,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -1926,7 +1926,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -1961,7 +1961,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2062,7 +2062,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2230,7 +2230,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2296,7 +2296,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2347,7 +2347,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2397,7 +2397,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2472,7 +2472,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2546,7 +2546,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2629,7 +2629,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2779,7 +2779,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2830,7 +2830,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -2871,7 +2871,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -2962,7 +2962,7 @@
],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -3003,7 +3003,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand All @@ -3029,7 +3029,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -3245,7 +3245,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand All @@ -3271,7 +3271,7 @@
"commands": [],
"attributes": [
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
Expand Down Expand Up @@ -3312,7 +3312,7 @@
"reportableChange": 0
},
{
"name": "cluster revision",
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
Expand Down
28 changes: 14 additions & 14 deletions examples/bridge-app/bridge-common/gen/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@
{ 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(254) }, /* server list */ \
{ 0x0002, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(508) }, /* client list */ \
{ 0x0003, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(762) }, /* parts list */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Basic (server) */ \
{ 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* InteractionModelVersion */ \
Expand All @@ -778,24 +778,24 @@
{ 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1176) }, /* SoftwareVersion */ \
{ 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_LONG_DEFAULTS_INDEX(1180) }, /* SoftwareVersionString */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: General Commissioning (server) */ \
{ 0x0000, ZAP_TYPE(OCTET_STRING), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1244) }, /* FabricId */ \
{ 0x0001, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1252) }, /* Breadcrumb */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Network Commissioning (server) */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: General Diagnostics (server) */ \
{ 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1260) }, /* NetworkInterfaces */ \
{ 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RebootCount */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
{ 0x0003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1514) }, /* CurrentHeapHighWatermark */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
{ 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \
Expand Down Expand Up @@ -858,42 +858,42 @@
{ 0x003C, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ChannelMask */ \
{ 0x003D, ZAP_TYPE(ARRAY), 14, 0, ZAP_LONG_DEFAULTS_INDEX(2224) }, /* OperationalDatasetComponents */ \
{ 0x003E, ZAP_TYPE(ARRAY), 4, 0, ZAP_LONG_DEFAULTS_INDEX(2238) }, /* ActiveNetworkFaultsList */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
{ 0x0000, ZAP_TYPE(OCTET_STRING), 6, 0, ZAP_LONG_DEFAULTS_INDEX(2242) }, /* bssid */ \
{ 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* SecurityType */ \
{ 0x0002, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* WiFiVersion */ \
{ 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ChannelNumber */ \
{ 0x0004, ZAP_TYPE(INT8S), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Rssi */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \
{ 0x0002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2248) }, /* PacketRxCount */ \
{ 0x0003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2256) }, /* PacketTxCount */ \
{ 0x0004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2264) }, /* TxErrCount */ \
{ 0x0005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2272) }, /* CollisionCount */ \
{ 0x0006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2280) }, /* OverrunCount */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Operational Credentials (server) */ \
{ 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2288) }, /* fabrics list */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
{ 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Level Control (server) */ \
{ 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current level */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Fixed Label (server) */ \
{ 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2542) }, /* label list */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
}

// This is an array of EmberAfCluster structures.
Expand Down
Loading

0 comments on commit 55e5f19

Please sign in to comment.