From d477383af91737f7e923882eafc9fda47ed78581 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 29 May 2023 10:43:13 -0400 Subject: [PATCH] Update availability annotations for Identify cluster changes. (#26903) Changes happened in https://github.com/project-chip/connectedhomeip/pull/26738. --- .../CHIP/templates/availability.yaml | 37 ++++++++++++++++--- .../CHIP/zap-generated/MTRBaseClusters.h | 34 ++++++++++------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 4d365e7405005c..b2d4a4d11b3f52 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3045,9 +3045,15 @@ - fabricIndex enums: Identify: - - IdentifyEffectIdentifier - - IdentifyEffectVariant - - IdentifyIdentifyType + # EffectIdentifierEnum, EffectVariantEnum, and IdentifyTypeEnum + # were originally named IdentifyEffectIdentifier, + # IdentifyEffectVariant, and IdentifyIdentifyType, but we generate + # the same API for the names with/without "Enum" at the end, and + # with/without the cluster name at the beginning, so the name can + # just change here. + - EffectIdentifierEnum + - EffectVariantEnum + - IdentifyTypeEnum OnOff: - OnOffDelayedAllOffEffectVariant - OnOffDyingLightEffectVariant @@ -3237,16 +3243,22 @@ - FaultType enum values: Identify: - IdentifyEffectIdentifier: + # EffectIdentifierEnum, EffectVariantEnum, and IdentifyTypeEnum + # were originally named IdentifyEffectIdentifier, + # IdentifyEffectVariant, and IdentifyIdentifyType, but we generate + # the same API for the names with/without "Enum" at the end, and + # with/without the cluster name at the beginning, so the name can + # just change here. + EffectIdentifierEnum: - Blink - Breathe - Okay - ChannelChange - FinishEffect - StopEffect - IdentifyEffectVariant: + EffectVariantEnum: - Default - IdentifyIdentifyType: + IdentifyTypeEnum: - None - VisibleLight - VisibleLED @@ -7721,6 +7733,10 @@ WiFiNetworkDiagnostics: WiFiVersionEnum: - Ah + Identify: + IdentifyTypeEnum: + - LightOutput + - VisibleIndicator bitmaps: AirQuality: - Feature @@ -7871,6 +7887,11 @@ # We apparently forgot to deprecate BridgedDeviceBasic when we # introduced BridgedDeviceBasicInformation. - BridgedDeviceBasic + enum values: + Identify: + IdentifyTypeEnum: + - VisibleLight + - VisibleLED structs: AccessControl: - Target @@ -7908,6 +7929,10 @@ MixedNTPNTS: MixedNtpNts PTP: Ptp GNSS: Gnss + Identify: + IdentifyTypeEnum: + LightOutput: VisibleLight + VisibleIndicator: VisibleLED bitmaps: Groups: Feature: GroupClusterFeature diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 4df91700c17309..204bbf829732e0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -30210,26 +30210,32 @@ MTR_DEPRECATED("Please use MTRBaseClusterUnitTesting", ios(16.1, 16.4), macos(13 @end typedef NS_ENUM(uint8_t, MTRIdentifyEffectIdentifier) { - MTRIdentifyEffectIdentifierBlink MTR_NEWLY_AVAILABLE = 0x00, - MTRIdentifyEffectIdentifierBreathe MTR_NEWLY_AVAILABLE = 0x01, - MTRIdentifyEffectIdentifierOkay MTR_NEWLY_AVAILABLE = 0x02, - MTRIdentifyEffectIdentifierChannelChange MTR_NEWLY_AVAILABLE = 0x0B, - MTRIdentifyEffectIdentifierFinishEffect MTR_NEWLY_AVAILABLE = 0xFE, - MTRIdentifyEffectIdentifierStopEffect MTR_NEWLY_AVAILABLE = 0xFF, -} MTR_NEWLY_AVAILABLE; + MTRIdentifyEffectIdentifierBlink API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRIdentifyEffectIdentifierBreathe API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, + MTRIdentifyEffectIdentifierOkay API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, + MTRIdentifyEffectIdentifierChannelChange API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B, + MTRIdentifyEffectIdentifierFinishEffect API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFE, + MTRIdentifyEffectIdentifierStopEffect API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFF, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRIdentifyEffectVariant) { - MTRIdentifyEffectVariantDefault MTR_NEWLY_AVAILABLE = 0x00, -} MTR_NEWLY_AVAILABLE; + MTRIdentifyEffectVariantDefault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRIdentifyType) { - MTRIdentifyTypeNone MTR_NEWLY_AVAILABLE = 0x00, + MTRIdentifyTypeNone API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRIdentifyTypeLightOutput MTR_NEWLY_AVAILABLE = 0x01, + MTRIdentifyTypeVisibleLight API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRIdentifyTypeLightOutput") + = 0x01, MTRIdentifyTypeVisibleIndicator MTR_NEWLY_AVAILABLE = 0x02, - MTRIdentifyTypeAudibleBeep MTR_NEWLY_AVAILABLE = 0x03, - MTRIdentifyTypeDisplay MTR_NEWLY_AVAILABLE = 0x04, - MTRIdentifyTypeActuator MTR_NEWLY_AVAILABLE = 0x05, -} MTR_NEWLY_AVAILABLE; + MTRIdentifyTypeVisibleLED API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRIdentifyTypeVisibleIndicator") + = 0x02, + MTRIdentifyTypeAudibleBeep API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, + MTRIdentifyTypeDisplay API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, + MTRIdentifyTypeActuator API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRGroupsFeature) { MTRGroupsFeatureGroupNames MTR_NEWLY_AVAILABLE = 0x1,