From 14123008552e3d05ce80ae3ddad73d6576cf4173 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 27 Jan 2023 03:30:52 -0500 Subject: [PATCH] Adjust Darwin API availability annotations for Power Source spelling fixes. (#24685) --- .../Framework/CHIP/templates/availability.yaml | 12 ++++++++++++ .../Framework/CHIP/zap-generated/MTRBaseClusters.h | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 638194400b27f0..b50fe99e24ce7e 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5515,6 +5515,10 @@ PowerSource: BatChargeLevel: - OK + BatChargeFault: + - Unspecified + PowerSourceStatus: + - Unspecified ThreadNetworkDiagnostics: ConnectionStatusEnum: - Connected @@ -6040,6 +6044,10 @@ PowerSource: BatChargeLevel: - Ok + BatChargeFault: + - Unspecfied + PowerSourceStatus: + - Unspecfied WiFiNetworkDiagnostics: WiFiVersionType: - 80211a @@ -6409,6 +6417,10 @@ PowerSource: BatChargeLevel: OK: Ok + BatChargeFault: + Unspecified: Unspecfied + PowerSourceStatus: + Unspecified: Unspecfied WiFiNetworkDiagnostics: WiFiVersionType: A: 80211a diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 1713a5d55b7a8c..90876363ac8d2f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -19210,7 +19210,10 @@ 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) { - MTRPowerSourceBatChargeFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRPowerSourceBatChargeFaultUnspecified API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, + MTRPowerSourceBatChargeFaultUnspecfied API_DEPRECATED("Please use MTRPowerSourceBatChargeFaultUnspecified", ios(16.1, 16.4), + macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 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 +19256,10 @@ 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) { - MTRPowerSourceStatusUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRPowerSourceStatusUnspecified API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, + MTRPowerSourceStatusUnspecfied API_DEPRECATED( + "Please use MTRPowerSourceStatusUnspecified", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 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,