Update ZAP to fix zapTypeToDecodableClusterObjectType to behave correctly. (#30692)
* Update ZAP to fix zapTypeToDecodableClusterObjectType to behave correctly.
Fixes https://github.com/project-chip/connectedhomeip/issues/30666
The zap_file_parser.py change fixes broken handling of null default values.
* Auto-update ZAP files.
* Regenerate generated code.
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 68ae1ef..b60127c 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -2387,7 +2387,7 @@
callback attribute clientList;
callback attribute partsList;
ram attribute featureMap default = 0;
- callback attribute clusterRevision default = 1;
+ callback attribute clusterRevision;
}
server cluster AccessControl {
@@ -2395,30 +2395,30 @@
emits event AccessControlExtensionChanged;
callback attribute acl;
callback attribute extension;
- callback attribute subjectsPerAccessControlEntry default = 4;
- callback attribute targetsPerAccessControlEntry default = 3;
- callback attribute accessControlEntriesPerFabric default = 4;
+ callback attribute subjectsPerAccessControlEntry;
+ callback attribute targetsPerAccessControlEntry;
+ callback attribute accessControlEntriesPerFabric;
callback attribute attributeList;
ram attribute featureMap default = 0;
- callback attribute clusterRevision default = 1;
+ callback attribute clusterRevision;
}
server cluster BasicInformation {
emits event StartUp;
emits event ShutDown;
emits event Leave;
- callback attribute dataModelRevision default = 10;
+ callback attribute dataModelRevision;
callback attribute vendorName;
callback attribute vendorID;
callback attribute productName;
callback attribute productID;
persist attribute nodeLabel;
- callback attribute location default = "XX";
- callback attribute hardwareVersion default = 0;
+ callback attribute location;
+ callback attribute hardwareVersion;
callback attribute hardwareVersionString;
- callback attribute softwareVersion default = 0;
+ callback attribute softwareVersion;
callback attribute softwareVersionString;
- callback attribute manufacturingDate default = "20210614123456ZZ";
+ callback attribute manufacturingDate;
callback attribute partNumber;
callback attribute productURL;
callback attribute productLabel;
@@ -2436,7 +2436,7 @@
emits event StateTransition;
emits event VersionApplied;
emits event DownloadError;
- callback attribute defaultOTAProviders default = 0;
+ callback attribute defaultOTAProviders;
ram attribute updatePossible default = 1;
ram attribute updateState default = 0;
ram attribute updateStateProgress default = 0;
@@ -2464,9 +2464,9 @@
server cluster GeneralCommissioning {
ram attribute breadcrumb default = 0x0000000000000000;
callback attribute basicCommissioningInfo;
- callback attribute regulatoryConfig default = 0;
- callback attribute locationCapability default = 0;
- callback attribute supportsConcurrentConnection default = 1;
+ callback attribute regulatoryConfig;
+ callback attribute locationCapability;
+ callback attribute supportsConcurrentConnection;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2514,9 +2514,9 @@
emits event NetworkFaultChange;
emits event BootReason;
callback attribute networkInterfaces;
- callback attribute rebootCount default = 0x0000;
- callback attribute upTime default = 0x0000000000000000;
- callback attribute totalOperationalHours default = 0x00000000;
+ callback attribute rebootCount;
+ callback attribute upTime;
+ callback attribute totalOperationalHours;
callback attribute bootReason;
callback attribute activeHardwareFaults;
callback attribute activeRadioFaults;
@@ -2532,10 +2532,10 @@
server cluster SoftwareDiagnostics {
callback attribute threadMetrics;
- callback attribute currentHeapFree default = 0x0000000000000000;
- callback attribute currentHeapUsed default = 0x0000000000000000;
- callback attribute currentHeapHighWatermark default = 0x0000000000000000;
- callback attribute featureMap default = 1;
+ callback attribute currentHeapFree;
+ callback attribute currentHeapUsed;
+ callback attribute currentHeapHighWatermark;
+ callback attribute featureMap;
ram attribute clusterRevision default = 1;
handle command ResetWatermarks;
@@ -2544,11 +2544,11 @@
server cluster ThreadNetworkDiagnostics {
callback attribute channel;
callback attribute routingRole;
- callback attribute networkName default = "0";
- callback attribute panId default = 0x0000;
- callback attribute extendedPanId default = 0x0000000000000000;
+ callback attribute networkName;
+ callback attribute panId;
+ callback attribute extendedPanId;
callback attribute meshLocalPrefix;
- callback attribute overrunCount default = 0x0000000000000000;
+ callback attribute overrunCount;
callback attribute neighborTable;
callback attribute routeTable;
callback attribute partitionId;
@@ -2556,53 +2556,53 @@
callback attribute dataVersion;
callback attribute stableDataVersion;
callback attribute leaderRouterId;
- callback attribute detachedRoleCount default = 0x0000;
- callback attribute childRoleCount default = 0x0000;
- callback attribute routerRoleCount default = 0x0000;
- callback attribute leaderRoleCount default = 0x0000;
- callback attribute attachAttemptCount default = 0x0000;
- callback attribute partitionIdChangeCount default = 0x0000;
- callback attribute betterPartitionAttachAttemptCount default = 0x0000;
- callback attribute parentChangeCount default = 0x0000;
- callback attribute txTotalCount default = 0x0000;
- callback attribute txUnicastCount default = 0x0000;
- callback attribute txBroadcastCount default = 0x0000;
- callback attribute txAckRequestedCount default = 0x0000;
- callback attribute txAckedCount default = 0x0000;
- callback attribute txNoAckRequestedCount default = 0x0000;
- callback attribute txDataCount default = 0x0000;
- callback attribute txDataPollCount default = 0x0000;
- callback attribute txBeaconCount default = 0x0000;
- callback attribute txBeaconRequestCount default = 0x0000;
- callback attribute txOtherCount default = 0x0000;
- callback attribute txRetryCount default = 0x0000;
- callback attribute txDirectMaxRetryExpiryCount default = 0x0000;
- callback attribute txIndirectMaxRetryExpiryCount default = 0x0000;
- callback attribute txErrCcaCount default = 0x0000;
- callback attribute txErrAbortCount default = 0x0000;
- callback attribute txErrBusyChannelCount default = 0x0000;
- callback attribute rxTotalCount default = 0x0000;
- callback attribute rxUnicastCount default = 0x0000;
- callback attribute rxBroadcastCount default = 0x0000;
- callback attribute rxDataCount default = 0x0000;
- callback attribute rxDataPollCount default = 0x0000;
- callback attribute rxBeaconCount default = 0x0000;
- callback attribute rxBeaconRequestCount default = 0x0000;
- callback attribute rxOtherCount default = 0x0000;
- callback attribute rxAddressFilteredCount default = 0x0000;
- callback attribute rxDestAddrFilteredCount default = 0x0000;
- callback attribute rxDuplicatedCount default = 0x0000;
- callback attribute rxErrNoFrameCount default = 0x0000;
- callback attribute rxErrUnknownNeighborCount default = 0x0000;
- callback attribute rxErrInvalidSrcAddrCount default = 0x0000;
- callback attribute rxErrSecCount default = 0x0000;
- callback attribute rxErrFcsCount default = 0x0000;
- callback attribute rxErrOtherCount default = 0x0000;
- callback attribute activeTimestamp default = 0x0000000000000000;
- callback attribute pendingTimestamp default = 0x0000000000000000;
- callback attribute delay default = 0x0000;
+ callback attribute detachedRoleCount;
+ callback attribute childRoleCount;
+ callback attribute routerRoleCount;
+ callback attribute leaderRoleCount;
+ callback attribute attachAttemptCount;
+ callback attribute partitionIdChangeCount;
+ callback attribute betterPartitionAttachAttemptCount;
+ callback attribute parentChangeCount;
+ callback attribute txTotalCount;
+ callback attribute txUnicastCount;
+ callback attribute txBroadcastCount;
+ callback attribute txAckRequestedCount;
+ callback attribute txAckedCount;
+ callback attribute txNoAckRequestedCount;
+ callback attribute txDataCount;
+ callback attribute txDataPollCount;
+ callback attribute txBeaconCount;
+ callback attribute txBeaconRequestCount;
+ callback attribute txOtherCount;
+ callback attribute txRetryCount;
+ callback attribute txDirectMaxRetryExpiryCount;
+ callback attribute txIndirectMaxRetryExpiryCount;
+ callback attribute txErrCcaCount;
+ callback attribute txErrAbortCount;
+ callback attribute txErrBusyChannelCount;
+ callback attribute rxTotalCount;
+ callback attribute rxUnicastCount;
+ callback attribute rxBroadcastCount;
+ callback attribute rxDataCount;
+ callback attribute rxDataPollCount;
+ callback attribute rxBeaconCount;
+ callback attribute rxBeaconRequestCount;
+ callback attribute rxOtherCount;
+ callback attribute rxAddressFilteredCount;
+ callback attribute rxDestAddrFilteredCount;
+ callback attribute rxDuplicatedCount;
+ callback attribute rxErrNoFrameCount;
+ callback attribute rxErrUnknownNeighborCount;
+ callback attribute rxErrInvalidSrcAddrCount;
+ callback attribute rxErrSecCount;
+ callback attribute rxErrFcsCount;
+ callback attribute rxErrOtherCount;
+ callback attribute activeTimestamp;
+ callback attribute pendingTimestamp;
+ callback attribute delay;
callback attribute securityPolicy;
- callback attribute channelPage0Mask default = "0x0000";
+ callback attribute channelPage0Mask;
callback attribute operationalDatasetComponents;
callback attribute activeNetworkFaultsList;
ram attribute featureMap default = 0x000F;
@@ -2618,16 +2618,16 @@
callback attribute bssid;
callback attribute securityType;
callback attribute wiFiVersion;
- callback attribute channelNumber default = 0x0000;
- callback attribute rssi default = 0x00;
- callback attribute beaconLostCount default = 0x00000000;
- callback attribute beaconRxCount default = 0x00000000;
- callback attribute packetMulticastRxCount default = 0x00000000;
- callback attribute packetMulticastTxCount default = 0x00000000;
- callback attribute packetUnicastRxCount default = 0x00000000;
- callback attribute packetUnicastTxCount default = 0x00000000;
- callback attribute currentMaxRate default = 0x0000000000000000;
- callback attribute overrunCount default = 0x0000000000000000;
+ callback attribute channelNumber;
+ callback attribute rssi;
+ callback attribute beaconLostCount;
+ callback attribute beaconRxCount;
+ callback attribute packetMulticastRxCount;
+ callback attribute packetMulticastTxCount;
+ callback attribute packetUnicastRxCount;
+ callback attribute packetUnicastTxCount;
+ callback attribute currentMaxRate;
+ callback attribute overrunCount;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;
@@ -2636,14 +2636,14 @@
server cluster EthernetNetworkDiagnostics {
callback attribute PHYRate;
- callback attribute fullDuplex default = 0x00;
- callback attribute packetRxCount default = 0x0000000000000000;
- callback attribute packetTxCount default = 0x0000000000000000;
- callback attribute txErrCount default = 0x0000000000000000;
- callback attribute collisionCount default = 0x0000000000000000;
- callback attribute overrunCount default = 0x0000000000000000;
- callback attribute carrierDetect default = 0x00;
- callback attribute timeSinceReset default = 0x0000000000000000;
+ callback attribute fullDuplex;
+ callback attribute packetRxCount;
+ callback attribute packetTxCount;
+ callback attribute txErrCount;
+ callback attribute collisionCount;
+ callback attribute overrunCount;
+ callback attribute carrierDetect;
+ callback attribute timeSinceReset;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;
@@ -2659,9 +2659,9 @@
}
server cluster AdministratorCommissioning {
- callback attribute windowStatus default = 0;
- callback attribute adminFabricIndex default = 1;
- callback attribute adminVendorId default = 0;
+ callback attribute windowStatus;
+ callback attribute adminFabricIndex;
+ callback attribute adminVendorId;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
@@ -2699,8 +2699,8 @@
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
- callback attribute featureMap default = 0;
- callback attribute clusterRevision default = 1;
+ callback attribute featureMap;
+ callback attribute clusterRevision;
handle command KeySetWrite;
handle command KeySetRead;
@@ -2833,7 +2833,7 @@
callback attribute clientList;
callback attribute partsList;
ram attribute featureMap default = 0;
- callback attribute clusterRevision default = 1;
+ callback attribute clusterRevision;
}
server cluster ColorControl {
