From 47fca5b82787a7aa483f1ec2d35556a81352d1fe Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Fri, 26 Nov 2021 10:58:04 -0500 Subject: [PATCH] Remove Sample Extensions from On-Off cluster (#12198) * Remove Sample Extensions from On-Off cluster * scripts/tools/zap_regen_all.py --- src/app/zap-templates/zcl/zcl.json | 1 - .../python/chip/clusters/Objects.py | 298 -------------- .../zap-generated/CHIPCommandPayloadsObjc.h | 10 - .../zap-generated/CHIPCommandPayloadsObjc.mm | 22 - .../app-common/zap-generated/attribute-id.h | 20 - .../zap-generated/attributes/Accessors.cpp | 246 ----------- .../zap-generated/attributes/Accessors.h | 52 --- .../app-common/zap-generated/callback.h | 266 ------------ .../zap-generated/callbacks/PluginCallbacks.h | 4 - .../app-common/zap-generated/cluster-id.h | 6 - .../zap-generated/cluster-objects.cpp | 236 ----------- .../zap-generated/cluster-objects.h | 383 ------------------ .../app-common/zap-generated/command-id.h | 11 - .../app-common/zap-generated/ids/Attributes.h | 60 --- .../app-common/zap-generated/ids/Clusters.h | 6 - .../app-common/zap-generated/ids/Commands.h | 40 -- .../app-common/zap-generated/print-cluster.h | 17 +- 17 files changed, 1 insertion(+), 1677 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 4da0010d156f46..ca8ada6228555b 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -61,7 +61,6 @@ "ha-devices.xml", "ha.xml", "lo-devices.xml", - "sample-extensions.xml", "types.xml", "zll-devices.xml", "zll.xml" diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d3fb94a053361e..afd713c4f205e2 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -2168,18 +2168,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ]) - @dataclass - class SampleMfgSpecificOffWithTransition(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0006 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ]) - @dataclass class On(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0006 @@ -2192,30 +2180,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ]) - @dataclass - class SampleMfgSpecificOnWithTransition(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0006 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ]) - - @dataclass - class SampleMfgSpecificOnWithTransition2(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0006 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ]) - @dataclass class Toggle(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0006 @@ -2228,30 +2192,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ]) - @dataclass - class SampleMfgSpecificToggleWithTransition(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0006 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ]) - - @dataclass - class SampleMfgSpecificToggleWithTransition2(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0006 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ]) - @dataclass class OffWithEffect(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0006 @@ -2322,70 +2262,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'bool' = None - @dataclass - class SampleMfgSpecificAttribute0x00000x1002(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0006 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class SampleMfgSpecificAttribute0x00000x1049(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0006 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class SampleMfgSpecificAttribute0x00010x1002(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0006 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0001 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class SampleMfgSpecificAttribute0x00010x1040(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0006 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0001 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - @dataclass class GlobalSceneControl(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -29271,177 +29147,3 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: return ClusterObjectFieldDescriptor(Type=uint) value: 'uint' = None - - -@dataclass -class SampleMfgSpecificCluster(Cluster): - id: typing.ClassVar[int] = 0xFC00 - - class Commands: - @dataclass - class CommandOne(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0xFC00 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="argOne", Tag=0, Type=uint), - ]) - - argOne: 'uint' = None - - class Attributes: - @dataclass - class EmberSampleAttribute(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class EmberSampleAttribute2(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0001 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class FeatureMap(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0xFFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0xFFFD - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = None - - -@dataclass -class SampleMfgSpecificCluster2(Cluster): - id: typing.ClassVar[int] = 0xFC00 - - class Commands: - @dataclass - class CommandTwo(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0xFC00 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="argOne", Tag=0, Type=uint), - ]) - - argOne: 'uint' = None - - class Attributes: - @dataclass - class EmberSampleAttribute3(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class EmberSampleAttribute4(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0001 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class FeatureMap(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0xFFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xFC00 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0xFFFD - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = None diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index b916ca9c0e6845..bc38038467073c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -2067,16 +2067,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPSampleMfgSpecificClusterClusterCommandOneParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull argOne; -- (instancetype)init; -@end - -@interface CHIPSampleMfgSpecificCluster2ClusterCommandTwoParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull argOne; -- (instancetype)init; -@end - NS_ASSUME_NONNULL_END #endif /* CHIP_COMMAND_PAYLOADS_H */ diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index 9c8314e88c718d..86f04acf55e03c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -4411,26 +4411,4 @@ - (instancetype)init } @end -@implementation CHIPSampleMfgSpecificClusterClusterCommandOneParams -- (instancetype)init -{ - if (self = [super init]) { - - _argOne = @(0); - } - return self; -} -@end - -@implementation CHIPSampleMfgSpecificCluster2ClusterCommandTwoParams -- (instancetype)init -{ - if (self = [super init]) { - - _argOne = @(0); - } - return self; -} -@end - NS_ASSUME_NONNULL_END diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index 33ceff68320e10..f79b7e04b4b590 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -137,10 +137,6 @@ // Server attributes #define ZCL_ON_OFF_ATTRIBUTE_ID (0x0000) -#define ZCL_SAMPLE_MFG_SPECIFIC_TRANSITION_TIME_ATTRIBUTE_ID (0x0000) -#define ZCL_SAMPLE_MFG_SPECIFIC_TRANSITION_TIME_2_ATTRIBUTE_ID (0x0000) -#define ZCL_SAMPLE_MFG_SPECIFIC_TRANSITION_TIME_3_ATTRIBUTE_ID (0x0001) -#define ZCL_SAMPLE_MFG_SPECIFIC_TRANSITION_TIME_4_ATTRIBUTE_ID (0x0001) #define ZCL_GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID (0x4000) #define ZCL_ON_TIME_ATTRIBUTE_ID (0x4001) #define ZCL_OFF_WAIT_TIME_ATTRIBUTE_ID (0x4002) @@ -1645,19 +1641,3 @@ // Server attributes #define ZCL_GROUPS_ATTRIBUTE_ID (0x0000) #define ZCL_GROUPKEYS_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Sample Mfg Specific Cluster - -// Client attributes - -// Server attributes -#define ZCL_ATTRIBUTE_ONE_ATTRIBUTE_ID (0x0000) -#define ZCL_ATTRIBUTE_TWO_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Sample Mfg Specific Cluster 2 - -// Client attributes - -// Server attributes -#define ZCL_ATTRIBUTE_THREE_ATTRIBUTE_ID (0x0000) -#define ZCL_ATTRIBUTE_FOUR_ATTRIBUTE_ID (0x0001) 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 758372a01c0920..75f8126d7ec313 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 @@ -2293,122 +2293,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) } // namespace OnOff -namespace SampleMfgSpecificAttribute0x00000x1002 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::OnOff::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace SampleMfgSpecificAttribute0x00000x1002 - -namespace SampleMfgSpecificAttribute0x00000x1049 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::OnOff::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); -} - -} // namespace SampleMfgSpecificAttribute0x00000x1049 - -namespace SampleMfgSpecificAttribute0x00010x1002 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::OnOff::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); -} - -} // namespace SampleMfgSpecificAttribute0x00010x1002 - -namespace SampleMfgSpecificAttribute0x00010x1040 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::OnOff::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace SampleMfgSpecificAttribute0x00010x1040 - namespace GlobalSceneControl { EmberAfStatus Get(chip::EndpointId endpoint, bool * value) @@ -28012,136 +27896,6 @@ namespace Attributes { } // namespace Attributes } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { -namespace Attributes { - -namespace EmberSampleAttribute { - -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); -} - -} // namespace EmberSampleAttribute - -namespace EmberSampleAttribute2 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); -} - -} // namespace EmberSampleAttribute2 - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster - -namespace SampleMfgSpecificCluster2 { -namespace Attributes { - -namespace EmberSampleAttribute3 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster2::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster2::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace EmberSampleAttribute3 - -namespace EmberSampleAttribute4 { - -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) -{ - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster2::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = NumericAttributeTraits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) -{ - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::SampleMfgSpecificCluster2::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace EmberSampleAttribute4 - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster2 - } // namespace Clusters } // namespace app } // namespace chip 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 a430425acf484d..a637fc51b37221 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 @@ -445,26 +445,6 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); } // namespace OnOff -namespace SampleMfgSpecificAttribute0x00000x1002 { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace SampleMfgSpecificAttribute0x00000x1002 - -namespace SampleMfgSpecificAttribute0x00000x1049 { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace SampleMfgSpecificAttribute0x00000x1049 - -namespace SampleMfgSpecificAttribute0x00010x1002 { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace SampleMfgSpecificAttribute0x00010x1002 - -namespace SampleMfgSpecificAttribute0x00010x1040 { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace SampleMfgSpecificAttribute0x00010x1040 - namespace GlobalSceneControl { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); @@ -5219,38 +5199,6 @@ namespace Attributes { } // namespace Attributes } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { -namespace Attributes { - -namespace EmberSampleAttribute { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace EmberSampleAttribute - -namespace EmberSampleAttribute2 { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace EmberSampleAttribute2 - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster - -namespace SampleMfgSpecificCluster2 { -namespace Attributes { - -namespace EmberSampleAttribute3 { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace EmberSampleAttribute3 - -namespace EmberSampleAttribute4 { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace EmberSampleAttribute4 - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster2 - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 21b5cd2e03c26c..a8285468ea092b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -934,22 +934,6 @@ void emberAfBindingClusterInitCallback(chip::EndpointId endpoint); */ void emberAfGroupKeyManagementClusterInitCallback(chip::EndpointId endpoint); -/** @brief Sample Mfg Specific Cluster Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificClusterClusterInitCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificCluster2ClusterInitCallback(chip::EndpointId endpoint); - // Cluster Server/Client Init Functions // @@ -12596,214 +12580,6 @@ void emberAfGroupKeyManagementClusterServerTickCallback(chip::EndpointId endpoin */ void emberAfGroupKeyManagementClusterClientTickCallback(chip::EndpointId endpoint); -// -// Sample Mfg Specific Cluster Cluster -// - -/** @brief Sample Mfg Specific Cluster Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificClusterClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificClusterClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSampleMfgSpecificClusterClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Sample Mfg Specific Cluster Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSampleMfgSpecificClusterClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Sample Mfg Specific Cluster Cluster Server Message Sent - * - * Server Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfSampleMfgSpecificClusterClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Sample Mfg Specific Cluster Cluster Client Message Sent - * - * Client Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfSampleMfgSpecificClusterClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Sample Mfg Specific Cluster Cluster Server Pre Attribute Changed - * - * Server Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterSampleMfgSpecificClusterClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Sample Mfg Specific Cluster Cluster Client Pre Attribute Changed - * - * Client Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterSampleMfgSpecificClusterClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Sample Mfg Specific Cluster Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfSampleMfgSpecificClusterClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfSampleMfgSpecificClusterClusterClientTickCallback(chip::EndpointId endpoint); - -// -// Sample Mfg Specific Cluster 2 Cluster -// - -/** @brief Sample Mfg Specific Cluster 2 Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificCluster2ClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfSampleMfgSpecificCluster2ClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSampleMfgSpecificCluster2ClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSampleMfgSpecificCluster2ClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Server Message Sent - * - * Server Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfSampleMfgSpecificCluster2ClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Client Message Sent - * - * Client Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfSampleMfgSpecificCluster2ClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Server Pre Attribute Changed - * - * Server Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterSampleMfgSpecificCluster2ClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Client Pre Attribute Changed - * - * Client Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterSampleMfgSpecificCluster2ClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfSampleMfgSpecificCluster2ClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Sample Mfg Specific Cluster 2 Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfSampleMfgSpecificCluster2ClusterClientTickCallback(chip::EndpointId endpoint); - // Cluster Commands Callback /** @@ -13000,46 +12776,16 @@ bool emberAfScenesClusterCopySceneResponseCallback(chip::EndpointId endpoint, ch */ bool emberAfOnOffClusterOffCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::OnOff::Commands::Off::DecodableType & commandData); -/** - * @brief On/Off Cluster SampleMfgSpecificOffWithTransition Command callback (from client) - */ -bool emberAfOnOffClusterSampleMfgSpecificOffWithTransitionCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OnOff::Commands::SampleMfgSpecificOffWithTransition::DecodableType & commandData); /** * @brief On/Off Cluster On Command callback (from client) */ bool emberAfOnOffClusterOnCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::OnOff::Commands::On::DecodableType & commandData); -/** - * @brief On/Off Cluster SampleMfgSpecificOnWithTransition Command callback (from client) - */ -bool emberAfOnOffClusterSampleMfgSpecificOnWithTransitionCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OnOff::Commands::SampleMfgSpecificOnWithTransition::DecodableType & commandData); -/** - * @brief On/Off Cluster SampleMfgSpecificOnWithTransition2 Command callback (from client) - */ -bool emberAfOnOffClusterSampleMfgSpecificOnWithTransition2Callback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OnOff::Commands::SampleMfgSpecificOnWithTransition2::DecodableType & commandData); /** * @brief On/Off Cluster Toggle Command callback (from client) */ bool emberAfOnOffClusterToggleCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::OnOff::Commands::Toggle::DecodableType & commandData); -/** - * @brief On/Off Cluster SampleMfgSpecificToggleWithTransition Command callback (from client) - */ -bool emberAfOnOffClusterSampleMfgSpecificToggleWithTransitionCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OnOff::Commands::SampleMfgSpecificToggleWithTransition::DecodableType & commandData); -/** - * @brief On/Off Cluster SampleMfgSpecificToggleWithTransition2 Command callback (from client) - */ -bool emberAfOnOffClusterSampleMfgSpecificToggleWithTransition2Callback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OnOff::Commands::SampleMfgSpecificToggleWithTransition2::DecodableType & commandData); /** * @brief On/Off Cluster OffWithEffect Command callback (from client) */ @@ -14999,18 +14745,6 @@ bool emberAfBindingClusterBindCallback(chip::app::CommandHandler * commandObj, c */ bool emberAfBindingClusterUnbindCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::Binding::Commands::Unbind::DecodableType & commandData); -/** - * @brief Sample Mfg Specific Cluster Cluster CommandOne Command callback (from client) - */ -bool emberAfSampleMfgSpecificClusterClusterCommandOneCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::SampleMfgSpecificCluster::Commands::CommandOne::DecodableType & commandData); -/** - * @brief Sample Mfg Specific Cluster 2 Cluster CommandTwo Command callback (from client) - */ -bool emberAfSampleMfgSpecificCluster2ClusterCommandTwoCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::SampleMfgSpecificCluster2::Commands::CommandTwo::DecodableType & commandData); /** @brief Add To Current App Tasks * diff --git a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h index ad33416064b5ca..bbcd4fb348cae6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h +++ b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h @@ -241,7 +241,3 @@ void __attribute__((weak)) MatterBindingPluginClientInitCallback() {} void MatterBindingPluginServerInitCallback(); void __attribute__((weak)) MatterGroupKeyManagementPluginClientInitCallback() {} void MatterGroupKeyManagementPluginServerInitCallback(); -void __attribute__((weak)) MatterSampleMfgSpecificClusterPluginClientInitCallback() {} -void MatterSampleMfgSpecificClusterPluginServerInitCallback(); -void __attribute__((weak)) MatterSampleMfgSpecificCluster2PluginClientInitCallback() {} -void MatterSampleMfgSpecificCluster2PluginServerInitCallback(); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h index ff52968f2db772..015366d5dcbab0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h @@ -354,9 +354,3 @@ static constexpr chip::ClusterId ZCL_BINDING_CLUSTER_ID = 0xF000; // Definitions for cluster: Group Key Management static constexpr chip::ClusterId ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID = 0xF004; - -// Definitions for cluster: Sample Mfg Specific Cluster -static constexpr chip::ClusterId ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID = 0xFC00; - -// Definitions for cluster: Sample Mfg Specific Cluster 2 -static constexpr chip::ClusterId ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID = 0xFC00; 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 7c0406db412e5e..d82e9cfcc5b7b0 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 @@ -1468,36 +1468,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace Off. -namespace SampleMfgSpecificOffWithTransition { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SampleMfgSpecificOffWithTransition. namespace On { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -1528,66 +1498,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace On. -namespace SampleMfgSpecificOnWithTransition { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SampleMfgSpecificOnWithTransition. -namespace SampleMfgSpecificOnWithTransition2 { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SampleMfgSpecificOnWithTransition2. namespace Toggle { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -1618,66 +1528,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace Toggle. -namespace SampleMfgSpecificToggleWithTransition { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SampleMfgSpecificToggleWithTransition. -namespace SampleMfgSpecificToggleWithTransition2 { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SampleMfgSpecificToggleWithTransition2. namespace OffWithEffect { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -19344,92 +19194,6 @@ namespace Events { } // namespace Events } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { - -namespace Commands { -namespace CommandOne { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArgOne)), argOne)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kArgOne): - ReturnErrorOnFailure(DataModel::Decode(reader, argOne)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace CommandOne. -} // namespace Commands - -namespace Events { -} // namespace Events - -} // namespace SampleMfgSpecificCluster -namespace SampleMfgSpecificCluster2 { - -namespace Commands { -namespace CommandTwo { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArgOne)), argOne)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kArgOne): - ReturnErrorOnFailure(DataModel::Decode(reader, argOne)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace CommandTwo. -} // namespace Commands - -namespace Events { -} // namespace Events - -} // namespace SampleMfgSpecificCluster2 } // namespace Clusters } // namespace app 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 07e18c24881d9f..d7c494ecbb02b1 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 @@ -2447,41 +2447,16 @@ struct Type; struct DecodableType; } // namespace Off -namespace SampleMfgSpecificOffWithTransition { -struct Type; -struct DecodableType; -} // namespace SampleMfgSpecificOffWithTransition - namespace On { struct Type; struct DecodableType; } // namespace On -namespace SampleMfgSpecificOnWithTransition { -struct Type; -struct DecodableType; -} // namespace SampleMfgSpecificOnWithTransition - -namespace SampleMfgSpecificOnWithTransition2 { -struct Type; -struct DecodableType; -} // namespace SampleMfgSpecificOnWithTransition2 - namespace Toggle { struct Type; struct DecodableType; } // namespace Toggle -namespace SampleMfgSpecificToggleWithTransition { -struct Type; -struct DecodableType; -} // namespace SampleMfgSpecificToggleWithTransition - -namespace SampleMfgSpecificToggleWithTransition2 { -struct Type; -struct DecodableType; -} // namespace SampleMfgSpecificToggleWithTransition2 - namespace OffWithEffect { struct Type; struct DecodableType; @@ -2526,32 +2501,6 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Off -namespace SampleMfgSpecificOffWithTransition { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOffWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOffWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SampleMfgSpecificOffWithTransition namespace On { enum class Fields { @@ -2578,58 +2527,6 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace On -namespace SampleMfgSpecificOnWithTransition { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOnWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOnWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SampleMfgSpecificOnWithTransition -namespace SampleMfgSpecificOnWithTransition2 { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOnWithTransition2::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificOnWithTransition2::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SampleMfgSpecificOnWithTransition2 namespace Toggle { enum class Fields { @@ -2656,58 +2553,6 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Toggle -namespace SampleMfgSpecificToggleWithTransition { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificToggleWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificToggleWithTransition::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SampleMfgSpecificToggleWithTransition -namespace SampleMfgSpecificToggleWithTransition2 { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificToggleWithTransition2::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SampleMfgSpecificToggleWithTransition2::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SampleMfgSpecificToggleWithTransition2 namespace OffWithEffect { enum class Fields { @@ -2817,50 +2662,6 @@ struct TypeInfo static constexpr AttributeId GetAttributeId() { return Attributes::OnOff::Id; } }; } // namespace OnOff -namespace SampleMfgSpecificAttribute0x00000x1002 { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SampleMfgSpecificAttribute0x00000x1002::Id; } -}; -} // namespace SampleMfgSpecificAttribute0x00000x1002 -namespace SampleMfgSpecificAttribute0x00000x1049 { -struct TypeInfo -{ - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; - - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SampleMfgSpecificAttribute0x00000x1049::Id; } -}; -} // namespace SampleMfgSpecificAttribute0x00000x1049 -namespace SampleMfgSpecificAttribute0x00010x1002 { -struct TypeInfo -{ - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; - - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SampleMfgSpecificAttribute0x00010x1002::Id; } -}; -} // namespace SampleMfgSpecificAttribute0x00010x1002 -namespace SampleMfgSpecificAttribute0x00010x1040 { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SampleMfgSpecificAttribute0x00010x1040::Id; } -}; -} // namespace SampleMfgSpecificAttribute0x00010x1040 namespace GlobalSceneControl { struct TypeInfo { @@ -32692,190 +32493,6 @@ struct TypeInfo } // namespace ClusterRevision } // namespace Attributes } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { - -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace CommandOne { -struct Type; -struct DecodableType; -} // namespace CommandOne - -} // namespace Commands - -namespace Commands { -namespace CommandOne { -enum class Fields -{ - kArgOne = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::CommandOne::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - - uint8_t argOne; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::CommandOne::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - - uint8_t argOne; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace CommandOne -} // namespace Commands - -namespace Attributes { -namespace EmberSampleAttribute { -struct TypeInfo -{ - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::EmberSampleAttribute::Id; } -}; -} // namespace EmberSampleAttribute -namespace EmberSampleAttribute2 { -struct TypeInfo -{ - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::EmberSampleAttribute2::Id; } -}; -} // namespace EmberSampleAttribute2 -namespace FeatureMap { -struct TypeInfo -{ - using Type = uint32_t; - using DecodableType = uint32_t; - using DecodableArgType = uint32_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } -}; -} // namespace ClusterRevision -} // namespace Attributes -} // namespace SampleMfgSpecificCluster -namespace SampleMfgSpecificCluster2 { - -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace CommandTwo { -struct Type; -struct DecodableType; -} // namespace CommandTwo - -} // namespace Commands - -namespace Commands { -namespace CommandTwo { -enum class Fields -{ - kArgOne = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::CommandTwo::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - - uint8_t argOne; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::CommandTwo::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - - uint8_t argOne; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace CommandTwo -} // namespace Commands - -namespace Attributes { -namespace EmberSampleAttribute3 { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::EmberSampleAttribute3::Id; } -}; -} // namespace EmberSampleAttribute3 -namespace EmberSampleAttribute4 { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::EmberSampleAttribute4::Id; } -}; -} // namespace EmberSampleAttribute4 -namespace FeatureMap { -struct TypeInfo -{ - using Type = uint32_t; - using DecodableType = uint32_t; - using DecodableArgType = uint32_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::SampleMfgSpecificCluster2::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } -}; -} // namespace ClusterRevision -} // namespace Attributes -} // namespace SampleMfgSpecificCluster2 } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index 44c07c5da7569d..9e892ef9d5c2a6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -73,13 +73,8 @@ // Commands for cluster: On/Off #define ZCL_OFF_COMMAND_ID (0x00) -#define ZCL_SAMPLE_MFG_SPECIFIC_OFF_WITH_TRANSITION_COMMAND_ID (0x00) #define ZCL_ON_COMMAND_ID (0x01) -#define ZCL_SAMPLE_MFG_SPECIFIC_ON_WITH_TRANSITION_COMMAND_ID (0x01) -#define ZCL_SAMPLE_MFG_SPECIFIC_ON_WITH_TRANSITION2_COMMAND_ID (0x01) #define ZCL_TOGGLE_COMMAND_ID (0x02) -#define ZCL_SAMPLE_MFG_SPECIFIC_TOGGLE_WITH_TRANSITION_COMMAND_ID (0x02) -#define ZCL_SAMPLE_MFG_SPECIFIC_TOGGLE_WITH_TRANSITION2_COMMAND_ID (0x02) #define ZCL_OFF_WITH_EFFECT_COMMAND_ID (0x40) #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41) #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42) @@ -507,9 +502,3 @@ // Commands for cluster: Binding #define ZCL_BIND_COMMAND_ID (0x00) #define ZCL_UNBIND_COMMAND_ID (0x01) - -// Commands for cluster: Sample Mfg Specific Cluster -#define ZCL_COMMAND_ONE_COMMAND_ID (0x00) - -// Commands for cluster: Sample Mfg Specific Cluster 2 -#define ZCL_COMMAND_TWO_COMMAND_ID (0x00) 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 f3a521bbd07341..274616f63e20c2 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 @@ -416,22 +416,6 @@ namespace OnOff { static constexpr AttributeId Id = 0x00000000; } // namespace OnOff -namespace SampleMfgSpecificAttribute0x00000x1002 { -static constexpr AttributeId Id = 0x10020000; -} // namespace SampleMfgSpecificAttribute0x00000x1002 - -namespace SampleMfgSpecificAttribute0x00000x1049 { -static constexpr AttributeId Id = 0x10490000; -} // namespace SampleMfgSpecificAttribute0x00000x1049 - -namespace SampleMfgSpecificAttribute0x00010x1002 { -static constexpr AttributeId Id = 0x10020001; -} // namespace SampleMfgSpecificAttribute0x00010x1002 - -namespace SampleMfgSpecificAttribute0x00010x1040 { -static constexpr AttributeId Id = 0x10490001; -} // namespace SampleMfgSpecificAttribute0x00010x1040 - namespace GlobalSceneControl { static constexpr AttributeId Id = 0x00004000; } // namespace GlobalSceneControl @@ -5409,50 +5393,6 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { -namespace Attributes { - -namespace EmberSampleAttribute { -static constexpr AttributeId Id = 0x10020000; -} // namespace EmberSampleAttribute - -namespace EmberSampleAttribute2 { -static constexpr AttributeId Id = 0x10020001; -} // namespace EmberSampleAttribute2 - -namespace FeatureMap { -static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; -} // namespace FeatureMap - -namespace ClusterRevision { -static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster - -namespace SampleMfgSpecificCluster2 { -namespace Attributes { - -namespace EmberSampleAttribute3 { -static constexpr AttributeId Id = 0x10490000; -} // namespace EmberSampleAttribute3 - -namespace EmberSampleAttribute4 { -static constexpr AttributeId Id = 0x10490001; -} // namespace EmberSampleAttribute4 - -namespace FeatureMap { -static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; -} // namespace FeatureMap - -namespace ClusterRevision { -static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace SampleMfgSpecificCluster2 - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h index bab79dfc4b85f7..dc102cc4a17b12 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h @@ -358,12 +358,6 @@ static constexpr ClusterId Id = 0x0000F000; namespace GroupKeyManagement { static constexpr ClusterId Id = 0x0000F004; } // namespace GroupKeyManagement -namespace SampleMfgSpecificCluster { -static constexpr ClusterId Id = 0x1002FC00; -} // namespace SampleMfgSpecificCluster -namespace SampleMfgSpecificCluster2 { -static constexpr ClusterId Id = 0x1049FC00; -} // namespace SampleMfgSpecificCluster2 } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index b2727639724342..b485d66d69ecb5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -184,34 +184,14 @@ namespace Off { static constexpr CommandId Id = 0x00000000; } // namespace Off -namespace SampleMfgSpecificOffWithTransition { -static constexpr CommandId Id = 0x10020000; -} // namespace SampleMfgSpecificOffWithTransition - namespace On { static constexpr CommandId Id = 0x00000001; } // namespace On -namespace SampleMfgSpecificOnWithTransition { -static constexpr CommandId Id = 0x10020001; -} // namespace SampleMfgSpecificOnWithTransition - -namespace SampleMfgSpecificOnWithTransition2 { -static constexpr CommandId Id = 0x10490001; -} // namespace SampleMfgSpecificOnWithTransition2 - namespace Toggle { static constexpr CommandId Id = 0x00000002; } // namespace Toggle -namespace SampleMfgSpecificToggleWithTransition { -static constexpr CommandId Id = 0x10020002; -} // namespace SampleMfgSpecificToggleWithTransition - -namespace SampleMfgSpecificToggleWithTransition2 { -static constexpr CommandId Id = 0x10490002; -} // namespace SampleMfgSpecificToggleWithTransition2 - namespace OffWithEffect { static constexpr CommandId Id = 0x00000040; } // namespace OffWithEffect @@ -1833,26 +1813,6 @@ static constexpr CommandId Id = 0x00000001; } // namespace Commands } // namespace Binding -namespace SampleMfgSpecificCluster { -namespace Commands { - -namespace CommandOne { -static constexpr CommandId Id = 0x10020000; -} // namespace CommandOne - -} // namespace Commands -} // namespace SampleMfgSpecificCluster - -namespace SampleMfgSpecificCluster2 { -namespace Commands { - -namespace CommandTwo { -static constexpr CommandId Id = 0x10490000; -} // namespace CommandTwo - -} // namespace Commands -} // namespace SampleMfgSpecificCluster2 - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index 3710086c58ea58..744b72c6cf8e65 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -764,19 +764,6 @@ #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER #endif -#if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" }, -#else -#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER -#endif - -#if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT) -#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \ - { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" }, -#else -#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 -#endif - #define CLUSTER_IDS_TO_NAMES \ CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \ CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \ @@ -888,8 +875,6 @@ CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \ CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \ CHIP_PRINTCLUSTER_BINDING_CLUSTER \ - CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \ - CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \ - CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 + CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER #define MAX_CLUSTER_NAME_LENGTH 52