diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 3d04681d82210f..2b65111c415c43 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -62,7 +62,6 @@ - diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index d99dcd82e89bab..afa5947f3e742b 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -72,7 +72,6 @@ "wifi-network-diagnostics-cluster.xml", "window-covering.xml", "matter-devices.xml", - "ami.xml", "general.xml", "ha-devices.xml", "ha.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index e0c451a858b09d..44abfb526e17ad 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -66,7 +66,6 @@ "wifi-network-diagnostics-cluster.xml", "window-covering.xml", "matter-devices.xml", - "ami.xml", "general.xml", "ha-devices.xml", "ha.xml", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 13b596cc1e7df4..69db97507766af 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -32827,349 +32827,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: -@dataclass -class Messaging(Cluster): - id: typing.ClassVar[int] = 0x0703 - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint), - ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), - ]) - - generatedCommandList: 'typing.List[uint]' = None - acceptedCommandList: 'typing.List[uint]' = None - attributeList: 'typing.List[uint]' = None - featureMap: 'uint' = None - clusterRevision: 'uint' = None - - class Enums: - class EventId(IntEnum): - kMeterCoverRemoved = 0x00 - kMeterCoverClosed = 0x01 - kStrongMagneticField = 0x02 - kNoStrongMagneticField = 0x03 - kBatteryFailure = 0x04 - kLowBattery = 0x05 - kProgramMemoryError = 0x06 - kRamError = 0x07 - kNvMemoryError = 0x08 - kMeasurementSystemError = 0x09 - kWatchdogError = 0x0A - kSupplyDisconnectFailure = 0x0B - kSupplyConnectFailure = 0x0C - kMeasurmentSoftwareChanged = 0x0D - kDstEnabled = 0x0E - kDstDisabled = 0x0F - kClockAdjBackward = 0x10 - kClockAdjForward = 0x11 - kClockInvalid = 0x12 - kCommsErrorHan = 0x13 - kCommsOkHan = 0x14 - kFraudAttempt = 0x15 - kPowerLoss = 0x16 - kIncorrectProtocol = 0x17 - kUnusualHanTraffic = 0x18 - kUnexpectedClockChange = 0x19 - kCommsUsingUnauthenticatedComponent = 0x1A - kErrorRegClear = 0x1B - kAlarmRegClear = 0x1C - kUnexpectedHwReset = 0x1D - kUnexpectedProgramExecution = 0x1E - kEventLogCleared = 0x1F - kManualDisconnect = 0x20 - kManualConnect = 0x21 - kRemoteDisconnection = 0x22 - kLocalDisconnection = 0x23 - kLimitThresholdExceeded = 0x24 - kLimitThresholdOk = 0x25 - kLimitThresholdChanged = 0x26 - kMaximumDemandExceeded = 0x27 - kProfileCleared = 0x28 - kFirmwareReadyForActivation = 0x29 - kFirmwareActivated = 0x2A - kPatchFailure = 0x2B - kTouTariffActivation = 0x2C - k8x8Tariffactivated = 0x2D - kSingleTariffRateActivated = 0x2E - kAsynchronousBillingOccurred = 0x2F - kSynchronousBillingOccurred = 0x30 - kIncorrectPolarity = 0x80 - kCurrentNoVoltage = 0x81 - kUnderVoltage = 0x82 - kOverVoltage = 0x83 - kNormalVoltage = 0x84 - kPfBelowThreshold = 0x85 - kPfAboveThreshold = 0x86 - kTerminalCoverRemoved = 0x87 - kTerminalCoverClosed = 0x88 - kReverseFlow = 0xA0 - kTiltTamper = 0xA1 - kBatteryCoverRemoved = 0xA2 - kBatteryCoverClosed = 0xA3 - kExcessFlow = 0xA4 - kCreditOk = 0xC0 - kLowCredit = 0xC1 - kEmergencyCreditInUse = 0xC0 - kEmergencyCreditExhausted = 0xC1 - kZeroCreditEcNotSelected = 0xC2 - kSupplyOn = 0xC3 - kSupplyOffAarmed = 0xC4 - kSupplyOff = 0xC5 - kDiscountApplied = 0xC6 - kManufacturerSpecificA = 0xE0 - kManufacturerSpecificB = 0xE1 - kManufacturerSpecificC = 0xE2 - kManufacturerSpecificD = 0xE3 - kManufacturerSpecificE = 0xE4 - kManufacturerSpecificF = 0xE5 - kManufacturerSpecificG = 0xE6 - kManufacturerSpecificH = 0xE7 - kManufacturerSpecificI = 0xE8 - - class MessagingControlConfirmation(IntEnum): - kNotRequired = 0x00 - kRequired = 0x80 - - class MessagingControlEnhancedConfirmation(IntEnum): - kNotRequired = 0x00 - kRequired = 0x20 - - class MessagingControlImportance(IntEnum): - kLow = 0x00 - kMedium = 0x04 - kHigh = 0x08 - kCritical = 0x0C - - class MessagingControlTransmission(IntEnum): - kNormal = 0x00 - kNormalAndAnonymous = 0x01 - kAnonymous = 0x02 - kReserved = 0x03 - - - - class Commands: - @dataclass - class DisplayMessage(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint), - ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str), - ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint), - ]) - - messageId: 'uint' = 0 - messageControl: 'uint' = 0 - startTime: 'uint' = 0 - durationInMinutes: 'uint' = 0 - message: 'str' = "" - optionalExtendedMessageControl: 'uint' = 0 - - @dataclass - class GetLastMessage(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ]) - - - @dataclass - class CancelMessage(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint), - ]) - - messageId: 'uint' = 0 - messageControl: 'uint' = 0 - - @dataclass - class MessageConfirmation(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="confirmationTime", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="messageConfirmationControl", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="messageResponse", Tag=3, Type=bytes), - ]) - - messageId: 'uint' = 0 - confirmationTime: 'uint' = 0 - messageConfirmationControl: 'uint' = 0 - messageResponse: 'bytes' = b"" - - @dataclass - class DisplayProtectedMessage(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="messageId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="messageControl", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="startTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="durationInMinutes", Tag=3, Type=uint), - ClusterObjectFieldDescriptor(Label="message", Tag=4, Type=str), - ClusterObjectFieldDescriptor(Label="optionalExtendedMessageControl", Tag=5, Type=uint), - ]) - - messageId: 'uint' = 0 - messageControl: 'uint' = 0 - startTime: 'uint' = 0 - durationInMinutes: 'uint' = 0 - message: 'str' = "" - optionalExtendedMessageControl: 'uint' = 0 - - @dataclass - class GetMessageCancellation(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="earliestImplementationTime", Tag=0, Type=uint), - ]) - - earliestImplementationTime: 'uint' = 0 - - @dataclass - class CancelAllMessages(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0703 - command_id: typing.ClassVar[int] = 0x0003 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="implementationDateTime", Tag=0, Type=uint), - ]) - - implementationDateTime: 'uint' = 0 - - - class Attributes: - @dataclass - class GeneratedCommandList(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0703 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFF8 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[uint]) - - value: 'typing.List[uint]' = field(default_factory=lambda: []) - - @dataclass - class AcceptedCommandList(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0703 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFF9 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[uint]) - - value: 'typing.List[uint]' = field(default_factory=lambda: []) - - @dataclass - class AttributeList(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0703 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFB - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[uint]) - - value: 'typing.List[uint]' = field(default_factory=lambda: []) - - @dataclass - class FeatureMap(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0703 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = 0 - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0703 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFD - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = 0 - - - @dataclass class ApplianceIdentification(Cluster): id: typing.ClassVar[int] = 0x0B00 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 9987040a7b9512..4cd2c989751edb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -22997,130 +22997,6 @@ typedef NS_ENUM(uint8_t, MTRApplicationBasicApplicationStatus) { MTRApplicationBasicApplicationStatusActiveVisibleNotFocus = 0x03, }; -typedef NS_ENUM(uint8_t, MTRMessagingEventId) { - MTRMessagingEventIdMeterCoverRemoved = 0x00, - MTRMessagingEventIdMeterCoverClosed = 0x01, - MTRMessagingEventIdStrongMagneticField = 0x02, - MTRMessagingEventIdNoStrongMagneticField = 0x03, - MTRMessagingEventIdBatteryFailure = 0x04, - MTRMessagingEventIdLowBattery = 0x05, - MTRMessagingEventIdProgramMemoryError = 0x06, - MTRMessagingEventIdRamError = 0x07, - MTRMessagingEventIdNvMemoryError = 0x08, - MTRMessagingEventIdMeasurementSystemError = 0x09, - MTRMessagingEventIdWatchdogError = 0x0A, - MTRMessagingEventIdSupplyDisconnectFailure = 0x0B, - MTRMessagingEventIdSupplyConnectFailure = 0x0C, - MTRMessagingEventIdMeasurmentSoftwareChanged = 0x0D, - MTRMessagingEventIdDstEnabled = 0x0E, - MTRMessagingEventIdDstDisabled = 0x0F, - MTRMessagingEventIdClockAdjBackward = 0x10, - MTRMessagingEventIdClockAdjForward = 0x11, - MTRMessagingEventIdClockInvalid = 0x12, - MTRMessagingEventIdCommsErrorHan = 0x13, - MTRMessagingEventIdCommsOkHan = 0x14, - MTRMessagingEventIdFraudAttempt = 0x15, - MTRMessagingEventIdPowerLoss = 0x16, - MTRMessagingEventIdIncorrectProtocol = 0x17, - MTRMessagingEventIdUnusualHanTraffic = 0x18, - MTRMessagingEventIdUnexpectedClockChange = 0x19, - MTRMessagingEventIdCommsUsingUnauthenticatedComponent = 0x1A, - MTRMessagingEventIdErrorRegClear = 0x1B, - MTRMessagingEventIdAlarmRegClear = 0x1C, - MTRMessagingEventIdUnexpectedHwReset = 0x1D, - MTRMessagingEventIdUnexpectedProgramExecution = 0x1E, - MTRMessagingEventIdEventLogCleared = 0x1F, - MTRMessagingEventIdManualDisconnect = 0x20, - MTRMessagingEventIdManualConnect = 0x21, - MTRMessagingEventIdRemoteDisconnection = 0x22, - MTRMessagingEventIdLocalDisconnection = 0x23, - MTRMessagingEventIdLimitThresholdExceeded = 0x24, - MTRMessagingEventIdLimitThresholdOk = 0x25, - MTRMessagingEventIdLimitThresholdChanged = 0x26, - MTRMessagingEventIdMaximumDemandExceeded = 0x27, - MTRMessagingEventIdProfileCleared = 0x28, - MTRMessagingEventIdFirmwareReadyForActivation = 0x29, - MTRMessagingEventIdFirmwareActivated = 0x2A, - MTRMessagingEventIdPatchFailure = 0x2B, - MTRMessagingEventIdTouTariffActivation = 0x2C, - MTRMessagingEventId8x8Tariffactivated = 0x2D, - MTRMessagingEventIdSingleTariffRateActivated = 0x2E, - MTRMessagingEventIdAsynchronousBillingOccurred = 0x2F, - MTRMessagingEventIdSynchronousBillingOccurred = 0x30, - MTRMessagingEventIdIncorrectPolarity = 0x80, - MTRMessagingEventIdCurrentNoVoltage = 0x81, - MTRMessagingEventIdUnderVoltage = 0x82, - MTRMessagingEventIdOverVoltage = 0x83, - MTRMessagingEventIdNormalVoltage = 0x84, - MTRMessagingEventIdPfBelowThreshold = 0x85, - MTRMessagingEventIdPfAboveThreshold = 0x86, - MTRMessagingEventIdTerminalCoverRemoved = 0x87, - MTRMessagingEventIdTerminalCoverClosed = 0x88, - MTRMessagingEventIdReverseFlow = 0xA0, - MTRMessagingEventIdTiltTamper = 0xA1, - MTRMessagingEventIdBatteryCoverRemoved = 0xA2, - MTRMessagingEventIdBatteryCoverClosed = 0xA3, - MTRMessagingEventIdExcessFlow = 0xA4, - MTRMessagingEventIdCreditOk = 0xC0, - MTRMessagingEventIdLowCredit = 0xC1, - MTRMessagingEventIdEmergencyCreditInUse = 0xC0, - MTRMessagingEventIdEmergencyCreditExhausted = 0xC1, - MTRMessagingEventIdZeroCreditEcNotSelected = 0xC2, - MTRMessagingEventIdSupplyOn = 0xC3, - MTRMessagingEventIdSupplyOffAarmed = 0xC4, - MTRMessagingEventIdSupplyOff = 0xC5, - MTRMessagingEventIdDiscountApplied = 0xC6, - MTRMessagingEventIdManufacturerSpecificA = 0xE0, - MTRMessagingEventIdManufacturerSpecificB = 0xE1, - MTRMessagingEventIdManufacturerSpecificC = 0xE2, - MTRMessagingEventIdManufacturerSpecificD = 0xE3, - MTRMessagingEventIdManufacturerSpecificE = 0xE4, - MTRMessagingEventIdManufacturerSpecificF = 0xE5, - MTRMessagingEventIdManufacturerSpecificG = 0xE6, - MTRMessagingEventIdManufacturerSpecificH = 0xE7, - MTRMessagingEventIdManufacturerSpecificI = 0xE8, -}; - -typedef NS_ENUM(uint8_t, MTRMessagingControlConfirmation) { - MTRMessagingControlConfirmationNotRequired = 0x00, - MTRMessagingControlConfirmationRequired = 0x80, -}; - -typedef NS_ENUM(uint8_t, MTRMessagingControlEnhancedConfirmation) { - MTRMessagingControlEnhancedConfirmationNotRequired = 0x00, - MTRMessagingControlEnhancedConfirmationRequired = 0x20, -}; - -typedef NS_ENUM(uint8_t, MTRMessagingControlImportance) { - MTRMessagingControlImportanceLow = 0x00, - MTRMessagingControlImportanceMedium = 0x04, - MTRMessagingControlImportanceHigh = 0x08, - MTRMessagingControlImportanceCritical = 0x0C, -}; - -typedef NS_ENUM(uint8_t, MTRMessagingControlTransmission) { - MTRMessagingControlTransmissionNormal = 0x00, - MTRMessagingControlTransmissionNormalAndAnonymous = 0x01, - MTRMessagingControlTransmissionAnonymous = 0x02, - MTRMessagingControlTransmissionReserved = 0x03, -}; - -typedef NS_OPTIONS(uint8_t, MTRMessagingConfirmationControl) { - MTRMessagingConfirmationControlNoReturned = 0x1, - MTRMessagingConfirmationControlYesReturned = 0x2, -}; - -typedef NS_OPTIONS(uint8_t, MTRMessagingControlMask) { - MTRMessagingControlMaskTransMechanism = 0x3, - MTRMessagingControlMaskMessageUrgency = 0xC, - MTRMessagingControlMaskEnhancedConfirmationRequest = 0x20, - MTRMessagingControlMaskMessageConfirmation = 0x80, -}; - -typedef NS_OPTIONS(uint8_t, MTRMessagingExtendedControlMask) { - MTRMessagingExtendedControlMaskMessageConfirmationStatus = 0x1, -}; - typedef NS_ENUM(uint8_t, MTRApplianceEventsAndAlertEventIdentification) { MTRApplianceEventsAndAlertEventIdentificationEndOfCycle = 0x01, MTRApplianceEventsAndAlertEventIdentificationTemperatureReached = 0x04, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index b3ca2f70b1af7d..f5b83aeb87b9bb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -19225,274 +19225,6 @@ } } -void MTRMessagingClusterEventIdAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::Messaging::EventId value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRMessagingClusterEventIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRNullableMessagingClusterEventIdAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableMessagingClusterEventIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRMessagingClusterMessagingControlConfirmationAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Messaging::MessagingControlConfirmation value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) -{ - auto * self - = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Messaging::MessagingControlEnhancedConfirmation value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) -{ - auto * self - = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) -{ - auto * self = static_cast( - context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRMessagingClusterMessagingControlImportanceAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Messaging::MessagingControlImportance value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRMessagingClusterMessagingControlTransmissionAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Messaging::MessagingControlTransmission value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - -void MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) -{ - auto * self - = static_cast(context); - if (!self->mQueue) { - return; - } - - if (self->mEstablishedHandler != nil) { - dispatch_async(self->mQueue, self->mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - self->mEstablishedHandler = nil; - } -} - void MTRApplianceEventsAndAlertClusterEventIdentificationAttributeCallbackBridge::OnSuccessFn( void * context, chip::app::Clusters::ApplianceEventsAndAlert::EventIdentification value) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h index c8bd645d352679..a0e07de4d7e35f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h @@ -533,25 +533,6 @@ typedef void (*ApplicationBasicClusterApplicationStatusEnumAttributeCallback)( void *, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum); typedef void (*NullableApplicationBasicClusterApplicationStatusEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*MessagingClusterEventIdAttributeCallback)(void *, chip::app::Clusters::Messaging::EventId); -typedef void (*NullableMessagingClusterEventIdAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MessagingClusterMessagingControlConfirmationAttributeCallback)( - void *, chip::app::Clusters::Messaging::MessagingControlConfirmation); -typedef void (*NullableMessagingClusterMessagingControlConfirmationAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MessagingClusterMessagingControlEnhancedConfirmationAttributeCallback)( - void *, chip::app::Clusters::Messaging::MessagingControlEnhancedConfirmation); -typedef void (*NullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MessagingClusterMessagingControlImportanceAttributeCallback)( - void *, chip::app::Clusters::Messaging::MessagingControlImportance); -typedef void (*NullableMessagingClusterMessagingControlImportanceAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MessagingClusterMessagingControlTransmissionAttributeCallback)( - void *, chip::app::Clusters::Messaging::MessagingControlTransmission); -typedef void (*NullableMessagingClusterMessagingControlTransmissionAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); typedef void (*ApplianceEventsAndAlertClusterEventIdentificationAttributeCallback)( void *, chip::app::Clusters::ApplianceEventsAndAlert::EventIdentification); typedef void (*NullableApplianceEventsAndAlertClusterEventIdentificationAttributeCallback)( @@ -16481,294 +16462,6 @@ class MTRNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackSu SubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRMessagingClusterEventIdAttributeCallbackBridge : public MTRCallbackBridge -{ -public: - MTRMessagingClusterEventIdAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::Messaging::EventId value); -}; - -class MTRMessagingClusterEventIdAttributeCallbackSubscriptionBridge : public MTRMessagingClusterEventIdAttributeCallbackBridge -{ -public: - MTRMessagingClusterEventIdAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - MTRMessagingClusterEventIdAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableMessagingClusterEventIdAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableMessagingClusterEventIdAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableMessagingClusterEventIdAttributeCallbackSubscriptionBridge - : public MTRNullableMessagingClusterEventIdAttributeCallbackBridge -{ -public: - MTRNullableMessagingClusterEventIdAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - MTRNullableMessagingClusterEventIdAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRMessagingClusterMessagingControlConfirmationAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlConfirmationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::Messaging::MessagingControlConfirmation value); -}; - -class MTRMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge - : public MTRMessagingClusterMessagingControlConfirmationAttributeCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRMessagingClusterMessagingControlConfirmationAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; - - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge - : public MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRNullableMessagingClusterMessagingControlConfirmationAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::Messaging::MessagingControlEnhancedConfirmation value); -}; - -class MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge - : public MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action, - bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; - - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge - : public MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRNullableMessagingClusterMessagingControlEnhancedConfirmationAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRMessagingClusterMessagingControlImportanceAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlImportanceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::Messaging::MessagingControlImportance value); -}; - -class MTRMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge - : public MTRMessagingClusterMessagingControlImportanceAttributeCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRMessagingClusterMessagingControlImportanceAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge - : public MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRNullableMessagingClusterMessagingControlImportanceAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRMessagingClusterMessagingControlTransmissionAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlTransmissionAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::Messaging::MessagingControlTransmission value); -}; - -class MTRMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge - : public MTRMessagingClusterMessagingControlTransmissionAttributeCallbackBridge -{ -public: - MTRMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRMessagingClusterMessagingControlTransmissionAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, bool keepAlive = false) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; - - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge - : public MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackBridge -{ -public: - MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - MTRNullableMessagingClusterMessagingControlTransmissionAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - class MTRApplianceEventsAndAlertClusterEventIdentificationAttributeCallbackBridge : public MTRCallbackBridge { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index e271b9c90af14b..8f0cc0966f1e18 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -130,7 +130,6 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterApplicationLauncherID = 0x0000050C, MTRClusterApplicationBasicID = 0x0000050D, MTRClusterAccountLoginID = 0x0000050E, - MTRClusterMessagingID = 0x00000703, MTRClusterApplianceIdentificationID = 0x00000B00, MTRClusterMeterIdentificationID = 0x00000B01, MTRClusterApplianceEventsAndAlertID = 0x00000B02, @@ -1699,13 +1698,6 @@ typedef NS_ENUM(uint32_t, MTRClusterAttributeIDType) { MTRClusterAccountLoginAttributeFeatureMapID = MTRClusterGlobalAttributeFeatureMapID, MTRClusterAccountLoginAttributeClusterRevisionID = MTRClusterGlobalAttributeClusterRevisionID, - // Cluster Messaging attributes - MTRClusterMessagingAttributeGeneratedCommandListID = MTRClusterGlobalAttributeGeneratedCommandListID, - MTRClusterMessagingAttributeAcceptedCommandListID = MTRClusterGlobalAttributeAcceptedCommandListID, - MTRClusterMessagingAttributeAttributeListID = MTRClusterGlobalAttributeAttributeListID, - MTRClusterMessagingAttributeFeatureMapID = MTRClusterGlobalAttributeFeatureMapID, - MTRClusterMessagingAttributeClusterRevisionID = MTRClusterGlobalAttributeClusterRevisionID, - // Cluster ApplianceIdentification attributes MTRClusterApplianceIdentificationAttributeBasicIdentificationID = 0x00000000, MTRClusterApplianceIdentificationAttributeCompanyNameID = 0x00000010, @@ -2312,15 +2304,6 @@ typedef NS_ENUM(uint32_t, MTRClusterCommandIDType) { MTRClusterAccountLoginCommandLoginID = 0x00000002, MTRClusterAccountLoginCommandLogoutID = 0x00000003, - // Cluster Messaging commands - MTRClusterMessagingCommandDisplayMessageID = 0x00000000, - MTRClusterMessagingCommandGetLastMessageID = 0x00000000, - MTRClusterMessagingCommandCancelMessageID = 0x00000001, - MTRClusterMessagingCommandMessageConfirmationID = 0x00000001, - MTRClusterMessagingCommandDisplayProtectedMessageID = 0x00000002, - MTRClusterMessagingCommandGetMessageCancellationID = 0x00000002, - MTRClusterMessagingCommandCancelAllMessagesID = 0x00000003, - // Cluster ApplianceEventsAndAlert commands MTRClusterApplianceEventsAndAlertCommandGetAlertsID = 0x00000000, MTRClusterApplianceEventsAndAlertCommandGetAlertsResponseID = 0x00000000, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 0f01197c6230f4..7458c40cd83b99 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -5993,186 +5993,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; -@end -@interface MTRMessagingClusterDisplayMessageParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull messageId; - -@property (strong, nonatomic) NSNumber * _Nonnull messageControl; - -@property (strong, nonatomic) NSNumber * _Nonnull startTime; - -@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes; - -@property (strong, nonatomic) NSString * _Nonnull message; - -@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterGetLastMessageParams : NSObject -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterCancelMessageParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull messageId; - -@property (strong, nonatomic) NSNumber * _Nonnull messageControl; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterMessageConfirmationParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull messageId; - -@property (strong, nonatomic) NSNumber * _Nonnull confirmationTime; - -@property (strong, nonatomic) NSNumber * _Nonnull messageConfirmationControl; - -@property (strong, nonatomic) NSData * _Nonnull messageResponse; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterDisplayProtectedMessageParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull messageId; - -@property (strong, nonatomic) NSNumber * _Nonnull messageControl; - -@property (strong, nonatomic) NSNumber * _Nonnull startTime; - -@property (strong, nonatomic) NSNumber * _Nonnull durationInMinutes; - -@property (strong, nonatomic) NSString * _Nonnull message; - -@property (strong, nonatomic) NSNumber * _Nonnull optionalExtendedMessageControl; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterGetMessageCancellationParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull earliestImplementationTime; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - -@end -@interface MTRMessagingClusterCancelAllMessagesParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull implementationDateTime; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; - @end @interface MTRApplianceEventsAndAlertClusterGetAlertsParams : NSObject /** diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 813e42fbd22743..5a83c466d976f6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -5285,172 +5285,6 @@ - (NSString *)description return descriptionString; } -@end -@implementation MTRMessagingClusterDisplayMessageParams -- (instancetype)init -{ - if (self = [super init]) { - - _messageId = @(0); - - _messageControl = @(0); - - _startTime = @(0); - - _durationInMinutes = @(0); - - _message = @""; - - _optionalExtendedMessageControl = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: messageId:%@; messageControl:%@; startTime:%@; durationInMinutes:%@; message:%@; " - @"optionalExtendedMessageControl:%@; >", - NSStringFromClass([self class]), _messageId, _messageControl, _startTime, _durationInMinutes, _message, - _optionalExtendedMessageControl]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterGetLastMessageParams -- (instancetype)init -{ - if (self = [super init]) { - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterCancelMessageParams -- (instancetype)init -{ - if (self = [super init]) { - - _messageId = @(0); - - _messageControl = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: messageId:%@; messageControl:%@; >", NSStringFromClass([self class]), _messageId, _messageControl]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterMessageConfirmationParams -- (instancetype)init -{ - if (self = [super init]) { - - _messageId = @(0); - - _confirmationTime = @(0); - - _messageConfirmationControl = @(0); - - _messageResponse = [NSData data]; - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: messageId:%@; confirmationTime:%@; messageConfirmationControl:%@; messageResponse:%@; >", - NSStringFromClass([self class]), _messageId, _confirmationTime, _messageConfirmationControl, - [_messageResponse base64EncodedStringWithOptions:0]]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterDisplayProtectedMessageParams -- (instancetype)init -{ - if (self = [super init]) { - - _messageId = @(0); - - _messageControl = @(0); - - _startTime = @(0); - - _durationInMinutes = @(0); - - _message = @""; - - _optionalExtendedMessageControl = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: messageId:%@; messageControl:%@; startTime:%@; durationInMinutes:%@; message:%@; " - @"optionalExtendedMessageControl:%@; >", - NSStringFromClass([self class]), _messageId, _messageControl, _startTime, _durationInMinutes, _message, - _optionalExtendedMessageControl]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterGetMessageCancellationParams -- (instancetype)init -{ - if (self = [super init]) { - - _earliestImplementationTime = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: earliestImplementationTime:%@; >", NSStringFromClass([self class]), _earliestImplementationTime]; - return descriptionString; -} - -@end -@implementation MTRMessagingClusterCancelAllMessagesParams -- (instancetype)init -{ - if (self = [super init]) { - - _implementationDateTime = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} - -- (NSString *)description -{ - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: implementationDateTime:%@; >", NSStringFromClass([self class]), _implementationDateTime]; - return descriptionString; -} - @end @implementation MTRApplianceEventsAndAlertClusterGetAlertsParams - (instancetype)init 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 e9b44f139a1fe3..5089f54032e101 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 @@ -1450,12 +1450,6 @@ // Server attributes -// Attribute ids for cluster: Messaging - -// Client attributes - -// Server attributes - // Attribute ids for cluster: Appliance Identification // Client attributes 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 d10c866bd50e60..4b3e6fb91fbd53 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 @@ -33030,74 +33030,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace AccountLogin -namespace Messaging { -namespace Attributes { - -namespace FeatureMap { - -EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) -{ - using Traits = NumericAttributeTraits; - Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = Traits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) -{ - using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - Traits::StorageType storageValue; - Traits::WorkingToStorage(value, storageValue); - uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); -} - -} // namespace FeatureMap - -namespace ClusterRevision { - -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) -{ - using Traits = NumericAttributeTraits; - Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Messaging::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = Traits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) -{ - using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - Traits::StorageType storageValue; - Traits::WorkingToStorage(value, storageValue); - uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::Messaging::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace Messaging - namespace ApplianceIdentification { namespace Attributes { 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 0263f3fe92db8a..81ad62bda063db 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 @@ -5669,22 +5669,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace AccountLogin -namespace Messaging { -namespace Attributes { - -namespace FeatureMap { -EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32 -EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); -} // namespace FeatureMap - -namespace ClusterRevision { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace Messaging - namespace ApplianceIdentification { namespace Attributes { 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 393a046cb1809a..0283da63b4d167 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -901,14 +901,6 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint); */ void emberAfAccountLoginClusterInitCallback(chip::EndpointId endpoint); -/** @brief Messaging Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfMessagingClusterInitCallback(chip::EndpointId endpoint); - /** @brief Appliance Identification Cluster Init * * Cluster Init @@ -11303,102 +11295,6 @@ void emberAfAccountLoginClusterServerTickCallback(chip::EndpointId endpoint); */ void emberAfAccountLoginClusterClientTickCallback(chip::EndpointId endpoint); -// -// Messaging Cluster -// - -/** @brief Messaging Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfMessagingClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Messaging Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfMessagingClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Messaging Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterMessagingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Messaging 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 emberAfMessagingClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); - -/** @brief Messaging 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 emberAfMessagingClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); - -/** @brief Messaging 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 -MatterMessagingClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Messaging 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 -MatterMessagingClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Messaging Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfMessagingClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Messaging Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfMessagingClusterClientTickCallback(chip::EndpointId endpoint); - // // Appliance Identification Cluster // @@ -13425,48 +13321,6 @@ bool emberAfAccountLoginClusterLoginCallback(chip::app::CommandHandler * command bool emberAfAccountLoginClusterLogoutCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::AccountLogin::Commands::Logout::DecodableType & commandData); -/** - * @brief Messaging Cluster DisplayMessage Command callback (from server) - */ -bool emberAfMessagingClusterDisplayMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint32_t messageId, uint8_t messageControl, uint32_t startTime, - uint16_t durationInMinutes, chip::CharSpan message, - uint8_t optionalExtendedMessageControl); -/** - * @brief Messaging Cluster GetLastMessage Command callback (from client) - */ -bool emberAfMessagingClusterGetLastMessageCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Messaging::Commands::GetLastMessage::DecodableType & commandData); -/** - * @brief Messaging Cluster CancelMessage Command callback (from server) - */ -bool emberAfMessagingClusterCancelMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint32_t messageId, uint8_t messageControl); -/** - * @brief Messaging Cluster MessageConfirmation Command callback (from client) - */ -bool emberAfMessagingClusterMessageConfirmationCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Messaging::Commands::MessageConfirmation::DecodableType & commandData); -/** - * @brief Messaging Cluster DisplayProtectedMessage Command callback (from server) - */ -bool emberAfMessagingClusterDisplayProtectedMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint32_t messageId, uint8_t messageControl, uint32_t startTime, - uint16_t durationInMinutes, chip::CharSpan message, - uint8_t optionalExtendedMessageControl); -/** - * @brief Messaging Cluster GetMessageCancellation Command callback (from client) - */ -bool emberAfMessagingClusterGetMessageCancellationCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Messaging::Commands::GetMessageCancellation::DecodableType & commandData); -/** - * @brief Messaging Cluster CancelAllMessages Command callback (from server) - */ -bool emberAfMessagingClusterCancelAllMessagesCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint32_t implementationDateTime); /** * @brief Appliance Events and Alert Cluster GetAlerts Command callback (from client) */ 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 8d44a1d1e50d2c..9c66e59889ba56 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 @@ -233,8 +233,6 @@ void __attribute__((weak)) MatterApplicationBasicPluginClientInitCallback() {} void MatterApplicationBasicPluginServerInitCallback(); void __attribute__((weak)) MatterAccountLoginPluginClientInitCallback() {} void MatterAccountLoginPluginServerInitCallback(); -void __attribute__((weak)) MatterMessagingPluginClientInitCallback() {} -void MatterMessagingPluginServerInitCallback(); void __attribute__((weak)) MatterApplianceIdentificationPluginClientInitCallback() {} void MatterApplianceIdentificationPluginServerInitCallback(); void __attribute__((weak)) MatterMeterIdentificationPluginClientInitCallback() {} diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index bf03770c1249ef..ebf0648f0fba01 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -2240,149 +2240,6 @@ enum class ApplicationStatusEnum : uint8_t namespace AccountLogin { } // namespace AccountLogin -namespace Messaging { - -// Enum for EventId -enum class EventId : uint8_t -{ - kMeterCoverRemoved = 0x00, - kMeterCoverClosed = 0x01, - kStrongMagneticField = 0x02, - kNoStrongMagneticField = 0x03, - kBatteryFailure = 0x04, - kLowBattery = 0x05, - kProgramMemoryError = 0x06, - kRamError = 0x07, - kNvMemoryError = 0x08, - kMeasurementSystemError = 0x09, - kWatchdogError = 0x0A, - kSupplyDisconnectFailure = 0x0B, - kSupplyConnectFailure = 0x0C, - kMeasurmentSoftwareChanged = 0x0D, - kDstEnabled = 0x0E, - kDstDisabled = 0x0F, - kClockAdjBackward = 0x10, - kClockAdjForward = 0x11, - kClockInvalid = 0x12, - kCommsErrorHan = 0x13, - kCommsOkHan = 0x14, - kFraudAttempt = 0x15, - kPowerLoss = 0x16, - kIncorrectProtocol = 0x17, - kUnusualHanTraffic = 0x18, - kUnexpectedClockChange = 0x19, - kCommsUsingUnauthenticatedComponent = 0x1A, - kErrorRegClear = 0x1B, - kAlarmRegClear = 0x1C, - kUnexpectedHwReset = 0x1D, - kUnexpectedProgramExecution = 0x1E, - kEventLogCleared = 0x1F, - kManualDisconnect = 0x20, - kManualConnect = 0x21, - kRemoteDisconnection = 0x22, - kLocalDisconnection = 0x23, - kLimitThresholdExceeded = 0x24, - kLimitThresholdOk = 0x25, - kLimitThresholdChanged = 0x26, - kMaximumDemandExceeded = 0x27, - kProfileCleared = 0x28, - kFirmwareReadyForActivation = 0x29, - kFirmwareActivated = 0x2A, - kPatchFailure = 0x2B, - kTouTariffActivation = 0x2C, - k8x8Tariffactivated = 0x2D, - kSingleTariffRateActivated = 0x2E, - kAsynchronousBillingOccurred = 0x2F, - kSynchronousBillingOccurred = 0x30, - kIncorrectPolarity = 0x80, - kCurrentNoVoltage = 0x81, - kUnderVoltage = 0x82, - kOverVoltage = 0x83, - kNormalVoltage = 0x84, - kPfBelowThreshold = 0x85, - kPfAboveThreshold = 0x86, - kTerminalCoverRemoved = 0x87, - kTerminalCoverClosed = 0x88, - kReverseFlow = 0xA0, - kTiltTamper = 0xA1, - kBatteryCoverRemoved = 0xA2, - kBatteryCoverClosed = 0xA3, - kExcessFlow = 0xA4, - kCreditOk = 0xC0, - kLowCredit = 0xC1, - kEmergencyCreditInUse = 0xC0, - kEmergencyCreditExhausted = 0xC1, - kZeroCreditEcNotSelected = 0xC2, - kSupplyOn = 0xC3, - kSupplyOffAarmed = 0xC4, - kSupplyOff = 0xC5, - kDiscountApplied = 0xC6, - kManufacturerSpecificA = 0xE0, - kManufacturerSpecificB = 0xE1, - kManufacturerSpecificC = 0xE2, - kManufacturerSpecificD = 0xE3, - kManufacturerSpecificE = 0xE4, - kManufacturerSpecificF = 0xE5, - kManufacturerSpecificG = 0xE6, - kManufacturerSpecificH = 0xE7, - kManufacturerSpecificI = 0xE8, -}; - -// Enum for MessagingControlConfirmation -enum class MessagingControlConfirmation : uint8_t -{ - kNotRequired = 0x00, - kRequired = 0x80, -}; - -// Enum for MessagingControlEnhancedConfirmation -enum class MessagingControlEnhancedConfirmation : uint8_t -{ - kNotRequired = 0x00, - kRequired = 0x20, -}; - -// Enum for MessagingControlImportance -enum class MessagingControlImportance : uint8_t -{ - kLow = 0x00, - kMedium = 0x04, - kHigh = 0x08, - kCritical = 0x0C, -}; - -// Enum for MessagingControlTransmission -enum class MessagingControlTransmission : uint8_t -{ - kNormal = 0x00, - kNormalAndAnonymous = 0x01, - kAnonymous = 0x02, - kReserved = 0x03, -}; - -// Bitmap for MessagingConfirmationControl -enum class MessagingConfirmationControl : uint8_t -{ - kNoReturned = 0x1, - kYesReturned = 0x2, -}; - -// Bitmap for MessagingControlMask -enum class MessagingControlMask : uint8_t -{ - kTransMechanism = 0x3, - kMessageUrgency = 0xC, - kEnhancedConfirmationRequest = 0x20, - kMessageConfirmation = 0x80, -}; - -// Bitmap for MessagingExtendedControlMask -enum class MessagingExtendedControlMask : uint8_t -{ - kMessageConfirmationStatus = 0x1, -}; -} // namespace Messaging - namespace ApplianceIdentification { } // namespace ApplianceIdentification 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 d2facf25253f48..c250f9ec837d22 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 @@ -343,9 +343,6 @@ static constexpr chip::ClusterId ZCL_APPLICATION_BASIC_CLUSTER_ID = 0x050D; // Definitions for cluster: Account Login static constexpr chip::ClusterId ZCL_ACCOUNT_LOGIN_CLUSTER_ID = 0x050E; -// Definitions for cluster: Messaging -static constexpr chip::ClusterId ZCL_MESSAGING_CLUSTER_ID = 0x0703; - // Definitions for cluster: Appliance Identification static constexpr chip::ClusterId ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID = 0x0B00; 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 9a9ffc38039e35..a952ac5190a615 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 @@ -21603,359 +21603,6 @@ namespace Events { } // namespace Events } // namespace AccountLogin -namespace Messaging { - -namespace Commands { -namespace DisplayMessage { -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::kMessageId)), messageId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)), - optionalExtendedMessageControl)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMessageId): - ReturnErrorOnFailure(DataModel::Decode(reader, messageId)); - break; - case to_underlying(Fields::kMessageControl): - ReturnErrorOnFailure(DataModel::Decode(reader, messageControl)); - break; - case to_underlying(Fields::kStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, startTime)); - break; - case to_underlying(Fields::kDurationInMinutes): - ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes)); - break; - case to_underlying(Fields::kMessage): - ReturnErrorOnFailure(DataModel::Decode(reader, message)); - break; - case to_underlying(Fields::kOptionalExtendedMessageControl): - ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace DisplayMessage. -namespace GetLastMessage { -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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace GetLastMessage. -namespace CancelMessage { -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::kMessageId)), messageId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMessageId): - ReturnErrorOnFailure(DataModel::Decode(reader, messageId)); - break; - case to_underlying(Fields::kMessageControl): - ReturnErrorOnFailure(DataModel::Decode(reader, messageControl)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace CancelMessage. -namespace MessageConfirmation { -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::kMessageId)), messageId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kConfirmationTime)), confirmationTime)); - ReturnErrorOnFailure( - DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageConfirmationControl)), messageConfirmationControl)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageResponse)), messageResponse)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMessageId): - ReturnErrorOnFailure(DataModel::Decode(reader, messageId)); - break; - case to_underlying(Fields::kConfirmationTime): - ReturnErrorOnFailure(DataModel::Decode(reader, confirmationTime)); - break; - case to_underlying(Fields::kMessageConfirmationControl): - ReturnErrorOnFailure(DataModel::Decode(reader, messageConfirmationControl)); - break; - case to_underlying(Fields::kMessageResponse): - ReturnErrorOnFailure(DataModel::Decode(reader, messageResponse)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MessageConfirmation. -namespace DisplayProtectedMessage { -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::kMessageId)), messageId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessageControl)), messageControl)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartTime)), startTime)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDurationInMinutes)), durationInMinutes)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMessage)), message)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionalExtendedMessageControl)), - optionalExtendedMessageControl)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMessageId): - ReturnErrorOnFailure(DataModel::Decode(reader, messageId)); - break; - case to_underlying(Fields::kMessageControl): - ReturnErrorOnFailure(DataModel::Decode(reader, messageControl)); - break; - case to_underlying(Fields::kStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, startTime)); - break; - case to_underlying(Fields::kDurationInMinutes): - ReturnErrorOnFailure(DataModel::Decode(reader, durationInMinutes)); - break; - case to_underlying(Fields::kMessage): - ReturnErrorOnFailure(DataModel::Decode(reader, message)); - break; - case to_underlying(Fields::kOptionalExtendedMessageControl): - ReturnErrorOnFailure(DataModel::Decode(reader, optionalExtendedMessageControl)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace DisplayProtectedMessage. -namespace GetMessageCancellation { -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::kEarliestImplementationTime)), earliestImplementationTime)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kEarliestImplementationTime): - ReturnErrorOnFailure(DataModel::Decode(reader, earliestImplementationTime)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace GetMessageCancellation. -namespace CancelAllMessages { -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::kImplementationDateTime)), implementationDateTime)); - 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) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kImplementationDateTime): - ReturnErrorOnFailure(DataModel::Decode(reader, implementationDateTime)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace CancelAllMessages. -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace Messaging namespace ApplianceIdentification { namespace Commands { 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 c4ff3169f9652d..fc20a1f967b678 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 @@ -29631,367 +29631,6 @@ struct TypeInfo }; } // namespace Attributes } // namespace AccountLogin -namespace Messaging { - -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace DisplayMessage { -struct Type; -struct DecodableType; -} // namespace DisplayMessage - -namespace GetLastMessage { -struct Type; -struct DecodableType; -} // namespace GetLastMessage - -namespace CancelMessage { -struct Type; -struct DecodableType; -} // namespace CancelMessage - -namespace MessageConfirmation { -struct Type; -struct DecodableType; -} // namespace MessageConfirmation - -namespace DisplayProtectedMessage { -struct Type; -struct DecodableType; -} // namespace DisplayProtectedMessage - -namespace GetMessageCancellation { -struct Type; -struct DecodableType; -} // namespace GetMessageCancellation - -namespace CancelAllMessages { -struct Type; -struct DecodableType; -} // namespace CancelAllMessages - -} // namespace Commands - -namespace Commands { -namespace DisplayMessage { -enum class Fields -{ - kMessageId = 0, - kMessageControl = 1, - kStartTime = 2, - kDurationInMinutes = 3, - kMessage = 4, - kOptionalExtendedMessageControl = 5, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - uint32_t startTime = static_cast(0); - uint16_t durationInMinutes = static_cast(0); - chip::CharSpan message; - chip::BitMask optionalExtendedMessageControl = - static_cast>(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::DisplayMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - uint32_t startTime = static_cast(0); - uint16_t durationInMinutes = static_cast(0); - chip::CharSpan message; - chip::BitMask optionalExtendedMessageControl = - static_cast>(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace DisplayMessage -namespace GetLastMessage { -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::GetLastMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::GetLastMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace GetLastMessage -namespace CancelMessage { -enum class Fields -{ - kMessageId = 0, - kMessageControl = 1, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::CancelMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace CancelMessage -namespace MessageConfirmation { -enum class Fields -{ - kMessageId = 0, - kConfirmationTime = 1, - kMessageConfirmationControl = 2, - kMessageResponse = 3, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - uint32_t confirmationTime = static_cast(0); - uint8_t messageConfirmationControl = static_cast(0); - chip::ByteSpan messageResponse; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MessageConfirmation::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - uint32_t confirmationTime = static_cast(0); - uint8_t messageConfirmationControl = static_cast(0); - chip::ByteSpan messageResponse; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MessageConfirmation -namespace DisplayProtectedMessage { -enum class Fields -{ - kMessageId = 0, - kMessageControl = 1, - kStartTime = 2, - kDurationInMinutes = 3, - kMessage = 4, - kOptionalExtendedMessageControl = 5, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - uint32_t startTime = static_cast(0); - uint16_t durationInMinutes = static_cast(0); - chip::CharSpan message; - chip::BitMask optionalExtendedMessageControl = - static_cast>(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::DisplayProtectedMessage::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t messageId = static_cast(0); - chip::BitMask messageControl = static_cast>(0); - uint32_t startTime = static_cast(0); - uint16_t durationInMinutes = static_cast(0); - chip::CharSpan message; - chip::BitMask optionalExtendedMessageControl = - static_cast>(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace DisplayProtectedMessage -namespace GetMessageCancellation { -enum class Fields -{ - kEarliestImplementationTime = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t earliestImplementationTime = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::GetMessageCancellation::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t earliestImplementationTime = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace GetMessageCancellation -namespace CancelAllMessages { -enum class Fields -{ - kImplementationDateTime = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t implementationDateTime = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::CancelAllMessages::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - uint32_t implementationDateTime = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace CancelAllMessages -} // namespace Commands - -namespace Attributes { - -namespace GeneratedCommandList { -struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo -{ - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } -}; -} // namespace GeneratedCommandList -namespace AcceptedCommandList { -struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo -{ - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } -}; -} // namespace AcceptedCommandList -namespace AttributeList { -struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo -{ - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } -}; -} // namespace AttributeList -namespace FeatureMap { -struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo -{ - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo -{ - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } -}; -} // namespace ClusterRevision - -struct TypeInfo -{ - struct DecodableType - { - static constexpr ClusterId GetClusterId() { return Clusters::Messaging::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - - Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; - Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; - Attributes::AttributeList::TypeInfo::DecodableType attributeList; - Attributes::FeatureMap::TypeInfo::DecodableType featureMap = static_cast(0); - Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast(0); - }; -}; -} // namespace Attributes -} // namespace Messaging namespace ApplianceIdentification { namespace Attributes { 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 8135695b990b13..916f289b60a360 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 @@ -356,15 +356,6 @@ #define ZCL_LOGIN_COMMAND_ID (0x02) #define ZCL_LOGOUT_COMMAND_ID (0x03) -// Commands for cluster: Messaging -#define ZCL_DISPLAY_MESSAGE_COMMAND_ID (0x00) -#define ZCL_GET_LAST_MESSAGE_COMMAND_ID (0x00) -#define ZCL_CANCEL_MESSAGE_COMMAND_ID (0x01) -#define ZCL_MESSAGE_CONFIRMATION_COMMAND_ID (0x01) -#define ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID (0x02) -#define ZCL_GET_MESSAGE_CANCELLATION_COMMAND_ID (0x02) -#define ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID (0x03) - // Commands for cluster: Appliance Events and Alert #define ZCL_GET_ALERTS_COMMAND_ID (0x00) #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00) diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 252127c9185fd8..dce2505e4ea734 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -755,20 +755,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_MAINS_ALARM_MASK_MAINS_POWER_SUPPLY_LOST_OFFSET (2) #define EMBER_AF_MEDIA_INPUT_FEATURE_NAME_UPDATES (1) #define EMBER_AF_MEDIA_INPUT_FEATURE_NAME_UPDATES_OFFSET (0) -#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_NO_RETURNED (1) -#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_NO_RETURNED_OFFSET (0) -#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_YES_RETURNED (2) -#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_YES_RETURNED_OFFSET (1) -#define EMBER_AF_MESSAGING_CONTROL_MASK_TRANS_MECHANISM (3) -#define EMBER_AF_MESSAGING_CONTROL_MASK_TRANS_MECHANISM_OFFSET (0) -#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_URGENCY (12) -#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_URGENCY_OFFSET (2) -#define EMBER_AF_MESSAGING_CONTROL_MASK_ENHANCED_CONFIRMATION_REQUEST (32) -#define EMBER_AF_MESSAGING_CONTROL_MASK_ENHANCED_CONFIRMATION_REQUEST_OFFSET (5) -#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_CONFIRMATION (128) -#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_CONFIRMATION_OFFSET (7) -#define EMBER_AF_MESSAGING_EXTENDED_CONTROL_MASK_MESSAGE_CONFIRMATION_STATUS (1) -#define EMBER_AF_MESSAGING_EXTENDED_CONTROL_MASK_MESSAGE_CONFIRMATION_STATUS_OFFSET (0) #define EMBER_AF_MODE_MOTOR_DIRECTION_REVERSED (1) #define EMBER_AF_MODE_MOTOR_DIRECTION_REVERSED_OFFSET (0) #define EMBER_AF_MODE_CALIBRATION_MODE (2) 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 c665aa9c6c3e98..f41f3ebb818269 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 @@ -5949,32 +5949,6 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace AccountLogin -namespace Messaging { -namespace Attributes { - -namespace GeneratedCommandList { -static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; -} // namespace GeneratedCommandList - -namespace AcceptedCommandList { -static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id; -} // namespace AcceptedCommandList - -namespace AttributeList { -static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id; -} // namespace AttributeList - -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 Messaging - namespace ApplianceIdentification { namespace Attributes { 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 4c4d17c7a13210..35b73227baf9ff 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 @@ -346,9 +346,6 @@ static constexpr ClusterId Id = 0x0000050D; namespace AccountLogin { static constexpr ClusterId Id = 0x0000050E; } // namespace AccountLogin -namespace Messaging { -static constexpr ClusterId Id = 0x00000703; -} // namespace Messaging namespace ApplianceIdentification { static constexpr ClusterId Id = 0x00000B00; } // namespace ApplianceIdentification 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 b4979dbe3dd9e3..994e5919623c31 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 @@ -1243,40 +1243,6 @@ static constexpr CommandId Id = 0x00000003; } // namespace Commands } // namespace AccountLogin -namespace Messaging { -namespace Commands { - -namespace DisplayMessage { -static constexpr CommandId Id = 0x00000000; -} // namespace DisplayMessage - -namespace GetLastMessage { -static constexpr CommandId Id = 0x00000000; -} // namespace GetLastMessage - -namespace CancelMessage { -static constexpr CommandId Id = 0x00000001; -} // namespace CancelMessage - -namespace MessageConfirmation { -static constexpr CommandId Id = 0x00000001; -} // namespace MessageConfirmation - -namespace DisplayProtectedMessage { -static constexpr CommandId Id = 0x00000002; -} // namespace DisplayProtectedMessage - -namespace GetMessageCancellation { -static constexpr CommandId Id = 0x00000002; -} // namespace GetMessageCancellation - -namespace CancelAllMessages { -static constexpr CommandId Id = 0x00000003; -} // namespace CancelAllMessages - -} // namespace Commands -} // namespace Messaging - namespace ApplianceEventsAndAlert { namespace Commands { 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 a79175a20136da..1aefef551764c0 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 @@ -734,12 +734,6 @@ #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER #endif -#if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, "Messaging" }, -#else -#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER -#endif - #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, "Appliance Identification" }, #else @@ -885,7 +879,6 @@ CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \ CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \ CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \ - CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \ CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \ CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \ CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index de0669afab61da..8de802c02a9098 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -140,7 +140,6 @@ | ApplicationLauncher | 0x050C | | ApplicationBasic | 0x050D | | AccountLogin | 0x050E | -| Messaging | 0x0703 | | ApplianceIdentification | 0x0B00 | | MeterIdentification | 0x0B01 | | ApplianceEventsAndAlert | 0x0B02 | @@ -8635,118 +8634,6 @@ class AccountLoginLogout : public ClusterCommand chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest; }; -/*----------------------------------------------------------------------------*\ -| Cluster Messaging | 0x0703 | -|------------------------------------------------------------------------------| -| Commands: | | -| * GetLastMessage | 0x00 | -| * MessageConfirmation | 0x01 | -| * GetMessageCancellation | 0x02 | -|------------------------------------------------------------------------------| -| Attributes: | | -| * GeneratedCommandList | 0xFFF8 | -| * AcceptedCommandList | 0xFFF9 | -| * AttributeList | 0xFFFB | -| * FeatureMap | 0xFFFC | -| * ClusterRevision | 0xFFFD | -|------------------------------------------------------------------------------| -| Events: | | -\*----------------------------------------------------------------------------*/ - -/* - * Command GetLastMessage - */ -class MessagingGetLastMessage : public ClusterCommand -{ -public: - MessagingGetLastMessage(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-last-message", credsIssuerConfig) - { - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000000, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000000) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000000, mRequest); - } - -private: - chip::app::Clusters::Messaging::Commands::GetLastMessage::Type mRequest; -}; - -/* - * Command MessageConfirmation - */ -class MessagingMessageConfirmation : public ClusterCommand -{ -public: - MessagingMessageConfirmation(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("message-confirmation", credsIssuerConfig) - { - AddArgument("MessageId", 0, UINT32_MAX, &mRequest.messageId); - AddArgument("ConfirmationTime", 0, UINT32_MAX, &mRequest.confirmationTime); - AddArgument("MessageConfirmationControl", 0, UINT8_MAX, &mRequest.messageConfirmationControl); - AddArgument("MessageResponse", &mRequest.messageResponse); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::Messaging::Commands::MessageConfirmation::Type mRequest; -}; - -/* - * Command GetMessageCancellation - */ -class MessagingGetMessageCancellation : public ClusterCommand -{ -public: - MessagingGetMessageCancellation(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("get-message-cancellation", credsIssuerConfig) - { - AddArgument("EarliestImplementationTime", 0, UINT32_MAX, &mRequest.earliestImplementationTime); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000703, 0x00000002, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000703) command (0x00000002) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000703, 0x00000002, mRequest); - } - -private: - chip::app::Clusters::Messaging::Commands::GetMessageCancellation::Type mRequest; -}; - /*----------------------------------------------------------------------------*\ | Cluster ApplianceIdentification | 0x0B00 | |------------------------------------------------------------------------------| @@ -16317,45 +16204,6 @@ void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * commands.Register(clusterName, clusterCommands); } -void registerClusterMessaging(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) -{ - using namespace chip::app::Clusters::Messaging; - - const char * clusterName = "Messaging"; - - commands_list clusterCommands = { - // - // Commands - // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - // - // Attributes - // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - 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, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - // - // Events - // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - }; - - commands.Register(clusterName, clusterCommands); -} void registerClusterApplianceIdentification(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { using namespace chip::app::Clusters::ApplianceIdentification; @@ -17460,7 +17308,6 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterApplicationLauncher(commands, credsIssuerConfig); registerClusterApplicationBasic(commands, credsIssuerConfig); registerClusterAccountLogin(commands, credsIssuerConfig); - registerClusterMessaging(commands, credsIssuerConfig); registerClusterApplianceIdentification(commands, credsIssuerConfig); registerClusterMeterIdentification(commands, credsIssuerConfig); registerClusterApplianceEventsAndAlert(commands, credsIssuerConfig); 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 db233e74c9e811..68e3a004d0456e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -142,7 +142,6 @@ | ApplicationLauncher | 0x050C | | ApplicationBasic | 0x050D | | AccountLogin | 0x050E | -| Messaging | 0x0703 | | ApplianceIdentification | 0x0B00 | | MeterIdentification | 0x0B01 | | ApplianceEventsAndAlert | 0x0B02 |