diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 96b2b8d38b02f8..7c815d8b129a8b 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -19988,6 +19988,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 8797f9f2f9e7dc..5b0a5680dc403d 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -4544,6 +4544,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.zap b/examples/door-lock-app/door-lock-common/door-lock-app.zap index 2005037317d9cf..96599e796750be 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.zap +++ b/examples/door-lock-app/door-lock-common/door-lock-app.zap @@ -6166,6 +6166,5 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index bc7f5e82de85cd..1ba6d25d72e9d9 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -6737,6 +6737,5 @@ "endpointVersion": 1, "deviceIdentifier": 259 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 3a4a932f72b95f..00007750128abe 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -5754,6 +5754,5 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index ac517f02102643..d310ffd6d83ba9 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -3864,6 +3864,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index 61f9c57ef951e1..6f4a10492c5798 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -3963,6 +3963,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index aa5acc9e5c7880..5db813dc3dedbc 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -6253,6 +6253,5 @@ "endpointVersion": 1, "deviceIdentifier": 771 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 5c5dabed60e3e5..09e21931e82674 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -5998,6 +5998,5 @@ "endpointVersion": 1, "deviceIdentifier": 772 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index 503fdb2e7bb73e..b527b636474ed3 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -3408,6 +3408,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 4eabfcd62e8e4d..2c8181b6c56088 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -13839,6 +13839,5 @@ "endpointVersion": 1, "deviceIdentifier": 769 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index bdb14be5f02b4d..f1d3b04f738a40 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -10637,6 +10637,5 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 7e95189d1b678c..6f8afd28b8dade 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -16368,6 +16368,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 320de9fd66734b..7fdbb2ed18cab0 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -7608,6 +7608,5 @@ "endpointVersion": 1, "deviceIdentifier": 514 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 36e7de9c6e0905..aa2738e8a35d93 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -30,8 +30,6 @@ - - @@ -54,9 +52,11 @@ + + diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-time-format-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml similarity index 96% rename from src/app/zap-templates/zcl/data-model/chip/localization-time-format-cluster.xml rename to src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml index 819c4baaf54375..c2c712fa298365 100644 --- a/src/app/zap-templates/zcl/data-model/chip/localization-time-format-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml @@ -38,9 +38,9 @@ limitations under the License. General - Localization Time Format + Time Format Localization 0x002c - LOCALIZATION_TIME_FORMAT_CLUSTER + TIME_FORMAT_LOCALIZATION_CLUSTER true true Nodes should be expected to be deployed to any and all regions of the world. These global regions diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-unit-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-cluster-localization.xml similarity index 95% rename from src/app/zap-templates/zcl/data-model/chip/localization-unit-cluster.xml rename to src/app/zap-templates/zcl/data-model/chip/unit-cluster-localization.xml index b5763f7a3da800..cabfe44cf929d1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/localization-unit-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/unit-cluster-localization.xml @@ -24,9 +24,9 @@ limitations under the License. General - Localization Unit + Unit Localization 0x002d - LOCALIZATION_UNIT_CLUSTER + UNIT_LOCALIZATION_CLUSTER true true Nodes should be expected to be deployed to any and all regions of the world. These global regions diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 23e5d63e6840de..9b5ef11f101753 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -33,8 +33,6 @@ "illuminance-measurement-cluster.xml", "keypad-input-cluster.xml", "localization-configuration-cluster.xml", - "localization-time-format-cluster.xml", - "localization-unit-cluster.xml", "low-power-cluster.xml", "media-input-cluster.xml", "media-playback-cluster.xml", @@ -57,8 +55,10 @@ "test-cluster.xml", "thermostat-cluster.xml", "thread-network-diagnostics-cluster.xml", + "time-format-localization-cluster.xml", "time-synchronization-cluster.xml", "user-label-cluster.xml", + "unit-localization-cluster.xml", "wake-on-lan-cluster.xml", "wifi-network-diagnostics-cluster.xml", "window-covering.xml", diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 127fac0778ba39..0e9154291779a1 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -14234,6 +14234,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 17211fb6a1b470..2b0a02d13883f6 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7089,7 +7089,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class LocalizationTimeFormat(Cluster): +class TimeFormatLocalization(Cluster): id: typing.ClassVar[int] = 0x002C @ChipUtility.classproperty @@ -7098,7 +7098,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="hourFormat", Tag=0x00000000, Type=uint), ClusterObjectFieldDescriptor(Label="calendarType", Tag=0x00000001, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="supportedCalendarTypes", Tag=0x00000002, Type=typing.Optional[typing.List[LocalizationTimeFormat.Enums.CalendarType]]), + ClusterObjectFieldDescriptor(Label="supportedCalendarTypes", Tag=0x00000002, Type=typing.Optional[typing.List[TimeFormatLocalization.Enums.CalendarType]]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), @@ -7106,7 +7106,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: hourFormat: 'uint' = None calendarType: 'typing.Optional[uint]' = None - supportedCalendarTypes: 'typing.Optional[typing.List[LocalizationTimeFormat.Enums.CalendarType]]' = None + supportedCalendarTypes: 'typing.Optional[typing.List[TimeFormatLocalization.Enums.CalendarType]]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None @@ -7178,9 +7178,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[LocalizationTimeFormat.Enums.CalendarType]]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[TimeFormatLocalization.Enums.CalendarType]]) - value: 'typing.Optional[typing.List[LocalizationTimeFormat.Enums.CalendarType]]' = None + value: 'typing.Optional[typing.List[TimeFormatLocalization.Enums.CalendarType]]' = None @dataclass class AttributeList(ClusterAttributeDescriptor): @@ -7232,101 +7232,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: -@dataclass -class LocalizationUnit(Cluster): - id: typing.ClassVar[int] = 0x002D - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="temperatureUnit", Tag=0x00000000, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), - ]) - - temperatureUnit: 'typing.Optional[uint]' = None - attributeList: 'typing.List[uint]' = None - featureMap: 'typing.Optional[uint]' = None - clusterRevision: 'uint' = None - - class Enums: - class TempUnit(IntEnum): - kFahrenheit = 0x00 - kCelsius = 0x01 - kKelvin = 0x02 - - - - - class Attributes: - @dataclass - class TemperatureUnit(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x002D - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class AttributeList(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x002D - - @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 0x002D - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x002D - - @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 PowerSourceConfiguration(Cluster): id: typing.ClassVar[int] = 0x002E diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 636032e37de03f..c9fb60c87a4b87 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -7323,17 +7323,17 @@ } } -void CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::LocalizationTimeFormat::CalendarType value) +void CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::TimeFormatLocalization::CalendarType value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -7347,8 +7347,8 @@ } } -void CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -7359,10 +7359,10 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( +void CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -7376,17 +7376,17 @@ } } -void CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::LocalizationTimeFormat::HourFormat value) +void CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::TimeFormatLocalization::HourFormat value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -7400,8 +7400,8 @@ } } -void CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -7412,62 +7412,10 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( +void CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge::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 CHIPLocalizationUnitClusterTempUnitAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::LocalizationUnit::TempUnit value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void CHIPLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge::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 CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackBridge::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 CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) -{ - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index 18ec84215ddad8..2e401162c7c2f0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -205,17 +205,14 @@ typedef void (*OtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallb void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum); typedef void (*NullableOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*LocalizationTimeFormatClusterCalendarTypeAttributeCallback)( - void *, chip::app::Clusters::LocalizationTimeFormat::CalendarType); -typedef void (*NullableLocalizationTimeFormatClusterCalendarTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*LocalizationTimeFormatClusterHourFormatAttributeCallback)(void *, - chip::app::Clusters::LocalizationTimeFormat::HourFormat); -typedef void (*NullableLocalizationTimeFormatClusterHourFormatAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*LocalizationUnitClusterTempUnitAttributeCallback)(void *, chip::app::Clusters::LocalizationUnit::TempUnit); -typedef void (*NullableLocalizationUnitClusterTempUnitAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*TimeFormatLocalizationClusterCalendarTypeAttributeCallback)( + void *, chip::app::Clusters::TimeFormatLocalization::CalendarType); +typedef void (*NullableTimeFormatLocalizationClusterCalendarTypeAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*TimeFormatLocalizationClusterHourFormatAttributeCallback)(void *, + chip::app::Clusters::TimeFormatLocalization::HourFormat); +typedef void (*NullableTimeFormatLocalizationClusterHourFormatAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*GeneralCommissioningClusterGeneralCommissioningErrorAttributeCallback)( void *, chip::app::Clusters::GeneralCommissioning::GeneralCommissioningError); typedef void (*NullableGeneralCommissioningClusterGeneralCommissioningErrorAttributeCallback)( @@ -6074,26 +6071,26 @@ class CHIPNullableOtaSoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCa SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::LocalizationTimeFormat::CalendarType value); + static void OnSuccessFn(void * context, chip::app::Clusters::TimeFormatLocalization::CalendarType value); }; -class CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge - : public CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge +class CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge + : public CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge { public: - CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge( + CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -6103,28 +6100,28 @@ class CHIPLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscription SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge +class CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge + : public CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge { public: - CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubscriptionBridge( + CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableTimeFormatLocalizationClusterCalendarTypeAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -6134,26 +6131,26 @@ class CHIPNullableLocalizationTimeFormatClusterCalendarTypeAttributeCallbackSubs SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::LocalizationTimeFormat::HourFormat value); + static void OnSuccessFn(void * context, chip::app::Clusters::TimeFormatLocalization::HourFormat value); }; -class CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge - : public CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge +class CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge + : public CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge { public: - CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge( + CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge(queue, handler, action, true), + CHIPTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -6163,85 +6160,27 @@ class CHIPLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge - : public CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge +class CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge + : public CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge { public: - CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackSubscriptionBridge( + CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableLocalizationTimeFormatClusterHourFormatAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class CHIPLocalizationUnitClusterTempUnitAttributeCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPLocalizationUnitClusterTempUnitAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::LocalizationUnit::TempUnit value); -}; - -class CHIPLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge - : public CHIPLocalizationUnitClusterTempUnitAttributeCallbackBridge -{ -public: - CHIPLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPLocalizationUnitClusterTempUnitAttributeCallbackBridge(queue, handler, action, true), - mEstablishedHandler(establishedHandler) - {} - - static void OnSubscriptionEstablished(void * context); - -private: - SubscriptionEstablishedHandler mEstablishedHandler; -}; - -class CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge - : public CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackBridge -{ -public: - CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableLocalizationUnitClusterTempUnitAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableTimeFormatLocalizationClusterHourFormatAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} 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 7832f567f2e1cc..e57e669be51f0c 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 @@ -330,7 +330,7 @@ #define ZCL_ACTIVE_LOCALE_ATTRIBUTE_ID (0x0001) #define ZCL_SUPPORTED_LOCALES_ATTRIBUTE_ID (0x0002) -// Attribute ids for cluster: Localization Time Format +// Attribute ids for cluster: Time Format Localization // Client attributes @@ -339,13 +339,6 @@ #define ZCL_CALENDAR_TYPE_ATTRIBUTE_ID (0x0001) #define ZCL_SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID (0x0002) -// Attribute ids for cluster: Localization Unit - -// Client attributes - -// Server attributes -#define ZCL_TEMPERATURE_UNIT_ATTRIBUTE_ID (0x0000) - // Attribute ids for cluster: Power Source Configuration // 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 cab6c1d8530f09..8e9bf8fad3186e 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 @@ -6531,7 +6531,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { namespace Attributes { namespace HourFormat { @@ -6541,7 +6541,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -6560,7 +6560,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } } // namespace HourFormat @@ -6572,7 +6572,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -6591,7 +6591,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } } // namespace CalendarType @@ -6603,7 +6603,7 @@ 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::LocalizationTimeFormat::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -6622,7 +6622,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -6634,7 +6634,7 @@ 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::LocalizationTimeFormat::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -6653,112 +6653,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::LocalizationTimeFormat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace LocalizationTimeFormat - -namespace LocalizationUnit { -namespace Attributes { - -namespace TemperatureUnit { - -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) -{ - using Traits = NumericAttributeTraits; - Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::LocalizationUnit::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, uint8_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::LocalizationUnit::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); -} - -} // namespace TemperatureUnit - -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::LocalizationUnit::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::LocalizationUnit::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::LocalizationUnit::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::LocalizationUnit::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); -} - -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { 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 3630fe9efbcc22..1acd7c9462845c 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 @@ -1187,7 +1187,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { namespace Attributes { namespace HourFormat { @@ -1211,28 +1211,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace LocalizationTimeFormat - -namespace LocalizationUnit { -namespace Attributes { - -namespace TemperatureUnit { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace TemperatureUnit - -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 LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { 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 040d705f7ad673..11d7eb7a353b61 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -229,21 +229,13 @@ void emberAfOtaSoftwareUpdateRequestorClusterInitCallback(chip::EndpointId endpo */ void emberAfLocalizationConfigurationClusterInitCallback(chip::EndpointId endpoint); -/** @brief Localization Time Format Cluster Init +/** @brief Time Format Localization Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLocalizationTimeFormatClusterInitCallback(chip::EndpointId endpoint); - -/** @brief Localization Unit Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfLocalizationUnitClusterInitCallback(chip::EndpointId endpoint); +void emberAfTimeFormatLocalizationClusterInitCallback(chip::EndpointId endpoint); /** @brief Power Source Configuration Cluster Init * @@ -3386,42 +3378,42 @@ void emberAfLocalizationConfigurationClusterServerTickCallback(chip::EndpointId void emberAfLocalizationConfigurationClusterClientTickCallback(chip::EndpointId endpoint); // -// Localization Time Format Cluster +// Time Format Localization Cluster // -/** @brief Localization Time Format Cluster Server Init +/** @brief Time Format Localization Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLocalizationTimeFormatClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfTimeFormatLocalizationClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Localization Time Format Cluster Client Init +/** @brief Time Format Localization Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLocalizationTimeFormatClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfTimeFormatLocalizationClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Localization Time Format Cluster Server Attribute Changed +/** @brief Time Format Localization Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterLocalizationTimeFormatClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterTimeFormatLocalizationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Localization Time Format Cluster Client Attribute Changed +/** @brief Time Format Localization Cluster Client Attribute Changed * * Client Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterLocalizationTimeFormatClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterTimeFormatLocalizationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Localization Time Format Cluster Server Message Sent +/** @brief Time Format Localization Cluster Server Message Sent * * Server Message Sent * @@ -3431,11 +3423,11 @@ void MatterLocalizationTimeFormatClusterClientAttributeChangedCallback(const chi * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLocalizationTimeFormatClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, +void emberAfTimeFormatLocalizationClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief Localization Time Format Cluster Client Message Sent +/** @brief Time Format Localization Cluster Client Message Sent * * Client Message Sent * @@ -3445,11 +3437,11 @@ void emberAfLocalizationTimeFormatClusterServerMessageSentCallback(const chip::M * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLocalizationTimeFormatClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, +void emberAfTimeFormatLocalizationClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief Localization Time Format Cluster Server Pre Attribute Changed +/** @brief Time Format Localization Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -3458,10 +3450,10 @@ void emberAfLocalizationTimeFormatClusterClientMessageSentCallback(const chip::M * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterLocalizationTimeFormatClusterServerPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Localization Time Format Cluster Client Pre Attribute Changed +/** @brief Time Format Localization Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -3470,130 +3462,24 @@ chip::Protocols::InteractionModel::Status MatterLocalizationTimeFormatClusterSer * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterLocalizationTimeFormatClusterClientPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status MatterTimeFormatLocalizationClusterClientPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Localization Time Format Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfLocalizationTimeFormatClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Localization Time Format Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfLocalizationTimeFormatClusterClientTickCallback(chip::EndpointId endpoint); - -// -// Localization Unit Cluster -// - -/** @brief Localization Unit Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfLocalizationUnitClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Localization Unit Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfLocalizationUnitClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Localization Unit Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLocalizationUnitClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Localization Unit Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLocalizationUnitClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Localization Unit 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 emberAfLocalizationUnitClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Localization Unit 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 emberAfLocalizationUnitClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Localization Unit 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 -MatterLocalizationUnitClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Localization Unit 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 -MatterLocalizationUnitClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Localization Unit Cluster Server Tick +/** @brief Time Format Localization Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfLocalizationUnitClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfTimeFormatLocalizationClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Localization Unit Cluster Client Tick +/** @brief Time Format Localization Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfLocalizationUnitClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfTimeFormatLocalizationClusterClientTickCallback(chip::EndpointId endpoint); // // Power Source Configuration Cluster 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 1f3bd616d38308..ccc825404be941 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 @@ -65,10 +65,8 @@ void __attribute__((weak)) MatterOtaSoftwareUpdateRequestorPluginClientInitCallb void MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); void __attribute__((weak)) MatterLocalizationConfigurationPluginClientInitCallback() {} void MatterLocalizationConfigurationPluginServerInitCallback(); -void __attribute__((weak)) MatterLocalizationTimeFormatPluginClientInitCallback() {} -void MatterLocalizationTimeFormatPluginServerInitCallback(); -void __attribute__((weak)) MatterLocalizationUnitPluginClientInitCallback() {} -void MatterLocalizationUnitPluginServerInitCallback(); +void __attribute__((weak)) MatterTimeFormatLocalizationPluginClientInitCallback() {} +void MatterTimeFormatLocalizationPluginServerInitCallback(); void __attribute__((weak)) MatterPowerSourceConfigurationPluginClientInitCallback() {} void MatterPowerSourceConfigurationPluginServerInitCallback(); void __attribute__((weak)) MatterPowerSourcePluginClientInitCallback() {} 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 a5808bc36e11f8..0a0588109bd50a 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 @@ -91,11 +91,8 @@ static constexpr chip::ClusterId ZCL_OTA_REQUESTOR_CLUSTER_ID = 0x002A; // Definitions for cluster: Localization Configuration static constexpr chip::ClusterId ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID = 0x002B; -// Definitions for cluster: Localization Time Format -static constexpr chip::ClusterId ZCL_LOCALIZATION_TIME_FORMAT_CLUSTER_ID = 0x002C; - -// Definitions for cluster: Localization Unit -static constexpr chip::ClusterId ZCL_LOCALIZATION_UNIT_CLUSTER_ID = 0x002D; +// Definitions for cluster: Time Format Localization +static constexpr chip::ClusterId ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID = 0x002C; // Definitions for cluster: Power Source Configuration static constexpr chip::ClusterId ZCL_POWER_SOURCE_CONFIGURATION_CLUSTER_ID = 0x002E; 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 f88d21cd6be73f..64567e22e6ccc1 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 @@ -6396,7 +6396,7 @@ namespace Events { } // namespace Events } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { namespace Commands { } // namespace Commands @@ -6435,41 +6435,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events { } // namespace Events -} // namespace LocalizationTimeFormat -namespace LocalizationUnit { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::TemperatureUnit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, temperatureUnit)); - 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 LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { 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 8064d67fa1195a..61baa294f9ec8f 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 @@ -8911,7 +8911,7 @@ struct TypeInfo }; } // namespace Attributes } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { // Enum for CalendarType enum class CalendarType : uint8_t { @@ -8944,7 +8944,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::HourFormat::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -8956,7 +8956,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CalendarType::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -8964,11 +8964,11 @@ struct TypeInfo namespace SupportedCalendarTypes { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList &; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedCalendarTypes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -8980,7 +8980,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::DecodableList; using DecodableArgType = const chip::app::DataModel::DecodableList &; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -8992,7 +8992,7 @@ struct TypeInfo using DecodableType = uint32_t; using DecodableArgType = uint32_t; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -9004,7 +9004,7 @@ struct TypeInfo using DecodableType = uint16_t; using DecodableArgType = uint16_t; - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -9014,7 +9014,7 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationTimeFormat::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::TimeFormatLocalization::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); @@ -9027,83 +9027,7 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace LocalizationTimeFormat -namespace LocalizationUnit { -// Enum for TempUnit -enum class TempUnit : uint8_t -{ - kFahrenheit = 0x00, - kCelsius = 0x01, - kKelvin = 0x02, -}; - -namespace Attributes { - -namespace TemperatureUnit { -struct TypeInfo -{ - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; - - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationUnit::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureUnit::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace TemperatureUnit -namespace AttributeList { -struct TypeInfo -{ - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList &; - - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationUnit::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AttributeList::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace AttributeList -namespace FeatureMap { -struct TypeInfo -{ - using Type = uint32_t; - using DecodableType = uint32_t; - using DecodableArgType = uint32_t; - - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationUnit::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationUnit::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace ClusterRevision - -struct TypeInfo -{ - struct DecodableType - { - static constexpr ClusterId GetClusterId() { return Clusters::LocalizationUnit::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - - Attributes::TemperatureUnit::TypeInfo::DecodableType temperatureUnit; - Attributes::AttributeList::TypeInfo::DecodableType attributeList; - Attributes::FeatureMap::TypeInfo::DecodableType featureMap; - Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision; - }; -}; -} // namespace Attributes -} // namespace LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { namespace Attributes { 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 b2ecc54c1e0c84..b162eaaaf332c6 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 @@ -1117,7 +1117,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { namespace Attributes { namespace HourFormat { @@ -1145,29 +1145,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace LocalizationTimeFormat - -namespace LocalizationUnit { -namespace Attributes { - -namespace TemperatureUnit { -static constexpr AttributeId Id = 0x00000000; -} // namespace TemperatureUnit - -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 LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { 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 b7e174cbdb279f..8e8df2fa70f7c3 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 @@ -94,12 +94,9 @@ static constexpr ClusterId Id = 0x0000002A; namespace LocalizationConfiguration { static constexpr ClusterId Id = 0x0000002B; } // namespace LocalizationConfiguration -namespace LocalizationTimeFormat { +namespace TimeFormatLocalization { static constexpr ClusterId Id = 0x0000002C; -} // namespace LocalizationTimeFormat -namespace LocalizationUnit { -static constexpr ClusterId Id = 0x0000002D; -} // namespace LocalizationUnit +} // namespace TimeFormatLocalization namespace PowerSourceConfiguration { static constexpr ClusterId Id = 0x0000002E; } // namespace PowerSourceConfiguration 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 d50a0d00c69ac3..a2271a5c9f719a 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 @@ -163,17 +163,11 @@ #define CHIP_PRINTCLUSTER_LOCALIZATION_CONFIGURATION_CLUSTER #endif -#if defined(ZCL_USING_LOCALIZATION_TIME_FORMAT_CLUSTER_SERVER) || defined(ZCL_USING_LOCALIZATION_TIME_FORMAT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_LOCALIZATION_TIME_FORMAT_CLUSTER \ - { ZCL_LOCALIZATION_TIME_FORMAT_CLUSTER_ID, 44, "Localization Time Format" }, +#if defined(ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER) || defined(ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER \ + { ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID, 44, "Time Format Localization" }, #else -#define CHIP_PRINTCLUSTER_LOCALIZATION_TIME_FORMAT_CLUSTER -#endif - -#if defined(ZCL_USING_LOCALIZATION_UNIT_CLUSTER_SERVER) || defined(ZCL_USING_LOCALIZATION_UNIT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_LOCALIZATION_UNIT_CLUSTER { ZCL_LOCALIZATION_UNIT_CLUSTER_ID, 45, "Localization Unit" }, -#else -#define CHIP_PRINTCLUSTER_LOCALIZATION_UNIT_CLUSTER +#define CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER #endif #if defined(ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_POWER_SOURCE_CONFIGURATION_CLUSTER_CLIENT) @@ -824,8 +818,7 @@ CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER \ CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER \ CHIP_PRINTCLUSTER_LOCALIZATION_CONFIGURATION_CLUSTER \ - CHIP_PRINTCLUSTER_LOCALIZATION_TIME_FORMAT_CLUSTER \ - CHIP_PRINTCLUSTER_LOCALIZATION_UNIT_CLUSTER \ + CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER \ CHIP_PRINTCLUSTER_POWER_SOURCE_CONFIGURATION_CLUSTER \ CHIP_PRINTCLUSTER_POWER_SOURCE_CLUSTER \ CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \