From 1102412163fc4f100e1ba5bb7362c175f374198e Mon Sep 17 00:00:00 2001 From: Martin Turon Date: Thu, 26 Jan 2023 22:35:59 -0800 Subject: [PATCH] [typo] Fix typos in some cluster field names. (#24678) * [typo] Fix typos in some cluster field names. * [typo] Update ./scripts/tools/zap_regen_all.py --- .../all-clusters-common/all-clusters-app.matter | 4 ++-- .../all-clusters-common/all-clusters-minimal-app.matter | 4 ++-- examples/lock-app/lock-common/lock-app.matter | 4 ++-- examples/placeholder/linux/apps/app1/config.matter | 4 ++-- examples/placeholder/linux/apps/app2/config.matter | 4 ++-- examples/window-app/common/window-app.matter | 4 ++-- .../zcl/data-model/chip/power-source-cluster.xml | 4 ++-- src/app/zap-templates/zcl/data-model/silabs/types.xml | 2 +- src/controller/data_model/controller-clusters.matter | 4 ++-- src/controller/python/chip/clusters/Objects.py | 4 ++-- src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 4 ++-- .../app-common/app-common/zap-generated/cluster-enums-check.h | 4 ++-- .../app-common/app-common/zap-generated/cluster-enums.h | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) 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 6b121545e8db80..1a361b1a9d7653 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 @@ -841,7 +841,7 @@ server cluster PowerSourceConfiguration = 46 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -881,7 +881,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; 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 a600995b60cdfa..8915daff3f335b 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 @@ -735,7 +735,7 @@ server cluster PowerSourceConfiguration = 46 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -775,7 +775,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index ee9b2f66387879..967b6e892c8d2f 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -387,7 +387,7 @@ server cluster PowerSourceConfiguration = 46 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -427,7 +427,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index e4607579a70638..adaf9d5239cc18 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -638,7 +638,7 @@ server cluster PowerSourceConfiguration = 46 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -678,7 +678,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 8bef18bf0df71a..fd9fe02e3b7bef 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -615,7 +615,7 @@ server cluster PowerSourceConfiguration = 46 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -655,7 +655,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 47230a0e09dd18..06e586ec8ad07f 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -557,7 +557,7 @@ server cluster UnitLocalization = 45 { server cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -597,7 +597,7 @@ server cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 76b350a52bf239..b37a81fe79a7e4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -103,7 +103,7 @@ limitations under the License. - + @@ -118,7 +118,7 @@ limitations under the License. - + diff --git a/src/app/zap-templates/zcl/data-model/silabs/types.xml b/src/app/zap-templates/zcl/data-model/silabs/types.xml index f2fa2acd06b1d4..cd0f49ab9cc8cd 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/types.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/types.xml @@ -297,7 +297,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index dd5be7df89a34c..b8b09f5d317bc5 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -936,7 +936,7 @@ client cluster PowerSourceConfiguration = 46 { client cluster PowerSource = 47 { enum BatChargeFault : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kAmbientTooHot = 1; kAmbientTooCold = 2; kBatteryTooHot = 3; @@ -976,7 +976,7 @@ client cluster PowerSource = 47 { } enum PowerSourceStatus : ENUM8 { - kUnspecfied = 0; + kUnspecified = 0; kActive = 1; kStandby = 2; kUnavailable = 3; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 9a282b92480b6d..115ed1cbb92fbb 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -5696,7 +5696,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Enums: class BatChargeFault(MatterIntEnum): - kUnspecfied = 0x00 + kUnspecified = 0x00 kAmbientTooHot = 0x01 kAmbientTooCold = 0x02 kBatteryTooHot = 0x03 @@ -5756,7 +5756,7 @@ class BatReplaceability(MatterIntEnum): kUnknownEnumValue = 4, class PowerSourceStatus(MatterIntEnum): - kUnspecfied = 0x00 + kUnspecified = 0x00 kActive = 0x01 kStandby = 0x02 kUnavailable = 0x03 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 4e4917ff90cc9b..4132d645d27e35 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -19210,7 +19210,7 @@ typedef NS_OPTIONS(uint32_t, MTRUnitLocalizationFeature) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRPowerSourceBatChargeFault) { - MTRPowerSourceBatChargeFaultUnspecfied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRPowerSourceBatChargeFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00, MTRPowerSourceBatChargeFaultAmbientTooHot API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRPowerSourceBatChargeFaultAmbientTooCold API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, MTRPowerSourceBatChargeFaultBatteryTooHot API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, @@ -19253,7 +19253,7 @@ typedef NS_ENUM(uint8_t, MTRPowerSourceBatReplaceability) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRPowerSourceStatus) { - MTRPowerSourceStatusUnspecfied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRPowerSourceStatusUnspecified MTR_NEWLY_AVAILABLE = 0x00, MTRPowerSourceStatusActive API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRPowerSourceStatusStandby API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, MTRPowerSourceStatusUnavailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index e964817905cb1b..a823faf417234f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -449,7 +449,7 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PowerSource::BatChargeF using EnumType = PowerSource::BatChargeFault; switch (val) { - case EnumType::kUnspecfied: + case EnumType::kUnspecified: case EnumType::kAmbientTooHot: case EnumType::kAmbientTooCold: case EnumType::kBatteryTooHot: @@ -524,7 +524,7 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PowerSource::PowerSourc using EnumType = PowerSource::PowerSourceStatus; switch (val) { - case EnumType::kUnspecfied: + case EnumType::kUnspecified: case EnumType::kActive: case EnumType::kStandby: case EnumType::kUnavailable: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 25c76b14c33c66..018e650d222412 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -558,7 +558,7 @@ namespace PowerSource { // Enum for BatChargeFault enum class BatChargeFault : uint8_t { - kUnspecfied = 0x00, + kUnspecified = 0x00, kAmbientTooHot = 0x01, kAmbientTooCold = 0x02, kBatteryTooHot = 0x03, @@ -633,7 +633,7 @@ enum class BatReplaceability : uint8_t // Enum for PowerSourceStatus enum class PowerSourceStatus : uint8_t { - kUnspecfied = 0x00, + kUnspecified = 0x00, kActive = 0x01, kStandby = 0x02, kUnavailable = 0x03,