Skip to content

Commit

Permalink
Tests - Log a useful message if the cluster name is not spelled appro…
Browse files Browse the repository at this point in the history 
…priately (#8750)

* Tests - Log a useful message if the cluster name is not spelled appropriately in Yaml tests

* Update gen/ folders
  • Loading branch information
@vivien-apple @pull
vivien-apple authored and pull[bot] committed Sep 22, 2021
1 parent 1dbc8c7 commit 3739763
Show file tree
Hide file tree
Showing 28 changed files with 122 additions and 115 deletions.
24 changes: 12 additions & 12 deletions examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 1, Cluster: On/off (server), big-endian */ \
/* Endpoint: 1, Cluster: On/Off (server), big-endian */ \
\
/* 3482 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -963,7 +963,7 @@
/* 10418 - total active power, */ \
0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 2, Cluster: On/off (server), big-endian */ \
/* Endpoint: 2, Cluster: On/Off (server), big-endian */ \
\
/* 10422 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -1387,7 +1387,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 1, Cluster: On/off (server), little-endian */ \
/* Endpoint: 1, Cluster: On/Off (server), little-endian */ \
\
/* 3482 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -1909,7 +1909,7 @@
/* 10418 - total active power, */ \
0x00, 0x00, 0x00, 0x00, \
\
/* Endpoint: 2, Cluster: On/off (server), little-endian */ \
/* Endpoint: 2, Cluster: On/Off (server), little-endian */ \
\
/* 10422 - FeatureMap, */ \
0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -2130,7 +2130,7 @@
{ 0x0004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* name support */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
{ 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \
{ 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* GlobalSceneControl */ \
{ 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* OnTime */ \
Expand Down Expand Up @@ -2451,7 +2451,7 @@
/* Endpoint: 1, Cluster: Binding (server) */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 2, Cluster: On/off (server) */ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
{ 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \
{ 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* GlobalSceneControl */ \
{ 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OnTime */ \
Expand Down Expand Up @@ -2588,7 +2588,7 @@
7, \
13, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \
{ 0x0008, \
ZAP_ATTRIBUTE_INDEX(144), \
5, \
Expand Down Expand Up @@ -2717,7 +2717,7 @@
7, \
13, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/off (server) */ \
chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \
{ 0x0406, \
ZAP_ATTRIBUTE_INDEX(381), \
4, \
Expand Down Expand Up @@ -2899,7 +2899,7 @@
{ 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* GetSceneMembership */ \
{ 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* GetSceneMembershipResponse */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
{ 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Off */ \
{ 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On */ \
{ 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Toggle */ \
Expand Down Expand Up @@ -3073,7 +3073,7 @@
{ 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Bind */ \
{ 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Unbind */ \
\
/* Endpoint: 2, Cluster: On/off (server) */ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
{ 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Off */ \
{ 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On */ \
{ 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Toggle */ \
Expand Down Expand Up @@ -3126,7 +3126,7 @@
ZAP_REPORT_DIRECTION(REPORTED), 0x0000, 0x0405, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* measured value */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* OnOff */ \
Expand Down Expand Up @@ -3266,7 +3266,7 @@
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0406, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* occupancy */ \
\
/* Endpoint: 2, Cluster: On/off (server) */ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0002, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* OnOff */ \
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/gen/gen_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING

// Use this macro to check if the server side of the On/off cluster is included
// Use this macro to check if the server side of the On/Off cluster is included
#define ZCL_USING_ON_OFF_CLUSTER_SERVER
#define EMBER_AF_PLUGIN_ON_OFF_SERVER
#define EMBER_AF_PLUGIN_ON_OFF
Expand Down
8 changes: 4 additions & 4 deletions examples/bridge-app/bridge-common/gen/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
{ 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2288) }, /* fabrics list */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* 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) }, /* ClusterRevision */ \
\
Expand Down Expand Up @@ -959,7 +959,7 @@
2, \
3, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \
{ 0x0008, \
ZAP_ATTRIBUTE_INDEX(104), \
2, \
Expand Down Expand Up @@ -1093,7 +1093,7 @@
{ 0x003E, 0xA1, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* AddTrustedRootCertificate */ \
{ 0x003E, 0xA2, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* RemoveTrustedRootCertificate */ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
{ 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Off */ \
{ 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On */ \
{ 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Toggle */ \
Expand Down Expand Up @@ -1148,7 +1148,7 @@
#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS \
{ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 1, Cluster: On/Off (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* OnOff */ \
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/gen/gen_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING

// Use this macro to check if the server side of the On/off cluster is included
// Use this macro to check if the server side of the On/Off cluster is included
#define ZCL_USING_ON_OFF_CLUSTER_SERVER
#define EMBER_AF_PLUGIN_ON_OFF_SERVER
#define EMBER_AF_PLUGIN_ON_OFF
Expand Down
Loading

0 comments on commit 3739763

Please sign in to comment.