From 2563d51568fcd1d18a67c05addaa3c1b2e15aa9e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 12 Jan 2023 14:42:09 -0500 Subject: [PATCH] Regenerate generated code. --- .../placeholder/linux/apps/app1/config.matter | 12 +- .../placeholder/linux/apps/app2/config.matter | 12 +- .../python/chip/clusters/Objects.py | 18 +-- .../MTRAttributeTLVValueDecoder.mm | 12 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 24 ++-- .../zap-generated/endpoint_config.h | 12 +- .../zap-generated/endpoint_config.h | 12 +- .../zap-generated/attributes/Accessors.cpp | 12 +- .../zap-generated/attributes/Accessors.h | 12 +- .../zap-generated/cluster-objects.cpp | 12 +- .../zap-generated/cluster-objects.h | 24 ++-- .../app-common/zap-generated/ids/Attributes.h | 12 +- .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/cluster/Commands.h | 32 +++--- .../cluster/logging/DataModelLogger.cpp | 30 ++--- .../chip-tool/zap-generated/test/Commands.h | 6 +- .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/cluster/Commands.h | 108 +++++++++--------- .../zap-generated/test/Commands.h | 18 +-- .../zap-generated/endpoint_config.h | 6 +- .../placeholder/app1/zap-generated/access.h | 108 +++++++++--------- .../app1/zap-generated/endpoint_config.h | 45 ++++---- .../app1/zap-generated/test/Commands.h | 6 +- .../placeholder/app2/zap-generated/access.h | 108 +++++++++--------- .../app2/zap-generated/endpoint_config.h | 45 ++++---- .../app2/zap-generated/test/Commands.h | 6 +- 26 files changed, 351 insertions(+), 353 deletions(-) diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 956a3eead3b7d5..f0b9ac7a31f660 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2139,9 +2139,9 @@ server cluster OccupancySensing = 1030 { readonly attribute bitmap8 occupancy = 0; readonly attribute enum8 occupancySensorType = 1; readonly attribute bitmap8 occupancySensorTypeBitmap = 2; - attribute access(write: manage) int16u pirOccupiedToUnoccupiedDelay = 16; - attribute access(write: manage) int16u pirUnoccupiedToOccupiedDelay = 17; - attribute access(write: manage) int8u pirUnoccupiedToOccupiedThreshold = 18; + attribute access(write: manage) int16u PIROccupiedToUnoccupiedDelay = 16; + attribute access(write: manage) int16u PIRUnoccupiedToOccupiedDelay = 17; + attribute access(write: manage) int8u PIRUnoccupiedToOccupiedThreshold = 18; attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32; attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33; attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34; @@ -3242,9 +3242,9 @@ endpoint 1 { ram attribute occupancy; ram attribute occupancySensorType; ram attribute occupancySensorTypeBitmap; - ram attribute pirOccupiedToUnoccupiedDelay; - ram attribute pirUnoccupiedToOccupiedDelay; - ram attribute pirUnoccupiedToOccupiedThreshold default = 1; + ram attribute PIROccupiedToUnoccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedThreshold default = 1; ram attribute ultrasonicOccupiedToUnoccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedThreshold default = 1; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 0e5ab941009479..1269986c1b9626 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2116,9 +2116,9 @@ server cluster OccupancySensing = 1030 { readonly attribute bitmap8 occupancy = 0; readonly attribute enum8 occupancySensorType = 1; readonly attribute bitmap8 occupancySensorTypeBitmap = 2; - attribute access(write: manage) int16u pirOccupiedToUnoccupiedDelay = 16; - attribute access(write: manage) int16u pirUnoccupiedToOccupiedDelay = 17; - attribute access(write: manage) int8u pirUnoccupiedToOccupiedThreshold = 18; + attribute access(write: manage) int16u PIROccupiedToUnoccupiedDelay = 16; + attribute access(write: manage) int16u PIRUnoccupiedToOccupiedDelay = 17; + attribute access(write: manage) int8u PIRUnoccupiedToOccupiedThreshold = 18; attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32; attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33; attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34; @@ -3217,9 +3217,9 @@ endpoint 1 { ram attribute occupancy; ram attribute occupancySensorType; ram attribute occupancySensorTypeBitmap; - ram attribute pirOccupiedToUnoccupiedDelay; - ram attribute pirUnoccupiedToOccupiedDelay; - ram attribute pirUnoccupiedToOccupiedThreshold default = 1; + ram attribute PIROccupiedToUnoccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedThreshold default = 1; ram attribute ultrasonicOccupiedToUnoccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedThreshold default = 1; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 92cab8362db39a..728066242d831a 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -21200,9 +21200,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="occupancy", Tag=0x00000000, Type=uint), ClusterObjectFieldDescriptor(Label="occupancySensorType", Tag=0x00000001, Type=uint), ClusterObjectFieldDescriptor(Label="occupancySensorTypeBitmap", Tag=0x00000002, Type=uint), - ClusterObjectFieldDescriptor(Label="pirOccupiedToUnoccupiedDelay", Tag=0x00000010, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="pirUnoccupiedToOccupiedDelay", Tag=0x00000011, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="pirUnoccupiedToOccupiedThreshold", Tag=0x00000012, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIROccupiedToUnoccupiedDelay", Tag=0x00000010, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIRUnoccupiedToOccupiedDelay", Tag=0x00000011, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIRUnoccupiedToOccupiedThreshold", Tag=0x00000012, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicOccupiedToUnoccupiedDelay", Tag=0x00000020, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicUnoccupiedToOccupiedDelay", Tag=0x00000021, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicUnoccupiedToOccupiedThreshold", Tag=0x00000022, Type=typing.Optional[uint]), @@ -21219,9 +21219,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: occupancy: 'uint' = None occupancySensorType: 'uint' = None occupancySensorTypeBitmap: 'uint' = None - pirOccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None - pirUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None - pirUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None + PIROccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None + PIRUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None + PIRUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None ultrasonicOccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None ultrasonicUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None ultrasonicUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None @@ -21287,7 +21287,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = 0 @dataclass - class PirOccupiedToUnoccupiedDelay(ClusterAttributeDescriptor): + class PIROccupiedToUnoccupiedDelay(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 @@ -21303,7 +21303,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class PirUnoccupiedToOccupiedDelay(ClusterAttributeDescriptor): + class PIRUnoccupiedToOccupiedDelay(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 @@ -21319,7 +21319,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class PirUnoccupiedToOccupiedThreshold(ClusterAttributeDescriptor): + class PIRUnoccupiedToOccupiedThreshold(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index b0508b5329ac82..09a82066f180e0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -12493,8 +12493,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::PirOccupiedToUnoccupiedDelay::Id: { - using TypeInfo = Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + case Attributes::PIROccupiedToUnoccupiedDelay::Id: { + using TypeInfo = Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -12504,8 +12504,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } - case Attributes::PirUnoccupiedToOccupiedDelay::Id: { - using TypeInfo = Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + case Attributes::PIRUnoccupiedToOccupiedDelay::Id: { + using TypeInfo = Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -12515,8 +12515,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } - case Attributes::PirUnoccupiedToOccupiedThreshold::Id: { - using TypeInfo = Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + case Attributes::PIRUnoccupiedToOccupiedThreshold::Id: { + using TypeInfo = Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index c8b4e71e2127da..c0384e7403a061 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -80149,7 +80149,7 @@ - (void)readAttributePIROccupiedToUnoccupiedDelayWithCompletion:(void (^)(NSNumb NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80181,7 +80181,7 @@ - (void)writeAttributePIROccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedShortValue; @@ -80197,7 +80197,7 @@ - (void)subscribeAttributePIROccupiedToUnoccupiedDelayWithParams:(MTRSubscribePa reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80214,7 +80214,7 @@ + (void)readAttributePIROccupiedToUnoccupiedDelayWithClusterStateCache:(MTRClust clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -80233,7 +80233,7 @@ - (void)readAttributePIRUnoccupiedToOccupiedDelayWithCompletion:(void (^)(NSNumb NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80265,7 +80265,7 @@ - (void)writeAttributePIRUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedShortValue; @@ -80281,7 +80281,7 @@ - (void)subscribeAttributePIRUnoccupiedToOccupiedDelayWithParams:(MTRSubscribePa reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80298,7 +80298,7 @@ + (void)readAttributePIRUnoccupiedToOccupiedDelayWithClusterStateCache:(MTRClust clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -80317,7 +80317,7 @@ - (void)readAttributePIRUnoccupiedToOccupiedThresholdWithCompletion:(void (^)(NS NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80350,7 +80350,7 @@ - (void)writeAttributePIRUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Non } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; @@ -80366,7 +80366,7 @@ - (void)subscribeAttributePIRUnoccupiedToOccupiedThresholdWithParams:(MTRSubscri reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80384,7 +80384,7 @@ + (void)readAttributePIRUnoccupiedToOccupiedThresholdWithClusterStateCache: clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 14e9b024dfebe1..cd407f788a1985 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1200,9 +1200,9 @@ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -1468,9 +1468,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 994d8d9bcf6ce2..93181281e7193b 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -762,9 +762,9 @@ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -991,9 +991,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index b14c05369fffce..4e84c5a3b4a7f2 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -21920,7 +21920,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -21949,9 +21949,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -21980,9 +21980,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -22011,7 +22011,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 2303534ce5f682..c9989bcdfcff92 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -3652,20 +3652,20 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 50f984dc7acf6a..d948a710ffaf92 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -15329,14 +15329,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); break; - case Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirOccupiedToUnoccupiedDelay)); + case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); break; - case Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedDelay)); + case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); break; - case Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedThreshold)); + case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); break; case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 62a0fb93405645..60cea9891f6a92 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -20302,7 +20302,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { struct TypeInfo { using Type = uint16_t; @@ -20310,11 +20310,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirOccupiedToUnoccupiedDelay::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIROccupiedToUnoccupiedDelay::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirOccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +} // namespace PIROccupiedToUnoccupiedDelay +namespace PIRUnoccupiedToOccupiedDelay { struct TypeInfo { using Type = uint16_t; @@ -20322,11 +20322,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirUnoccupiedToOccupiedDelay::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIRUnoccupiedToOccupiedDelay::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +} // namespace PIRUnoccupiedToOccupiedDelay +namespace PIRUnoccupiedToOccupiedThreshold { struct TypeInfo { using Type = uint8_t; @@ -20334,10 +20334,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirUnoccupiedToOccupiedThreshold::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIRUnoccupiedToOccupiedThreshold::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { struct TypeInfo { @@ -20452,9 +20452,9 @@ struct TypeInfo Attributes::Occupancy::TypeInfo::DecodableType occupancy = static_cast(0); Attributes::OccupancySensorType::TypeInfo::DecodableType occupancySensorType = static_cast(0); Attributes::OccupancySensorTypeBitmap::TypeInfo::DecodableType occupancySensorTypeBitmap = static_cast(0); - Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::DecodableType pirOccupiedToUnoccupiedDelay = static_cast(0); - Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::DecodableType pirUnoccupiedToOccupiedDelay = static_cast(0); - Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::DecodableType pirUnoccupiedToOccupiedThreshold = + Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::DecodableType PIROccupiedToUnoccupiedDelay = static_cast(0); + Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::DecodableType PIRUnoccupiedToOccupiedDelay = static_cast(0); + Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::DecodableType PIRUnoccupiedToOccupiedThreshold = static_cast(0); Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::DecodableType ultrasonicOccupiedToUnoccupiedDelay = static_cast(0); diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index f04936cff351f7..d1bc7423343744 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -3580,17 +3580,17 @@ namespace OccupancySensorTypeBitmap { static constexpr AttributeId Id = 0x00000002; } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { static constexpr AttributeId Id = 0x00000010; -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { static constexpr AttributeId Id = 0x00000011; -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { static constexpr AttributeId Id = 0x00000012; -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { static constexpr AttributeId Id = 0x00000020; diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h index 481d29fb2f25c1..038da5c85e0cc5 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h @@ -281,9 +281,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_SIMPLE_DEFAULT(0x1), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_SIMPLE_DEFAULT(0x1), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index fe85a94a241f75..5d49ded1f99e8e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -5894,9 +5894,9 @@ class ColorControlStepColorTemperature : public ClusterCommand | * Occupancy | 0x0000 | | * OccupancySensorType | 0x0001 | | * OccupancySensorTypeBitmap | 0x0002 | -| * PirOccupiedToUnoccupiedDelay | 0x0010 | -| * PirUnoccupiedToOccupiedDelay | 0x0011 | -| * PirUnoccupiedToOccupiedThreshold | 0x0012 | +| * PIROccupiedToUnoccupiedDelay | 0x0010 | +| * PIRUnoccupiedToOccupiedDelay | 0x0011 | +| * PIRUnoccupiedToOccupiedThreshold | 0x0012 | | * UltrasonicOccupiedToUnoccupiedDelay | 0x0020 | | * UltrasonicUnoccupiedToOccupiedDelay | 0x0021 | | * UltrasonicUnoccupiedToOccupiedThreshold | 0x0022 | @@ -12040,11 +12040,11 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // make_unique(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id, credsIssuerConfig), // - make_unique(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id, + make_unique(Id, "piroccupied-to-unoccupied-delay", Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id, + make_unique(Id, "pirunoccupied-to-occupied-delay", Attributes::PIRUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-threshold", Attributes::PirUnoccupiedToOccupiedThreshold::Id, + make_unique(Id, "pirunoccupied-to-occupied-threshold", Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-occupied-to-unoccupied-delay", Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // @@ -12064,12 +12064,12 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "pir-occupied-to-unoccupied-delay", 0, UINT16_MAX, - Attributes::PirOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique>(Id, "pir-unoccupied-to-occupied-delay", 0, UINT16_MAX, - Attributes::PirUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // - make_unique>(Id, "pir-unoccupied-to-occupied-threshold", 0, UINT8_MAX, - Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // + make_unique>(Id, "piroccupied-to-unoccupied-delay", 0, UINT16_MAX, + Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // + make_unique>(Id, "pirunoccupied-to-occupied-delay", 0, UINT16_MAX, + Attributes::PIRUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // + make_unique>(Id, "pirunoccupied-to-occupied-threshold", 0, UINT8_MAX, + Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique>(Id, "ultrasonic-occupied-to-unoccupied-delay", 0, UINT16_MAX, Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // make_unique>(Id, "ultrasonic-unoccupied-to-occupied-delay", 0, UINT16_MAX, @@ -12087,12 +12087,12 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // make_unique(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id, credsIssuerConfig), // - make_unique(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id, + make_unique(Id, "piroccupied-to-unoccupied-delay", Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id, + make_unique(Id, "pirunoccupied-to-occupied-delay", Attributes::PIRUnoccupiedToOccupiedDelay::Id, + credsIssuerConfig), // + make_unique(Id, "pirunoccupied-to-occupied-threshold", Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-threshold", - Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-occupied-to-unoccupied-delay", Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-unoccupied-to-occupied-delay", diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index b8d98ea160ab6d..58f7aa6449f37b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -8405,62 +8405,62 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case OccupancySensing::Attributes::Occupancy::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy", 1, value); + return DataModelLogger::LogValue("Occupancy", 1, value); } case OccupancySensing::Attributes::OccupancySensorType::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy sensor type", 1, value); + return DataModelLogger::LogValue("OccupancySensorType", 1, value); } case OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy sensor type bitmap", 1, value); + return DataModelLogger::LogValue("OccupancySensorTypeBitmap", 1, value); } - case OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id: { + case OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("PIROccupiedToUnoccupiedDelay", 1, value); } - case OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id: { + case OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("PIRUnoccupiedToOccupiedDelay", 1, value); } - case OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id: { + case OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("PIRUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("UltrasonicOccupiedToUnoccupiedDelay", 1, value); } case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("UltrasonicUnoccupiedToOccupiedDelay", 1, value); } case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("UltrasonicUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("PhysicalContactOccupiedToUnoccupiedDelay", 1, value); } case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("PhysicalContactUnoccupiedToOccupiedDelay", 1, value); } case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("PhysicalContactUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 5733c20be38e39..fa9fedc7fdb278 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -33614,19 +33614,19 @@ class Test_TC_OCC_2_1Suite : public TestCommand LogStep(4, "Reads optional attribute: PIROccupiedToUnoccupiedDelay"); VerifyOrDo(!ShouldSkip("OCC.S.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id, true, chip::NullOptional); } case 5: { LogStep(5, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay"); VerifyOrDo(!ShouldSkip("OCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional); } case 6: { LogStep(6, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold"); VerifyOrDo(!ShouldSkip("OCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional); } case 7: { LogStep(7, "Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay"); diff --git a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h index 8264a2f08d5509..aea341e7462b36 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h @@ -458,9 +458,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index a48c4bdcd29c85..7c80e1842df4d9 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -66332,9 +66332,9 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs | * Occupancy | 0x0000 | | * OccupancySensorType | 0x0001 | | * OccupancySensorTypeBitmap | 0x0002 | -| * PirOccupiedToUnoccupiedDelay | 0x0010 | -| * PirUnoccupiedToOccupiedDelay | 0x0011 | -| * PirUnoccupiedToOccupiedThreshold | 0x0012 | +| * PIROccupiedToUnoccupiedDelay | 0x0010 | +| * PIRUnoccupiedToOccupiedDelay | 0x0011 | +| * PIRUnoccupiedToOccupiedThreshold | 0x0012 | | * UltrasonicOccupiedToUnoccupiedDelay | 0x0020 | | * UltrasonicUnoccupiedToOccupiedDelay | 0x0021 | | * UltrasonicUnoccupiedToOccupiedThreshold | 0x0022 | @@ -66561,16 +66561,16 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Subsc }; /* - * Attribute PirOccupiedToUnoccupiedDelay + * Attribute PIROccupiedToUnoccupiedDelay */ -class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute { +class ReadOccupancySensingPIROccupiedToUnoccupiedDelay : public ReadAttribute { public: - ReadOccupancySensingPirOccupiedToUnoccupiedDelay() - : ReadAttribute("pir-occupied-to-unoccupied-delay") + ReadOccupancySensingPIROccupiedToUnoccupiedDelay() + : ReadAttribute("piroccupied-to-unoccupied-delay") { } - ~ReadOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~ReadOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66591,17 +66591,17 @@ class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute { } }; -class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute { +class WriteOccupancySensingPIROccupiedToUnoccupiedDelay : public WriteAttribute { public: - WriteOccupancySensingPirOccupiedToUnoccupiedDelay() - : WriteAttribute("pir-occupied-to-unoccupied-delay") + WriteOccupancySensingPIROccupiedToUnoccupiedDelay() + : WriteAttribute("piroccupied-to-unoccupied-delay") { - AddArgument("attr-name", "pir-occupied-to-unoccupied-delay"); + AddArgument("attr-name", "piroccupied-to-unoccupied-delay"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~WriteOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66633,14 +66633,14 @@ class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute uint16_t mValue; }; -class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() - : SubscribeAttribute("pir-occupied-to-unoccupied-delay") + SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay() + : SubscribeAttribute("piroccupied-to-unoccupied-delay") { } - ~SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66673,16 +66673,16 @@ class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public Su }; /* - * Attribute PirUnoccupiedToOccupiedDelay + * Attribute PIRUnoccupiedToOccupiedDelay */ -class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute { +class ReadOccupancySensingPIRUnoccupiedToOccupiedDelay : public ReadAttribute { public: - ReadOccupancySensingPirUnoccupiedToOccupiedDelay() - : ReadAttribute("pir-unoccupied-to-occupied-delay") + ReadOccupancySensingPIRUnoccupiedToOccupiedDelay() + : ReadAttribute("pirunoccupied-to-occupied-delay") { } - ~ReadOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~ReadOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66703,17 +66703,17 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute { } }; -class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute { +class WriteOccupancySensingPIRUnoccupiedToOccupiedDelay : public WriteAttribute { public: - WriteOccupancySensingPirUnoccupiedToOccupiedDelay() - : WriteAttribute("pir-unoccupied-to-occupied-delay") + WriteOccupancySensingPIRUnoccupiedToOccupiedDelay() + : WriteAttribute("pirunoccupied-to-occupied-delay") { - AddArgument("attr-name", "pir-unoccupied-to-occupied-delay"); + AddArgument("attr-name", "pirunoccupied-to-occupied-delay"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~WriteOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66745,14 +66745,14 @@ class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute uint16_t mValue; }; -class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() - : SubscribeAttribute("pir-unoccupied-to-occupied-delay") + SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay() + : SubscribeAttribute("pirunoccupied-to-occupied-delay") { } - ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66785,16 +66785,16 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public Su }; /* - * Attribute PirUnoccupiedToOccupiedThreshold + * Attribute PIRUnoccupiedToOccupiedThreshold */ -class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribute { +class ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold : public ReadAttribute { public: - ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() - : ReadAttribute("pir-unoccupied-to-occupied-threshold") + ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : ReadAttribute("pirunoccupied-to-occupied-threshold") { } - ~ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66816,17 +66816,17 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribut } }; -class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttribute { +class WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold : public WriteAttribute { public: - WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() - : WriteAttribute("pir-unoccupied-to-occupied-threshold") + WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : WriteAttribute("pirunoccupied-to-occupied-threshold") { - AddArgument("attr-name", "pir-unoccupied-to-occupied-threshold"); + AddArgument("attr-name", "pirunoccupied-to-occupied-threshold"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66858,14 +66858,14 @@ class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttrib uint8_t mValue; }; -class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() - : SubscribeAttribute("pir-unoccupied-to-occupied-threshold") + SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : SubscribeAttribute("pirunoccupied-to-occupied-threshold") { } - ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -99982,15 +99982,15 @@ void registerClusterOccupancySensing(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 8ac138182e76fc..213b63d71e8576 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -46191,9 +46191,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U)); + VerifyOrReturn(CheckConstraintType("PIROccupiedToUnoccupiedDelay", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("PIROccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("PIROccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U)); NextTest(); }]; @@ -46213,9 +46213,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U)); + VerifyOrReturn(CheckConstraintType("PIRUnoccupiedToOccupiedDelay", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("PIRUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("PIRUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U)); NextTest(); }]; @@ -46236,9 +46236,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); - VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U)); + VerifyOrReturn(CheckConstraintType("PIRUnoccupiedToOccupiedThreshold", "int8u", "int8u")); + VerifyOrReturn(CheckConstraintMinValue("PIRUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); + VerifyOrReturn(CheckConstraintMaxValue("PIRUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U)); NextTest(); }]; diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index b1bbd547b2bdaf..4b582f53bd45af 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -536,9 +536,9 @@ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ } diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h index 18f8654709c020..7a7b12c11402f4 100644 --- a/zzz_generated/placeholder/app1/zap-generated/access.h +++ b/zzz_generated/placeholder/app1/zap-generated/access.h @@ -56,15 +56,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -96,15 +96,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -136,15 +136,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -173,15 +173,15 @@ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -208,15 +208,15 @@ 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - 16, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - 17, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - 18, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - 32, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - 33, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - 34, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - 48, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - 49, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - 50, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + 16, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + 17, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 18, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 32, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 33, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 34, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 48, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 49, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 50, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -243,15 +243,15 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index 733387d4580ba1..0bca50e28c4e1b 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -105,17 +105,17 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF }, /* StartUpColorTemperatureMireds */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIR occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIR unoccupied to occupied delay */ \ - { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* PIR unoccupied to occupied threshold */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* ultrasonic occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* ultrasonic unoccupied to occupied delay */ \ - { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* ultrasonic unoccupied to occupied threshold */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* physical contact occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* physical contact unoccupied to occupied delay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIROccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIRUnoccupiedToOccupiedDelay */ \ + { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* PIRUnoccupiedToOccupiedThreshold */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* UltrasonicOccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* UltrasonicUnoccupiedToOccupiedDelay */ \ + { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* UltrasonicUnoccupiedToOccupiedThreshold */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PhysicalContactOccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PhysicalContactUnoccupiedToOccupiedDelay */ \ { \ (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE \ - } /* physical contact unoccupied to occupied threshold */ \ + } /* PhysicalContactUnoccupiedToOccupiedThreshold */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -666,29 +666,28 @@ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(18), 0x00000010, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIROccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(19), 0x00000011, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIRUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(20), 0x00000012, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR unoccupied to occupied threshold */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIRUnoccupiedToOccupiedThreshold */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(21), 0x00000020, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicOccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000021, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000022, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic unoccupied to occupied threshold */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicUnoccupiedToOccupiedThreshold */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000030, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactOccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000031, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000032, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | \ - ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact unoccupied to occupied threshold */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactUnoccupiedToOccupiedThreshold */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index 1bf2477979ebdf..4aada24db450e7 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -2035,19 +2035,19 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand LogStep(4, "DUT reads from the TH the (0x0010) PIROccupiedToUnoccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id); } case 5: { LogStep(5, "DUT reads from the TH the (0x0011) PIRUnoccupiedToOccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id); } case 6: { LogStep(6, "DUT reads from the TH the (0x0012) PIRUnoccupiedToOccupiedThreshold optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id); } case 7: { LogStep(7, "DUT reads from the TH the (0x0020) UltrasonicOccupiedToUnoccupiedDelay optional attribute"); diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h index 18f8654709c020..7a7b12c11402f4 100644 --- a/zzz_generated/placeholder/app2/zap-generated/access.h +++ b/zzz_generated/placeholder/app2/zap-generated/access.h @@ -56,15 +56,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -96,15 +96,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -136,15 +136,15 @@ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: view */ \ - /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: view */ \ + /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -173,15 +173,15 @@ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - 1030, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 1030, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -208,15 +208,15 @@ 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - 16, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - 17, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - 18, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - 32, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - 33, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - 34, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - 48, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - 49, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - 50, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + 16, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + 17, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 18, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 32, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 33, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 34, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + 48, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + 49, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + 50, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -243,15 +243,15 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied threshold, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: ultrasonic unoccupied to occupied threshold, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact occupied to unoccupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied delay, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: physical contact unoccupied to occupied threshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIROccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIRUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicOccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: UltrasonicUnoccupiedToOccupiedThreshold, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactOccupiedToUnoccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedDelay, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PhysicalContactUnoccupiedToOccupiedThreshold, Privilege: manage */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index e9e35610038173..a07f3035642cde 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -105,17 +105,17 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF }, /* StartUpColorTemperatureMireds */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIR occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIR unoccupied to occupied delay */ \ - { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* PIR unoccupied to occupied threshold */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* ultrasonic occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* ultrasonic unoccupied to occupied delay */ \ - { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* ultrasonic unoccupied to occupied threshold */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* physical contact occupied to unoccupied delay */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* physical contact unoccupied to occupied delay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIROccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PIRUnoccupiedToOccupiedDelay */ \ + { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* PIRUnoccupiedToOccupiedThreshold */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* UltrasonicOccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* UltrasonicUnoccupiedToOccupiedDelay */ \ + { (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE }, /* UltrasonicUnoccupiedToOccupiedThreshold */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PhysicalContactOccupiedToUnoccupiedDelay */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFFFE }, /* PhysicalContactUnoccupiedToOccupiedDelay */ \ { \ (uint16_t) 0x1, (uint16_t) 0x1, (uint16_t) 0xFE \ - } /* physical contact unoccupied to occupied threshold */ \ + } /* PhysicalContactUnoccupiedToOccupiedThreshold */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -666,29 +666,28 @@ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(18), 0x00000010, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIROccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(19), 0x00000011, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIRUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(20), 0x00000012, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIR unoccupied to occupied threshold */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PIRUnoccupiedToOccupiedThreshold */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(21), 0x00000020, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicOccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000021, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000022, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ultrasonic unoccupied to occupied threshold */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UltrasonicUnoccupiedToOccupiedThreshold */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000030, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact occupied to unoccupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactOccupiedToUnoccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000031, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact unoccupied to occupied delay */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactUnoccupiedToOccupiedDelay */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000032, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | \ - ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* physical contact unoccupied to occupied threshold */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* PhysicalContactUnoccupiedToOccupiedThreshold */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index 1bf2477979ebdf..4aada24db450e7 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -2035,19 +2035,19 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand LogStep(4, "DUT reads from the TH the (0x0010) PIROccupiedToUnoccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id); } case 5: { LogStep(5, "DUT reads from the TH the (0x0011) PIRUnoccupiedToOccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id); } case 6: { LogStep(6, "DUT reads from the TH the (0x0012) PIRUnoccupiedToOccupiedThreshold optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id); } case 7: { LogStep(7, "DUT reads from the TH the (0x0020) UltrasonicOccupiedToUnoccupiedDelay optional attribute");