diff --git a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml index d91df598a4790a..a8abcee040e616 100644 --- a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml +++ b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml @@ -30,12 +30,12 @@ tests: value: [123, 456] # TODO: Enable once attribute struct is supported - - label: "Read attribute application launcher app" - disabled: true - command: "readAttribute" - attribute: "application launcher app" - response: - value: { catalogVendorId: 123, applicationId: "applicationId" } + # - label: "Read attribute application launcher app" + # disabled: true + # command: "readAttribute" + # attribute: "application launcher app" + # response: + # value: { catalogVendorId: 123, applicationId: "applicationId" } - label: "Launch App Command" command: "LaunchApp" diff --git a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml index a324f2009a207d..ea539e2e78c8aa 100644 --- a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml +++ b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml @@ -42,12 +42,12 @@ tests: value: 0 # TODO: Enable once attribute struct is supported - - label: "Read attribute position" - disabled: true - command: "readAttribute" - attribute: "position" - response: - value: { updatedAt: 0, position: 0 } + # - label: "Read attribute position" + # disabled: true + # command: "readAttribute" + # attribute: "position" + # response: + # value: { updatedAt: 0, position: 0 } - label: "Read attribute playback speed" command: "readAttribute" diff --git a/src/app/tests/suites/TV_TvChannelCluster.yaml b/src/app/tests/suites/TV_TvChannelCluster.yaml index 27e9af3bd4a813..7733b9bf1d0b1d 100644 --- a/src/app/tests/suites/TV_TvChannelCluster.yaml +++ b/src/app/tests/suites/TV_TvChannelCluster.yaml @@ -45,33 +45,33 @@ tests: }, ] # TODO: Enable once attribute struct is supported - - label: "Read attribute channel lineup" - disabled: true - command: "readAttribute" - attribute: "channel lineup" - response: - value: - { - operatorName: "operatorName", - lineupName: "lineupName", - postalCode: "postalCode", - lineupInfoType: 0, - } + # - label: "Read attribute channel lineup" + # disabled: true + # command: "readAttribute" + # attribute: "channel lineup" + # response: + # value: + # { + # operatorName: "operatorName", + # lineupName: "lineupName", + # postalCode: "postalCode", + # lineupInfoType: 0, + # } # TODO: Enable once attribute struct is supported - - label: "Read attribute current channel" - disabled: true - command: "readAttribute" - attribute: "current channel" - response: - value: - { - majorNumber: 1, - minorNumber: 0, - name: "name", - callSign: "callSign", - affiliateCallSign: "affiliateCallSign", - } + # - label: "Read attribute current channel" + # disabled: true + # command: "readAttribute" + # attribute: "current channel" + # response: + # value: + # { + # majorNumber: 1, + # minorNumber: 0, + # name: "name", + # callSign: "callSign", + # affiliateCallSign: "affiliateCallSign", + # } - label: "Change Channel Command" command: "ChangeChannel" diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index b9a26b2d380f6c..a7df038b4381ec 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -1895,32 +1895,7 @@ "define": "BASIC_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "StartUp", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 0 - }, - { - "name": "ShutDown", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 0 - }, - { - "name": "Leave", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "InteractionModelVersion", @@ -10632,7 +10607,7 @@ "code": 1, "mfgCode": null, "side": "server", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -10647,7 +10622,7 @@ "code": 2, "mfgCode": null, "side": "server", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -11067,7 +11042,7 @@ "code": 3, "mfgCode": null, "side": "server", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -11122,21 +11097,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "seek range start", - "code": 7, - "mfgCode": null, - "side": "server", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "AttributeList", "code": 65531, @@ -11810,7 +11770,7 @@ "code": 1, "mfgCode": null, "side": "server", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -11820,21 +11780,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "application id", - "code": 2, - "mfgCode": null, - "side": "server", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "AttributeList", "code": 65531, @@ -12016,21 +11961,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "allowed vendor list", - "code": 7, - "mfgCode": null, - "side": "server", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "AttributeList", "code": 65531, diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 13c792f38ef54e..3247fa7bb89ccf 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -77,8 +77,6 @@ typedef void (*CHIPApplicationLauncherClusterStopAppResponseCallbackType)( typedef void (*CHIPApplicationLauncherClusterApplicationLauncherListAttributeCallbackType)( void *, const chip::app::Clusters::ApplicationLauncher::Attributes::ApplicationLauncherList::TypeInfo::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterApplicationLauncherAppAttributeCallbackType)( - void *, chip::app::Clusters::ApplicationLauncher::Attributes::ApplicationLauncherApp::TypeInfo::DecodableArgType); typedef void (*CHIPApplicationLauncherClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::ApplicationLauncher::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPApplicationLauncherClusterClusterRevisionAttributeCallbackType)( @@ -615,8 +613,6 @@ typedef void (*CHIPMediaPlaybackClusterStartTimeAttributeCallbackType)( void *, chip::app::Clusters::MediaPlayback::Attributes::StartTime::TypeInfo::DecodableArgType); typedef void (*CHIPMediaPlaybackClusterDurationAttributeCallbackType)( void *, chip::app::Clusters::MediaPlayback::Attributes::Duration::TypeInfo::DecodableArgType); -typedef void (*CHIPMediaPlaybackClusterPositionAttributeCallbackType)( - void *, chip::app::Clusters::MediaPlayback::Attributes::Position::TypeInfo::DecodableArgType); typedef void (*CHIPMediaPlaybackClusterPlaybackSpeedAttributeCallbackType)( void *, chip::app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::TypeInfo::DecodableArgType); typedef void (*CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType)( @@ -914,10 +910,6 @@ typedef void (*CHIPTvChannelClusterChangeChannelResponseCallbackType)( typedef void (*CHIPTvChannelClusterChannelListAttributeCallbackType)( void *, const chip::app::Clusters::TvChannel::Attributes::ChannelList::TypeInfo::DecodableType &); -typedef void (*CHIPTvChannelClusterChannelLineupAttributeCallbackType)( - void *, chip::app::Clusters::TvChannel::Attributes::ChannelLineup::TypeInfo::DecodableArgType); -typedef void (*CHIPTvChannelClusterCurrentChannelAttributeCallbackType)( - void *, chip::app::Clusters::TvChannel::Attributes::CurrentChannel::TypeInfo::DecodableArgType); typedef void (*CHIPTvChannelClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::TvChannel::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPTvChannelClusterClusterRevisionAttributeCallbackType)( diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index bc6ac8cd7a44fa..e9700d87abf3e3 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -265,12 +265,6 @@ class ChipClusters: "type": "int", "reportable": True, }, - 0x00000001: { - "attributeName": "ApplicationLauncherApp", - "attributeId": 0x00000001, - "type": "", - "writable": True, - }, 0x0000FFFB: { "attributeName": "AttributeList", "attributeId": 0x0000FFFB, @@ -2598,12 +2592,6 @@ class ChipClusters: "type": "int", "reportable": True, }, - 0x00000003: { - "attributeName": "Position", - "attributeId": 0x00000003, - "type": "", - "writable": True, - }, 0x00000004: { "attributeName": "PlaybackSpeed", "attributeId": 0x00000004, @@ -3761,20 +3749,6 @@ class ChipClusters: "type": "", "reportable": True, }, - 0x00000001: { - "attributeName": "ChannelLineup", - "attributeId": 0x00000001, - "type": "", - "reportable": True, - "writable": True, - }, - 0x00000002: { - "attributeName": "CurrentChannel", - "attributeId": 0x00000002, - "type": "", - "reportable": True, - "writable": True, - }, 0x0000FFFB: { "attributeName": "AttributeList", "attributeId": 0x0000FFFB, diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 21e60df3f544c1..13e08569d532e1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -473,25 +473,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = array_0; return value; } - case Attributes::ApplicationLauncherApp::Id: { - using TypeInfo = Attributes::ApplicationLauncherApp::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - CHIPApplicationLauncherClusterApplicationLauncherEndpoint * _Nonnull value; - value = [CHIPApplicationLauncherClusterApplicationLauncherEndpoint new]; - value.application = [CHIPApplicationLauncherClusterApplicationLauncherApp new]; - value.application.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.application.catalogVendorId]; - value.application.applicationId = [[NSString alloc] initWithBytes:cppValue.application.applicationId.data() - length:cppValue.application.applicationId.size() - encoding:NSUTF8StringEncoding]; - value.endpoint = [[NSString alloc] initWithBytes:cppValue.endpoint.data() - length:cppValue.endpoint.size() - encoding:NSUTF8StringEncoding]; - return value; - } case Attributes::AttributeList::Id: { using TypeInfo = Attributes::AttributeList::TypeInfo; TypeInfo::DecodableType cppValue; @@ -4042,19 +4023,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedLongLong:cppValue]; return value; } - case Attributes::Position::Id: { - using TypeInfo = Attributes::Position::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - CHIPMediaPlaybackClusterMediaPlaybackPosition * _Nonnull value; - value = [CHIPMediaPlaybackClusterMediaPlaybackPosition new]; - value.updatedAt = [NSNumber numberWithUnsignedLongLong:cppValue.updatedAt]; - value.position = [NSNumber numberWithUnsignedLongLong:cppValue.position]; - return value; - } case Attributes::PlaybackSpeed::Id: { using TypeInfo = Attributes::PlaybackSpeed::TypeInfo; TypeInfo::DecodableType cppValue; @@ -5917,49 +5885,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = array_0; return value; } - case Attributes::ChannelLineup::Id: { - using TypeInfo = Attributes::ChannelLineup::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - CHIPTvChannelClusterTvChannelLineupInfo * _Nonnull value; - value = [CHIPTvChannelClusterTvChannelLineupInfo new]; - value.operatorName = [[NSString alloc] initWithBytes:cppValue.operatorName.data() - length:cppValue.operatorName.size() - encoding:NSUTF8StringEncoding]; - value.lineupName = [[NSString alloc] initWithBytes:cppValue.lineupName.data() - length:cppValue.lineupName.size() - encoding:NSUTF8StringEncoding]; - value.postalCode = [[NSString alloc] initWithBytes:cppValue.postalCode.data() - length:cppValue.postalCode.size() - encoding:NSUTF8StringEncoding]; - value.lineupInfoType = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.lineupInfoType)]; - return value; - } - case Attributes::CurrentChannel::Id: { - using TypeInfo = Attributes::CurrentChannel::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - CHIPTvChannelClusterTvChannelInfo * _Nonnull value; - value = [CHIPTvChannelClusterTvChannelInfo new]; - value.majorNumber = [NSNumber numberWithUnsignedShort:cppValue.majorNumber]; - value.minorNumber = [NSNumber numberWithUnsignedShort:cppValue.minorNumber]; - value.name = [[NSString alloc] initWithBytes:cppValue.name.data() - length:cppValue.name.size() - encoding:NSUTF8StringEncoding]; - value.callSign = [[NSString alloc] initWithBytes:cppValue.callSign.data() - length:cppValue.callSign.size() - encoding:NSUTF8StringEncoding]; - value.affiliateCallSign = [[NSString alloc] initWithBytes:cppValue.affiliateCallSign.data() - length:cppValue.affiliateCallSign.size() - encoding:NSUTF8StringEncoding]; - return value; - } case Attributes::AttributeList::Id: { using TypeInfo = Attributes::AttributeList::TypeInfo; TypeInfo::DecodableType cppValue; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 51a784f011e88d..92dd9848e9d263 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -4767,7 +4767,6 @@ class ReportApplicationBasicClusterRevision : public ModelCommand |------------------------------------------------------------------------------| | Attributes: | | | * ApplicationLauncherList | 0x0000 | -| * ApplicationLauncherApp | 0x0001 | | * AttributeList | 0xFFFB | | * ClusterRevision | 0xFFFD | \*----------------------------------------------------------------------------*/ @@ -22590,7 +22589,6 @@ class ReportMediaInputClusterRevision : public ModelCommand | * PlaybackState | 0x0000 | | * StartTime | 0x0001 | | * Duration | 0x0002 | -| * Position | 0x0003 | | * PlaybackSpeed | 0x0004 | | * SeekRangeEnd | 0x0005 | | * SeekRangeStart | 0x0006 | @@ -31958,8 +31956,6 @@ class ReportSwitchClusterRevision : public ModelCommand |------------------------------------------------------------------------------| | Attributes: | | | * ChannelList | 0x0000 | -| * ChannelLineup | 0x0001 | -| * CurrentChannel | 0x0002 | | * AttributeList | 0xFFFB | | * ClusterRevision | 0xFFFD | \*----------------------------------------------------------------------------*/ diff --git a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h index 5077ca0a7c98e5..cfa19ce6e2bae2 100644 --- a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h @@ -3092,17 +3092,17 @@ class Listen : public ReportingCommand new chip::Callback::Callback( ReadThermostatClusterRevision::OnAttributeResponse, this); chip::Callback::Callback * - onReportThermostatUserInterfaceConfigurationTemperatureDisplayModeCallback = new chip::Callback::Callback( + onReportThermostatUserInterfaceConfigurationTemperatureDisplayModeCallback = new chip::Callback::Callback< + decltype(&ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode::OnAttributeResponse)>( ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode::OnAttributeResponse, this); chip::Callback::Callback * onReportThermostatUserInterfaceConfigurationKeypadLockoutCallback = new chip::Callback::Callback( ReadThermostatUserInterfaceConfigurationKeypadLockout::OnAttributeResponse, this); - chip::Callback::Callback * - onReportThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCallback = new chip::Callback::Callback( + chip::Callback::Callback< + decltype(&ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility::OnAttributeResponse)> * + onReportThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCallback = new chip::Callback::Callback< + decltype(&ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility::OnAttributeResponse)>( ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility::OnAttributeResponse, this); chip::Callback::Callback * onReportThermostatUserInterfaceConfigurationClusterRevisionCallback = @@ -3181,8 +3181,8 @@ class Listen : public ReportingCommand new chip::Callback::Callback( ReadThreadNetworkDiagnosticsPartitionIdChangeCount::OnAttributeResponse, this); chip::Callback::Callback * - onReportThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCallback = new chip::Callback::Callback( + onReportThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCallback = new chip::Callback::Callback< + decltype(&ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount::OnAttributeResponse)>( ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount::OnAttributeResponse, this); chip::Callback::Callback * onReportThreadNetworkDiagnosticsParentChangeCountCallback =