Skip to content

Commit

Permalink
Zap update repo (#6314)
Browse files Browse the repository at this point in the history 
* Update ZAP repo

* Replace atomic.discrete by atomic.isDiscrete to accomodate ZAP update

* Update gen/ folder with the latest ZAP update
  • Loading branch information
@vivien-apple @pull
vivien-apple authored and pull[bot] committed Jul 14, 2021
1 parent 0709188 commit 1093454
Show file tree
Hide file tree
Showing 12 changed files with 2,204 additions and 2,088 deletions.
883 changes: 467 additions & 416 deletions examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

395 changes: 214 additions & 181 deletions examples/bridge-app/bridge-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

514 changes: 243 additions & 271 deletions examples/chip-tool/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

197 changes: 111 additions & 86 deletions examples/lighting-app/lighting-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

169 changes: 94 additions & 75 deletions examples/lock-app/lock-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

167 changes: 91 additions & 76 deletions examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

959 changes: 514 additions & 445 deletions examples/tv-app/tv-common/gen/endpoint_config.h
View file

Large diffs are not rendered by default.

63 changes: 31 additions & 32 deletions examples/window-app/common/gen/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,18 @@
#define GENERATED_ATTRIBUTE_COUNT 10
#define GENERATED_ATTRIBUTES \
{ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Window Covering (server): cluster revision */ \
{ 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Window Covering (server): window covering type */ \
{ 0x0003, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x0000) }, /* Window Covering (server): current position - lift */ \
{ 0x0004, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x0000) }, /* Window Covering (server): current position - tilt */ \
{ 0x0007, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(0x03) }, /* Window Covering (server): config status */ \
{ 0x0010, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x0000) }, /* Window Covering (server): installed open limit - lift */ \
{ 0x0011, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* Window Covering (server): installed closed limit - lift */ \
{ 0x0012, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x0000) }, /* Window Covering (server): installed open limit - tilt */ \
{ 0x0013, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* Window Covering (server): installed closed limit - tilt */ \
{ 0x0017, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0x14) }, /* Window Covering (server): mode */ \
\
/* Endpoint: 1, Cluster: Window Covering (server) */ \
{ 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* window covering type */ \
{ 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* current position - lift */ \
{ 0x0004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* current position - tilt */ \
{ 0x0007, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(0x03) }, /* config status */ \
{ 0x0010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* installed open limit - lift */ \
{ 0x0011, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* installed closed limit - lift */ \
{ 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* installed open limit - tilt */ \
{ 0x0013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* installed closed limit - tilt */ \
{ 0x0017, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x14) }, /* mode */ \
{ 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* cluster revision */ \
}

// This is an array of EmberAfCluster structures.
Expand Down Expand Up @@ -162,13 +157,15 @@
#define EMBER_AF_GENERATED_COMMAND_COUNT (7)
#define GENERATED_COMMANDS \
{ \
{ 0x0102, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringUpOpen */ \
{ 0x0102, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringDownClose */ \
{ 0x0102, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringStop */ \
{ 0x0102, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringGoToLiftValue */ \
{ 0x0102, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringGoToLiftPercentage */ \
{ 0x0102, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringGoToTiltValue */ \
{ 0x0102, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Window Covering (server): WindowCoveringGoToTiltPercentage */ \
\
/* Endpoint: 1, Cluster: Window Covering (server) */ \
{ 0x0102, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringUpOpen */ \
{ 0x0102, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringDownClose */ \
{ 0x0102, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringStop */ \
{ 0x0102, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringGoToLiftValue */ \
{ 0x0102, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringGoToLiftPercentage */ \
{ 0x0102, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringGoToTiltValue */ \
{ 0x0102, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* WindowCoveringGoToTiltPercentage */ \
}

// Array of EmberAfManufacturerCodeEntry structures for commands.
Expand Down Expand Up @@ -209,28 +206,30 @@
#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (8)
#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS \
{ \
\
/* Endpoint: 1, Cluster: Window Covering (server) */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "window covering type". side: server */ \
}, /* window covering type */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0003, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "current position - lift". side: server */ \
}, /* current position - lift */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0004, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "current position - tilt". side: server */ \
}, /* current position - tilt */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0007, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "config status". side: server */ \
}, /* config status */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0010, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "installed open limit - lift". side: server */ \
}, /* installed open limit - lift */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0011, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "installed closed limit - lift". side: server */ \
}, /* installed closed limit - lift */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0012, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "installed open limit - tilt". side: server */ \
}, /* installed open limit - tilt */ \
{ \
ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0102, 0x0013, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } } \
}, /* Reporting for cluster: "Window Covering", attribute: "installed closed limit - tilt". side: server */ \
}, /* installed closed limit - tilt */ \
}
2 changes: 1 addition & 1 deletion src/app/zap-templates/common/ClustersHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function handleBasic(item, [ atomics, enums, bitmaps, structs ])
item.name = item.name || item.label;
item.isStruct = false;
item.atomicTypeId = atomic.atomicId;
item.discrete = atomic.discrete;
item.discrete = atomic.isDiscrete;
item.size = atomic.size;
item.chipType = atomic.chipType;
// For the moment, SECURITY_KEY is unhandled.
Expand Down
Loading

0 comments on commit 1093454

Please sign in to comment.