Skip to content

Commit

Permalink
Move lighting-app clusters from endpoint 1 to 0 (#6487)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vivien-apple @pull
vivien-apple authored and pull[bot] committed Jul 30, 2021
1 parent b937820 commit 4326364
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
48 changes: 24 additions & 24 deletions examples/lighting-app/lighting-common/gen/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define GENERATED_DEFAULTS \
{ \
\
/* Endpoint: 1, Cluster: Basic (server), big-endian */ \
/* Endpoint: 0, Cluster: Basic (server), big-endian */ \
\
/* 0 - VendorName, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -59,7 +59,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: General Commissioning (server), big-endian */ \
/* Endpoint: 0, Cluster: General Commissioning (server), big-endian */ \
\
/* 244 - FabricId, */ \
1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
Expand All @@ -72,7 +72,7 @@
#define GENERATED_DEFAULTS \
{ \
\
/* Endpoint: 1, Cluster: Basic (server), little-endian */ \
/* Endpoint: 0, Cluster: Basic (server), little-endian */ \
\
/* 0 - VendorName, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -104,7 +104,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: General Commissioning (server), little-endian */ \
/* Endpoint: 0, Cluster: General Commissioning (server), little-endian */ \
\
/* 244 - FabricId, */ \
1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
Expand Down Expand Up @@ -147,15 +147,15 @@
#define GENERATED_ATTRIBUTES \
{ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 0, Cluster: On/off (server) */ \
{ 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* on/off */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* cluster revision */ \
\
/* Endpoint: 1, Cluster: Level Control (server) */ \
/* Endpoint: 0, 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 */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
/* Endpoint: 0, Cluster: Basic (server) */ \
{ 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* InteractionModelVersion */ \
{ 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* VendorName */ \
{ 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorID */ \
Expand All @@ -173,12 +173,12 @@
ZAP_LONG_DEFAULTS_INDEX(180) }, /* SoftwareVersionString */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* cluster revision */ \
\
/* Endpoint: 1, Cluster: General Commissioning (server) */ \
/* Endpoint: 0, Cluster: General Commissioning (server) */ \
{ 0x0000, ZAP_TYPE(OCTET_STRING), 8, 0, ZAP_LONG_DEFAULTS_INDEX(244) }, /* FabricId */ \
{ 0x0001, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(252) }, /* Breadcrumb */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
\
/* Endpoint: 1, Cluster: Network Commissioning (server) */ \
/* Endpoint: 0, Cluster: Network Commissioning (server) */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* cluster revision */ \
}

Expand Down Expand Up @@ -208,25 +208,25 @@
3, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayOnOffServer \
}, /* Endpoint: 1, Cluster: On/off (server) */ \
}, /* Endpoint: 0, Cluster: On/off (server) */ \
{ 0x0008, \
ZAP_ATTRIBUTE_INDEX(2), \
2, \
3, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \
chipFuncArrayLevelControlServer }, /* Endpoint: 0, Cluster: Level Control (server) */ \
{ 0x0028, \
ZAP_ATTRIBUTE_INDEX(4), \
12, \
254, \
ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
chipFuncArrayBasicServer }, /* Endpoint: 1, Cluster: Basic (server) */ \
chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \
{ \
0x0030, ZAP_ATTRIBUTE_INDEX(16), 3, 18, ZAP_CLUSTER_MASK(SERVER), NULL \
}, /* Endpoint: 1, Cluster: General Commissioning (server) */ \
}, /* Endpoint: 0, Cluster: General Commissioning (server) */ \
{ \
0x0031, ZAP_ATTRIBUTE_INDEX(19), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \
}, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
}, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \
}

#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
Expand All @@ -253,7 +253,7 @@
// the array is the endpoint number.
#define FIXED_ENDPOINT_ARRAY \
{ \
0x0001 \
0x0000 \
}

// Array of profile ids
Expand Down Expand Up @@ -292,12 +292,12 @@
#define GENERATED_COMMANDS \
{ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 0, 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 */ \
\
/* Endpoint: 1, Cluster: Level Control (server) */ \
/* Endpoint: 0, Cluster: Level Control (server) */ \
{ 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MoveToLevel */ \
{ 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Move */ \
{ 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Step */ \
Expand All @@ -307,20 +307,20 @@
{ 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* StepWithOnOff */ \
{ 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* StopWithOnOff */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
/* Endpoint: 0, Cluster: Basic (server) */ \
{ 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* StartUp */ \
{ 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* ShutDown */ \
{ 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Leave */ \
\
/* Endpoint: 1, Cluster: General Commissioning (server) */ \
/* Endpoint: 0, Cluster: General Commissioning (server) */ \
{ 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* ArmFailSafe */ \
{ 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* ArmFailSafeResponse */ \
{ 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* SetRegulatoryConfig */ \
{ 0x0030, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* SetRegulatoryConfigResponse */ \
{ 0x0030, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* CommissioningComplete */ \
{ 0x0030, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* CommissioningCompleteResponse */ \
\
/* Endpoint: 1, Cluster: Network Commissioning (server) */ \
/* Endpoint: 0, Cluster: Network Commissioning (server) */ \
{ 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* ScanNetworks */ \
{ 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* ScanNetworksResponse */ \
{ 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* AddWiFiNetwork */ \
Expand Down Expand Up @@ -379,13 +379,13 @@
#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS \
{ \
\
/* Endpoint: 1, Cluster: On/off (server) */ \
/* Endpoint: 0, Cluster: On/off (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
ZAP_REPORT_DIRECTION(REPORTED), 0x0000, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* on/off */ \
\
/* Endpoint: 1, Cluster: Level Control (server) */ \
/* Endpoint: 0, Cluster: Level Control (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
ZAP_REPORT_DIRECTION(REPORTED), 0x0000, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* current level */ \
}
4 changes: 2 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1307,9 +1307,9 @@
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 0,
"profileId": "0x0104",
"endpointId": 1,
"endpointId": 0,
"networkId": 0
}
],
"log": []
}
}

0 comments on commit 4326364

Please sign in to comment.