diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 07b9cfe618d80b..c465f8d350b3b5 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3114,6 +3114,28 @@ server cluster ColorControl = 768 { command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; } +server cluster BallastConfiguration = 769 { + readonly attribute int8u physicalMinLevel = 0; + readonly attribute int8u physicalMaxLevel = 1; + readonly attribute bitmap8 ballastStatus = 2; + attribute int8u minLevel = 16; + attribute int8u maxLevel = 17; + attribute nullable int8u intrinsicBallastFactor = 20; + attribute nullable int8u ballastFactorAdjustment = 21; + readonly attribute int8u lampQuantity = 32; + attribute char_string<16> lampType = 48; + attribute char_string<16> lampManufacturer = 49; + attribute nullable int24u lampRatedHours = 50; + attribute nullable int24u lampBurnHours = 51; + attribute bitmap8 lampAlarmMode = 52; + attribute nullable int24u lampBurnHoursTripPoint = 53; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; + readonly attribute bitmap32 featureMap = 65532; + readonly attribute int16u clusterRevision = 65533; +} + server cluster IlluminanceMeasurement = 1024 { enum LightSensorType : ENUM8 { kPhotodiode = 0; @@ -4679,6 +4701,28 @@ endpoint 1 { ram attribute clusterRevision default = 5; } + server cluster BallastConfiguration { + ram attribute physicalMinLevel default = 0x01; + ram attribute physicalMaxLevel default = 0xFE; + ram attribute ballastStatus; + ram attribute minLevel default = 0x01; + ram attribute maxLevel default = 0xFE; + ram attribute intrinsicBallastFactor; + ram attribute ballastFactorAdjustment default = 0xFF; + ram attribute lampQuantity; + ram attribute lampType; + ram attribute lampManufacturer; + ram attribute lampRatedHours default = 0xFFFFFF; + ram attribute lampBurnHours; + ram attribute lampAlarmMode; + ram attribute lampBurnHoursTripPoint default = 0xFFFFFF; + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; + ram attribute featureMap; + ram attribute clusterRevision default = 4; + } + server cluster IlluminanceMeasurement { ram attribute measuredValue; ram attribute minMeasuredValue default = 0x01; 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 1b75963cfa4f85..eb9b669469f49f 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 @@ -16688,6 +16688,362 @@ } ] }, + { + "name": "Ballast Configuration", + "code": 769, + "mfgCode": null, + "define": "BALLAST_CONFIGURATION_CLUSTER", + "side": "client", + "enabled": 0, + "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "4", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Ballast Configuration", + "code": 769, + "mfgCode": null, + "define": "BALLAST_CONFIGURATION_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "PhysicalMinLevel", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "PhysicalMaxLevel", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFE", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "BallastStatus", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "bitmap8", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "MinLevel", + "code": 16, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "MaxLevel", + "code": 17, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFE", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "IntrinsicBalanceFactor", + "code": 20, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "BallastFactorAdjustment", + "code": 21, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampQuantity", + "code": 32, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampType", + "code": 48, + "mfgCode": null, + "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampManufacturer", + "code": 49, + "mfgCode": null, + "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampRatedHours", + "code": 50, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFFFFFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampBurnHours", + "code": 51, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampAlarmMode", + "code": 52, + "mfgCode": null, + "side": "server", + "type": "bitmap8", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampBurnHoursTripPoint", + "code": 53, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFFFFFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AcceptedCommandList", + "code": 65529, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "4", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, { "name": "Illuminance Measurement", "code": 1024, diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index afb5464b44b5ad..be2a9057302f06 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2470,6 +2470,19 @@ server cluster ColorControl = 768 { readonly attribute int16u clusterRevision = 65533; } +server cluster BallastConfiguration = 769 { + readonly attribute int8u physicalMinLevel = 0; + readonly attribute int8u physicalMaxLevel = 1; + attribute int8u minLevel = 16; + attribute int8u maxLevel = 17; + readonly attribute int8u lampQuantity = 32; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; + readonly attribute bitmap32 featureMap = 65532; + readonly attribute int16u clusterRevision = 65533; +} + server cluster IlluminanceMeasurement = 1024 { enum LightSensorType : ENUM8 { kPhotodiode = 0; @@ -3722,6 +3735,19 @@ endpoint 1 { ram attribute clusterRevision default = 5; } + server cluster BallastConfiguration { + ram attribute physicalMinLevel default = 0x01; + ram attribute physicalMaxLevel default = 0xFE; + ram attribute minLevel default = 0x01; + ram attribute maxLevel default = 0xFE; + ram attribute lampQuantity; + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; + ram attribute featureMap; + ram attribute clusterRevision default = 4; + } + server cluster IlluminanceMeasurement { ram attribute measuredValue; ram attribute minMeasuredValue default = 0x01; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 8d099cae8ed00c..eab740cb31a262 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -16180,6 +16180,362 @@ } ] }, + { + "name": "Ballast Configuration", + "code": 769, + "mfgCode": null, + "define": "BALLAST_CONFIGURATION_CLUSTER", + "side": "client", + "enabled": 0, + "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "4", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Ballast Configuration", + "code": 769, + "mfgCode": null, + "define": "BALLAST_CONFIGURATION_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "PhysicalMinLevel", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "PhysicalMaxLevel", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFE", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "BallastStatus", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "bitmap8", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "MinLevel", + "code": 16, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x01", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "MaxLevel", + "code": 17, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFE", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "IntrinsicBalanceFactor", + "code": 20, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "BallastFactorAdjustment", + "code": 21, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampQuantity", + "code": 32, + "mfgCode": null, + "side": "server", + "type": "int8u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampType", + "code": 48, + "mfgCode": null, + "side": "server", + "type": "char_string", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampManufacturer", + "code": 49, + "mfgCode": null, + "side": "server", + "type": "char_string", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampRatedHours", + "code": 50, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFFFFFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampBurnHours", + "code": 51, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x000000", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampAlarmMode", + "code": 52, + "mfgCode": null, + "side": "server", + "type": "bitmap8", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "LampBurnHoursTripPoint", + "code": 53, + "mfgCode": null, + "side": "server", + "type": "int24u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFFFFFF", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AcceptedCommandList", + "code": 65529, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "4", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, { "name": "Illuminance Measurement", "code": 1024, diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index dbac3013de8419..3c940a83a05333 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -165,6 +165,7 @@ void emberAfTick() // Cluster init functions that don't have a cluster implementation to define // them in. +void MatterBallastConfigurationPluginServerInitCallback() {} void MatterBooleanStatePluginServerInitCallback() {} void MatterElectricalMeasurementPluginServerInitCallback() {} void MatterRelativeHumidityMeasurementPluginServerInitCallback() {} diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml index e85208e9a6d4e8..5ce0fc850f7e47 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -46,7 +46,7 @@ limitations under the License. WindSupport WindSetting - + @@ -65,7 +65,7 @@ limitations under the License. - + @@ -74,21 +74,21 @@ limitations under the License. - - - - + + + + - - - + + + - - - - + + + + Thermostat User Interface Configuration HVAC @@ -372,14 +372,19 @@ limitations under the License. true true + PhysicalMinLevel PhysicalMaxLevel BallastStatus + MinLevel MaxLevel - IntrinsicBalanceFactor + + IntrinsicBallastFactor BallastFactorAdjustment + LampQuantity + LampType LampManufacturer LampRatedHours diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index e95c38b705a924..60e698e735b075 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3403,7 +3403,7 @@ client cluster BallastConfiguration = 769 { readonly attribute bitmap8 ballastStatus = 2; attribute int8u minLevel = 16; attribute int8u maxLevel = 17; - attribute nullable int8u intrinsicBalanceFactor = 20; + attribute nullable int8u intrinsicBallastFactor = 20; attribute nullable int8u ballastFactorAdjustment = 21; readonly attribute int8u lampQuantity = 32; attribute char_string<16> lampType = 48; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 08ff98454d81a2..558a00b9be4bb4 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -13129,8 +13129,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR cppValue, value); return value; } - case Attributes::IntrinsicBalanceFactor::Id: { - using TypeInfo = Attributes::IntrinsicBalanceFactor::TypeInfo; + case Attributes::IntrinsicBallastFactor::Id: { + using TypeInfo = Attributes::IntrinsicBallastFactor::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 0e23f45e9e3ec4..baf2174d4bd252 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -1393,8 +1393,8 @@ typedef void (*CHIPBallastConfigurationClusterMinLevelAttributeCallbackType)( void *, chip::app::Clusters::BallastConfiguration::Attributes::MinLevel::TypeInfo::DecodableArgType); typedef void (*CHIPBallastConfigurationClusterMaxLevelAttributeCallbackType)( void *, chip::app::Clusters::BallastConfiguration::Attributes::MaxLevel::TypeInfo::DecodableArgType); -typedef void (*CHIPBallastConfigurationClusterIntrinsicBalanceFactorAttributeCallbackType)( - void *, chip::app::Clusters::BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo::DecodableArgType); +typedef void (*CHIPBallastConfigurationClusterIntrinsicBallastFactorAttributeCallbackType)( + void *, chip::app::Clusters::BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo::DecodableArgType); typedef void (*CHIPBallastConfigurationClusterBallastFactorAdjustmentAttributeCallbackType)( void *, chip::app::Clusters::BallastConfiguration::Attributes::BallastFactorAdjustment::TypeInfo::DecodableArgType); typedef void (*CHIPBallastConfigurationClusterLampQuantityAttributeCallbackType)( diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 0f32f4bbddf53d..3aab4f95f4c2a6 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -4644,12 +4644,12 @@ JNI_METHOD(void, BallastConfigurationCluster, writeMaxLevelAttribute) onFailure.release(); } -JNI_METHOD(void, BallastConfigurationCluster, writeIntrinsicBalanceFactorAttribute) +JNI_METHOD(void, BallastConfigurationCluster, writeIntrinsicBallastFactorAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo; + using TypeInfo = chip::app::Clusters::BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 4d7b458aceb649..e7b63622e62a36 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -19254,9 +19254,9 @@ void CHIPColorControlAttributeListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback( +CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback::CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback( jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -19273,7 +19273,7 @@ CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::CHIPBallastConf } } -CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::~CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback() +CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback::~CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -19284,7 +19284,7 @@ CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::~CHIPBallastCon env->DeleteGlobalRef(javaCallbackRef); } -void CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::CallbackFn( +void CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; @@ -19293,8 +19293,8 @@ void CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback::CallbackFn jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 245ea4d0ebb478..882196ee134f2e 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -8038,20 +8038,20 @@ class CHIPColorControlAttributeListAttributeCallback bool keepAlive; }; -class CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback - : public chip::Callback::Callback +class CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback + : public chip::Callback::Callback { public: - CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback(); + ~CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback(); - static void maybeDestroy(CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback * callback) + static void maybeDestroy(CHIPBallastConfigurationIntrinsicBallastFactorAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -8059,7 +8059,7 @@ class CHIPBallastConfigurationIntrinsicBalanceFactorAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index ec7c9833299c84..88e372366460e8 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -17357,7 +17357,7 @@ public BallastConfigurationCluster(long devicePtr, int endpointId) { @Override public native long initWithDevice(long devicePtr, int endpointId); - public interface IntrinsicBalanceFactorAttributeCallback { + public interface IntrinsicBallastFactorAttributeCallback { void onSuccess(@Nullable Integer value); void onError(Exception ex); @@ -17484,24 +17484,24 @@ public void subscribeMaxLevelAttribute( subscribeMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readIntrinsicBalanceFactorAttribute( - IntrinsicBalanceFactorAttributeCallback callback) { - readIntrinsicBalanceFactorAttribute(chipClusterPtr, callback); + public void readIntrinsicBallastFactorAttribute( + IntrinsicBallastFactorAttributeCallback callback) { + readIntrinsicBallastFactorAttribute(chipClusterPtr, callback); } - public void writeIntrinsicBalanceFactorAttribute( + public void writeIntrinsicBallastFactorAttribute( DefaultClusterCallback callback, Integer value) { - writeIntrinsicBalanceFactorAttribute(chipClusterPtr, callback, value, null); + writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, null); } - public void writeIntrinsicBalanceFactorAttribute( + public void writeIntrinsicBallastFactorAttribute( DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { - writeIntrinsicBalanceFactorAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); + writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); } - public void subscribeIntrinsicBalanceFactorAttribute( - IntrinsicBalanceFactorAttributeCallback callback, int minInterval, int maxInterval) { - subscribeIntrinsicBalanceFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval); + public void subscribeIntrinsicBallastFactorAttribute( + IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval) { + subscribeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval); } public void readBallastFactorAdjustmentAttribute( @@ -17729,18 +17729,18 @@ private native void writeMaxLevelAttribute( private native void subscribeMaxLevelAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); - private native void readIntrinsicBalanceFactorAttribute( - long chipClusterPtr, IntrinsicBalanceFactorAttributeCallback callback); + private native void readIntrinsicBallastFactorAttribute( + long chipClusterPtr, IntrinsicBallastFactorAttributeCallback callback); - private native void writeIntrinsicBalanceFactorAttribute( + private native void writeIntrinsicBallastFactorAttribute( long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs); - private native void subscribeIntrinsicBalanceFactorAttribute( + private native void subscribeIntrinsicBallastFactorAttribute( long chipClusterPtr, - IntrinsicBalanceFactorAttributeCallback callback, + IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 78e05d7c824012..83485516ba3f76 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -2249,7 +2249,7 @@ public static String attributeIdToName(long clusterId, long attributeId) { return "MaxLevel"; } if (attributeId == 20L) { - return "IntrinsicBalanceFactor"; + return "IntrinsicBallastFactor"; } if (attributeId == 21L) { return "BallastFactorAdjustment"; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 2fe3b5892ab069..5258b8a6b1fb8b 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -8901,22 +8901,22 @@ public Map> getReadAttributeMap() { readBallastConfigurationMaxLevelCommandParams); readBallastConfigurationInteractionInfo.put( "readMaxLevelAttribute", readBallastConfigurationMaxLevelAttributeInteractionInfo); - Map readBallastConfigurationIntrinsicBalanceFactorCommandParams = + Map readBallastConfigurationIntrinsicBallastFactorCommandParams = new LinkedHashMap(); - InteractionInfo readBallastConfigurationIntrinsicBalanceFactorAttributeInteractionInfo = + InteractionInfo readBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.BallastConfigurationCluster) cluster) - .readIntrinsicBalanceFactorAttribute( + .readIntrinsicBallastFactorAttribute( (ChipClusters.BallastConfigurationCluster - .IntrinsicBalanceFactorAttributeCallback) + .IntrinsicBallastFactorAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readBallastConfigurationIntrinsicBalanceFactorCommandParams); + readBallastConfigurationIntrinsicBallastFactorCommandParams); readBallastConfigurationInteractionInfo.put( - "readIntrinsicBalanceFactorAttribute", - readBallastConfigurationIntrinsicBalanceFactorAttributeInteractionInfo); + "readIntrinsicBallastFactorAttribute", + readBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo); Map readBallastConfigurationBallastFactorAdjustmentCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationBallastFactorAdjustmentAttributeInteractionInfo = diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java index 092e6951ffd9f1..c1c505d8a45dd3 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java @@ -1408,24 +1408,24 @@ public Map> getWriteAttributeMap() { writeBallastConfigurationMaxLevelCommandParams); writeBallastConfigurationInteractionInfo.put( "writeMaxLevelAttribute", writeBallastConfigurationMaxLevelAttributeInteractionInfo); - Map writeBallastConfigurationIntrinsicBalanceFactorCommandParams = + Map writeBallastConfigurationIntrinsicBallastFactorCommandParams = new LinkedHashMap(); - CommandParameterInfo ballastConfigurationintrinsicBalanceFactorCommandParameterInfo = + CommandParameterInfo ballastConfigurationintrinsicBallastFactorCommandParameterInfo = new CommandParameterInfo("value", Integer.class, Integer.class); - writeBallastConfigurationIntrinsicBalanceFactorCommandParams.put( - "value", ballastConfigurationintrinsicBalanceFactorCommandParameterInfo); - InteractionInfo writeBallastConfigurationIntrinsicBalanceFactorAttributeInteractionInfo = + writeBallastConfigurationIntrinsicBallastFactorCommandParams.put( + "value", ballastConfigurationintrinsicBallastFactorCommandParameterInfo); + InteractionInfo writeBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.BallastConfigurationCluster) cluster) - .writeIntrinsicBalanceFactorAttribute( + .writeIntrinsicBallastFactorAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeBallastConfigurationIntrinsicBalanceFactorCommandParams); + writeBallastConfigurationIntrinsicBallastFactorCommandParams); writeBallastConfigurationInteractionInfo.put( - "writeIntrinsicBalanceFactorAttribute", - writeBallastConfigurationIntrinsicBalanceFactorAttributeInteractionInfo); + "writeIntrinsicBallastFactorAttribute", + writeBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo); Map writeBallastConfigurationBallastFactorAdjustmentCommandParams = new LinkedHashMap(); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 0154b9730c8257..29194fac493145 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -5307,7 +5307,7 @@ class ChipClusters: "writable": True, }, 0x00000014: { - "attributeName": "IntrinsicBalanceFactor", + "attributeName": "IntrinsicBallastFactor", "attributeId": 0x00000014, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 5196cc458ac265..25371f43e125e7 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -20722,7 +20722,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="ballastStatus", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="minLevel", Tag=0x00000010, Type=uint), ClusterObjectFieldDescriptor(Label="maxLevel", Tag=0x00000011, Type=uint), - ClusterObjectFieldDescriptor(Label="intrinsicBalanceFactor", Tag=0x00000014, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="intrinsicBallastFactor", Tag=0x00000014, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="ballastFactorAdjustment", Tag=0x00000015, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="lampQuantity", Tag=0x00000020, Type=uint), ClusterObjectFieldDescriptor(Label="lampType", Tag=0x00000030, Type=typing.Optional[str]), @@ -20743,7 +20743,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ballastStatus: 'typing.Optional[uint]' = None minLevel: 'uint' = None maxLevel: 'uint' = None - intrinsicBalanceFactor: 'typing.Union[None, Nullable, uint]' = None + intrinsicBallastFactor: 'typing.Union[None, Nullable, uint]' = None ballastFactorAdjustment: 'typing.Union[None, Nullable, uint]' = None lampQuantity: 'uint' = None lampType: 'typing.Optional[str]' = None @@ -20844,7 +20844,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = 0 @dataclass - class IntrinsicBalanceFactor(ClusterAttributeDescriptor): + class IntrinsicBallastFactor(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0301 diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 7dc7376f0506f7..c42888fc9fed4f 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4600,6 +4600,8 @@ - DeviceTypeList AccessControl: - ACL + BallastConfiguration: + - IntrinsicBallastFactor OccupancySensing: - PIROccupiedToUnoccupiedDelay - PIRUnoccupiedToOccupiedDelay @@ -5678,6 +5680,8 @@ - DeviceList AccessControl: - Acl + BallastConfiguration: + - IntrinsicBalanceFactor OccupancySensing: - PirOccupiedToUnoccupiedDelay - PirUnoccupiedToOccupiedDelay @@ -5967,6 +5971,8 @@ DeviceTypeList: DeviceList AccessControl: ACL: Acl + BallastConfiguration: + IntrinsicBallastFactor: IntrinsicBalanceFactor OccupancySensing: PIROccupiedToUnoccupiedDelay: PirOccupiedToUnoccupiedDelay PIRUnoccupiedToOccupiedDelay: PirUnoccupiedToOccupiedDelay diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 393bb48521a910..a9993337d47d12 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -11325,8 +11325,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::IntrinsicBalanceFactor::Id: { - using TypeInfo = Attributes::IntrinsicBalanceFactor::TypeInfo; + case Attributes::IntrinsicBallastFactor::Id: { + using TypeInfo = Attributes::IntrinsicBallastFactor::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index f73ef9f2b38b12..0e4966774e37ba 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -10825,18 +10825,18 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)readAttributeIntrinsicBalanceFactorWithCompletion:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeIntrinsicBallastFactorWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)subscribeAttributeIntrinsicBalanceFactorWithParams:(MTRSubscribeParams *)params +- (void)subscribeAttributeIntrinsicBallastFactorWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; -+ (void)readAttributeIntrinsicBalanceFactorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer ++ (void)readAttributeIntrinsicBallastFactorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, @@ -35201,16 +35201,16 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { - (void)readAttributeIntrinsicBalanceFactorWithCompletionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeIntrinsicBalanceFactorWithCompletion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeIntrinsicBallastFactorWithCompletion:"); - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBalanceFactorWithValue:completion:"); + MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBallastFactorWithValue:completion:"); - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBalanceFactorWithValue:params:completion:"); + MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBallastFactorWithValue:params:completion:"); - (void)subscribeAttributeIntrinsicBalanceFactorWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(MTRSubscribeParams * _Nullable)params @@ -35219,14 +35219,14 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use subscribeAttributeIntrinsicBalanceFactorWithParams:subscriptionEstablished:"); + MTR_NEWLY_DEPRECATED("Please use subscribeAttributeIntrinsicBallastFactorWithParams:subscriptionEstablished:"); + (void)readAttributeIntrinsicBalanceFactorWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeIntrinsicBalanceFactorWithAttributeCache:endpoint:queue:completion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeIntrinsicBallastFactorWithAttributeCache:endpoint:queue:completion:"); - (void)readAttributeBallastFactorAdjustmentWithCompletionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 97a5f6db6b46b5..83024c42f42e10 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -74577,20 +74577,20 @@ + (void)readAttributeMaxLevelWithClusterStateCache:(MTRClusterStateCacheContaine }); } -- (void)readAttributeIntrinsicBalanceFactorWithCompletion:(void (^)( +- (void)readAttributeIntrinsicBallastFactorWithCompletion:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo; + using TypeInfo = BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion { - [self writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable) value params:nil completion:completion]; + [self writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable) value params:nil completion:completion]; } -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion { @@ -74613,7 +74613,7 @@ - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)valu } ListFreer listFreer; - using TypeInfo = BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo; + using TypeInfo = BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -74628,18 +74628,18 @@ - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)valu std::move(*bridge).DispatchAction(self.device); } -- (void)subscribeAttributeIntrinsicBalanceFactorWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeIntrinsicBallastFactorWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo; + using TypeInfo = BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -+ (void)readAttributeIntrinsicBalanceFactorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer ++ (void)readAttributeIntrinsicBallastFactorWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, @@ -74650,7 +74650,7 @@ + (void)readAttributeIntrinsicBalanceFactorWithClusterStateCache:(MTRClusterStat clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BallastConfiguration::Attributes::IntrinsicBalanceFactor::TypeInfo; + using TypeInfo = BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -75760,7 +75760,7 @@ + (void)readAttributeMaxLevelWithAttributeCache:(MTRAttributeCacheContainer *)at - (void)readAttributeIntrinsicBalanceFactorWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeIntrinsicBalanceFactorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + [self readAttributeIntrinsicBallastFactorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); }]; @@ -75768,13 +75768,13 @@ - (void)readAttributeIntrinsicBalanceFactorWithCompletionHandler:(void (^)(NSNum - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler { - [self writeAttributeIntrinsicBalanceFactorWithValue:value params:nil completion:completionHandler]; + [self writeAttributeIntrinsicBallastFactorWithValue:value params:nil completion:completionHandler]; } - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler { - [self writeAttributeIntrinsicBalanceFactorWithValue:value params:params completion:completionHandler]; + [self writeAttributeIntrinsicBallastFactorWithValue:value params:params completion:completionHandler]; } - (void)subscribeAttributeIntrinsicBalanceFactorWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval @@ -75791,7 +75791,7 @@ - (void)subscribeAttributeIntrinsicBalanceFactorWithMinInterval:(NSNumber * _Non subscribeParams.minInterval = minInterval; subscribeParams.maxInterval = maxInterval; } - [self subscribeAttributeIntrinsicBalanceFactorWithParams:subscribeParams + [self subscribeAttributeIntrinsicBallastFactorWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. @@ -75804,7 +75804,7 @@ + (void)readAttributeIntrinsicBalanceFactorWithAttributeCache:(MTRAttributeCache completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeIntrinsicBalanceFactorWithClusterStateCache:attributeCacheContainer.realContainer + [self readAttributeIntrinsicBallastFactorWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:^(NSNumber * _Nullable value, NSError * _Nullable error) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 105e5f182ebe4c..fa2adffcc6eb9f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -3734,7 +3734,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBallastConfigurationAttributeMaxLevelID") = 0x00000011, MTRClusterBallastConfigurationAttributeIntrinsicBalanceFactorID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBalanceFactorID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBallastFactorID") = 0x00000014, MTRClusterBallastConfigurationAttributeBallastFactorAdjustmentID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBallastConfigurationAttributeBallastFactorAdjustmentID") @@ -3782,7 +3782,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterBallastConfigurationAttributeBallastStatusID MTR_NEWLY_AVAILABLE = 0x00000002, MTRAttributeIDTypeClusterBallastConfigurationAttributeMinLevelID MTR_NEWLY_AVAILABLE = 0x00000010, MTRAttributeIDTypeClusterBallastConfigurationAttributeMaxLevelID MTR_NEWLY_AVAILABLE = 0x00000011, - MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBalanceFactorID MTR_NEWLY_AVAILABLE = 0x00000014, + MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBallastFactorID MTR_NEWLY_AVAILABLE = 0x00000014, MTRAttributeIDTypeClusterBallastConfigurationAttributeBallastFactorAdjustmentID MTR_NEWLY_AVAILABLE = 0x00000015, MTRAttributeIDTypeClusterBallastConfigurationAttributeLampQuantityID MTR_NEWLY_AVAILABLE = 0x00000020, MTRAttributeIDTypeClusterBallastConfigurationAttributeLampTypeID MTR_NEWLY_AVAILABLE = 0x00000030, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 03391c6f887fec..4ee51b56aecb4b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -4234,15 +4234,13 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) params:(MTRWriteParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -- (NSDictionary *)readAttributeIntrinsicBalanceFactorWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary - expectedValueInterval:(NSNumber *)expectedValueIntervalMs - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary +- (NSDictionary *)readAttributeIntrinsicBallastFactorWithParams:(MTRReadParams * _Nullable)params + MTR_NEWLY_AVAILABLE; +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_NEWLY_AVAILABLE; +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs - params:(MTRWriteParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + params:(MTRWriteParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeBallastFactorAdjustmentWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -7970,6 +7968,18 @@ MTR_NEWLY_DEPRECATED("Please use MTRClusterUnitTesting") queue:(dispatch_queue_t)queue API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use initWithDevice:endpoindID:queue:"); +- (NSDictionary *)readAttributeIntrinsicBalanceFactorWithParams:(MTRReadParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use readAttributeIntrinsicBallastFactorWithParams on MTRClusterBallastConfiguration"); +- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBallastFactorWithValue on MTRClusterBallastConfiguration"); +- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + params:(MTRWriteParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use writeAttributeIntrinsicBallastFactorWithValue on MTRClusterBallastConfiguration"); @end @interface MTRClusterIlluminanceMeasurement (Deprecated) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index b89286c83d7908..23daf4ddd4adf2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -20739,23 +20739,23 @@ - (void)writeAttributeMaxLevelWithValue:(NSDictionary *)dataValu timedWriteTimeout:timedWriteTimeout]; } -- (NSDictionary *)readAttributeIntrinsicBalanceFactorWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary *)readAttributeIntrinsicBallastFactorWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) clusterID:@(MTRClusterIDTypeBallastConfigurationID) - attributeID:@(MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBalanceFactorID) + attributeID:@(MTRAttributeIDTypeClusterBallastConfigurationAttributeIntrinsicBallastFactorID) params:params]; } -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs { - [self writeAttributeIntrinsicBalanceFactorWithValue:dataValueDictionary + [self writeAttributeIntrinsicBallastFactorWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil]; } -- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary +- (void)writeAttributeIntrinsicBallastFactorWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params { @@ -20763,7 +20763,7 @@ - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)readAttributeIntrinsicBalanceFactorWithParams:(MTRReadParams * _Nullable)params +{ + return [self readAttributeIntrinsicBallastFactorWithParams:params]; +} +- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs +{ + [self writeAttributeIntrinsicBallastFactorWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs]; +} +- (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + params:(MTRWriteParams * _Nullable)params +{ + [self writeAttributeIntrinsicBallastFactorWithValue:dataValueDictionary + expectedValueInterval:expectedValueIntervalMs + params:params]; +} @end @implementation MTRClusterIlluminanceMeasurement 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 eb90412e93e6ac..38be7eb5a0829a 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 @@ -19825,7 +19825,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace MaxLevel -namespace IntrinsicBalanceFactor { +namespace IntrinsicBallastFactor { EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { @@ -19876,7 +19876,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl return Set(endpoint, value.Value()); } -} // namespace IntrinsicBalanceFactor +} // namespace IntrinsicBallastFactor namespace BallastFactorAdjustment { 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 e79261c6aca364..2972b385472eb9 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 @@ -3319,12 +3319,12 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace MaxLevel -namespace IntrinsicBalanceFactor { +namespace IntrinsicBallastFactor { EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); -} // namespace IntrinsicBalanceFactor +} // namespace IntrinsicBallastFactor namespace BallastFactorAdjustment { EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u 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 72342d41351b91..8fb162dd021a0a 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 @@ -14935,8 +14935,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::MaxLevel::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, maxLevel)); break; - case Attributes::IntrinsicBalanceFactor::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, intrinsicBalanceFactor)); + case Attributes::IntrinsicBallastFactor::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, intrinsicBallastFactor)); break; case Attributes::BallastFactorAdjustment::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, ballastFactorAdjustment)); 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 f04d76cca62d11..1dc98560443b86 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 @@ -19494,7 +19494,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace MaxLevel -namespace IntrinsicBalanceFactor { +namespace IntrinsicBallastFactor { struct TypeInfo { using Type = chip::app::DataModel::Nullable; @@ -19502,10 +19502,10 @@ struct TypeInfo using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::BallastConfiguration::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::IntrinsicBalanceFactor::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::IntrinsicBallastFactor::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace IntrinsicBalanceFactor +} // namespace IntrinsicBallastFactor namespace BallastFactorAdjustment { struct TypeInfo { @@ -19648,7 +19648,7 @@ struct TypeInfo Attributes::BallastStatus::TypeInfo::DecodableType ballastStatus = static_cast(0); Attributes::MinLevel::TypeInfo::DecodableType minLevel = static_cast(0); Attributes::MaxLevel::TypeInfo::DecodableType maxLevel = static_cast(0); - Attributes::IntrinsicBalanceFactor::TypeInfo::DecodableType intrinsicBalanceFactor; + Attributes::IntrinsicBallastFactor::TypeInfo::DecodableType intrinsicBallastFactor; Attributes::BallastFactorAdjustment::TypeInfo::DecodableType ballastFactorAdjustment; Attributes::LampQuantity::TypeInfo::DecodableType lampQuantity = static_cast(0); Attributes::LampType::TypeInfo::DecodableType lampType; 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 d9a820d4c9e786..2854c6f95b181d 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 @@ -3272,9 +3272,9 @@ namespace MaxLevel { static constexpr AttributeId Id = 0x00000011; } // namespace MaxLevel -namespace IntrinsicBalanceFactor { +namespace IntrinsicBallastFactor { static constexpr AttributeId Id = 0x00000014; -} // namespace IntrinsicBalanceFactor +} // namespace IntrinsicBallastFactor namespace BallastFactorAdjustment { static constexpr AttributeId Id = 0x00000015; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index c4c6c77ff6a94f..4051bae0f97a94 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -5766,7 +5766,7 @@ class ColorControlStepColorTemperature : public ClusterCommand | * BallastStatus | 0x0002 | | * MinLevel | 0x0010 | | * MaxLevel | 0x0011 | -| * IntrinsicBalanceFactor | 0x0014 | +| * IntrinsicBallastFactor | 0x0014 | | * BallastFactorAdjustment | 0x0015 | | * LampQuantity | 0x0020 | | * LampType | 0x0030 | @@ -11725,7 +11725,7 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo make_unique(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig), // make_unique(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig), // make_unique(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig), // - make_unique(Id, "intrinsic-balance-factor", Attributes::IntrinsicBalanceFactor::Id, credsIssuerConfig), // + make_unique(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig), // make_unique(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), // make_unique(Id, "lamp-quantity", Attributes::LampQuantity::Id, credsIssuerConfig), // make_unique(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig), // @@ -11743,7 +11743,7 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo make_unique>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, credsIssuerConfig), // make_unique>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, credsIssuerConfig), // make_unique>>( - Id, "intrinsic-balance-factor", 0, UINT8_MAX, Attributes::IntrinsicBalanceFactor::Id, credsIssuerConfig), // + Id, "intrinsic-ballast-factor", 0, UINT8_MAX, Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig), // make_unique>>( Id, "ballast-factor-adjustment", 0, UINT8_MAX, Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), // make_unique>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig), // @@ -11763,7 +11763,7 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo make_unique(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig), // make_unique(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig), // make_unique(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig), // - make_unique(Id, "intrinsic-balance-factor", Attributes::IntrinsicBalanceFactor::Id, + make_unique(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig), // make_unique(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index e00cb75950bde7..2adc203afe60bd 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -8044,10 +8044,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("MaxLevel", 1, value); } - case BallastConfiguration::Attributes::IntrinsicBalanceFactor::Id: { + case BallastConfiguration::Attributes::IntrinsicBallastFactor::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("IntrinsicBalanceFactor", 1, value); + return DataModelLogger::LogValue("IntrinsicBallastFactor", 1, value); } case BallastConfiguration::Attributes::BallastFactorAdjustment::Id: { chip::app::DataModel::Nullable value; 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 88ed9aa788bcf7..75a065ab0f382f 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -60898,7 +60898,7 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute | * BallastStatus | 0x0002 | | * MinLevel | 0x0010 | | * MaxLevel | 0x0011 | -| * IntrinsicBalanceFactor | 0x0014 | +| * IntrinsicBallastFactor | 0x0014 | | * BallastFactorAdjustment | 0x0015 | | * LampQuantity | 0x0020 | | * LampType | 0x0030 | @@ -61347,16 +61347,16 @@ class SubscribeAttributeBallastConfigurationMaxLevel : public SubscribeAttribute }; /* - * Attribute IntrinsicBalanceFactor + * Attribute IntrinsicBallastFactor */ -class ReadBallastConfigurationIntrinsicBalanceFactor : public ReadAttribute { +class ReadBallastConfigurationIntrinsicBallastFactor : public ReadAttribute { public: - ReadBallastConfigurationIntrinsicBalanceFactor() - : ReadAttribute("intrinsic-balance-factor") + ReadBallastConfigurationIntrinsicBallastFactor() + : ReadAttribute("intrinsic-ballast-factor") { } - ~ReadBallastConfigurationIntrinsicBalanceFactor() {} + ~ReadBallastConfigurationIntrinsicBallastFactor() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -61366,10 +61366,10 @@ class ReadBallastConfigurationIntrinsicBalanceFactor : public ReadAttribute { __auto_type * cluster = [[MTRBaseClusterBallastConfiguration alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeIntrinsicBalanceFactorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BallastConfiguration.IntrinsicBalanceFactor response %@", [value description]); + [cluster readAttributeIntrinsicBallastFactorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"BallastConfiguration.IntrinsicBallastFactor response %@", [value description]); if (error != nil) { - LogNSError("BallastConfiguration IntrinsicBalanceFactor read Error", error); + LogNSError("BallastConfiguration IntrinsicBallastFactor read Error", error); } SetCommandExitStatus(error); }]; @@ -61377,17 +61377,17 @@ class ReadBallastConfigurationIntrinsicBalanceFactor : public ReadAttribute { } }; -class WriteBallastConfigurationIntrinsicBalanceFactor : public WriteAttribute { +class WriteBallastConfigurationIntrinsicBallastFactor : public WriteAttribute { public: - WriteBallastConfigurationIntrinsicBalanceFactor() - : WriteAttribute("intrinsic-balance-factor") + WriteBallastConfigurationIntrinsicBallastFactor() + : WriteAttribute("intrinsic-ballast-factor") { - AddArgument("attr-name", "intrinsic-balance-factor"); + AddArgument("attr-name", "intrinsic-ballast-factor"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteBallastConfigurationIntrinsicBalanceFactor() {} + ~WriteBallastConfigurationIntrinsicBallastFactor() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -61403,11 +61403,11 @@ class WriteBallastConfigurationIntrinsicBalanceFactor : public WriteAttribute { NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster - writeAttributeIntrinsicBalanceFactorWithValue:value + writeAttributeIntrinsicBallastFactorWithValue:value params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("BallastConfiguration IntrinsicBalanceFactor write Error", error); + LogNSError("BallastConfiguration IntrinsicBallastFactor write Error", error); } SetCommandExitStatus(error); }]; @@ -61418,14 +61418,14 @@ class WriteBallastConfigurationIntrinsicBalanceFactor : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeBallastConfigurationIntrinsicBalanceFactor : public SubscribeAttribute { +class SubscribeAttributeBallastConfigurationIntrinsicBallastFactor : public SubscribeAttribute { public: - SubscribeAttributeBallastConfigurationIntrinsicBalanceFactor() - : SubscribeAttribute("intrinsic-balance-factor") + SubscribeAttributeBallastConfigurationIntrinsicBallastFactor() + : SubscribeAttribute("intrinsic-ballast-factor") { } - ~SubscribeAttributeBallastConfigurationIntrinsicBalanceFactor() {} + ~SubscribeAttributeBallastConfigurationIntrinsicBallastFactor() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -61444,12 +61444,12 @@ class SubscribeAttributeBallastConfigurationIntrinsicBalanceFactor : public Subs if (mAutoResubscribe.HasValue()) { params.resubscribeIfLost = mAutoResubscribe.Value(); } - [cluster subscribeAttributeIntrinsicBalanceFactorWithParams:params + [cluster subscribeAttributeIntrinsicBallastFactorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BallastConfiguration.IntrinsicBalanceFactor response %@", [value description]); + NSLog(@"BallastConfiguration.IntrinsicBallastFactor response %@", [value description]); SetCommandExitStatus(error); }]; @@ -99750,9 +99750,9 @@ void registerClusterBallastConfiguration(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), //