Skip to content

Commit dc905ae

Browse files
lazarkovlazarkov
committed
Update per comments
1 parent 0c113a4 commit dc905ae

File tree

14 files changed

+71
-56
lines changed

14 files changed

+71
-56
lines changed

‎examples/tv-app/android/include/account-login/AccountLoginManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ uint16_t AccountLoginManager::GetClusterRevision(chip::EndpointId endpoint)
112112
}
113113

114114
uint16_t clusterRevision = 0;
115-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
115+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
116+
if (!success) {
117+
ChipLogError(Zcl, "AccountLoginManager::GetClusterRevision error reading cluster revision");
118+
}
116119
return clusterRevision;
117120
}

‎examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ uint16_t AppContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint
174174
}
175175

176176
uint16_t clusterRevision = 0;
177-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
177+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
178+
if (!success) {
179+
ChipLogError(Zcl, "AppContentLauncherManager::GetClusterRevision error reading cluster revision");
180+
}
178181
return clusterRevision;
179182
}

‎examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@ uint16_t AppMediaPlaybackManager::GetClusterRevision(chip::EndpointId endpoint)
292292
}
293293

294294
uint16_t clusterRevision = 0;
295-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
295+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
296+
if (!success) {
297+
ChipLogError(Zcl, "AppMediaPlaybackManager::GetClusterRevision error reading cluster revision");
298+
}
296299
return clusterRevision;
297300
}

‎examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ uint16_t TargetNavigatorManager::GetClusterRevision(chip::EndpointId endpoint)
154154
}
155155

156156
uint16_t clusterRevision = 0;
157-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
157+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
158+
if (!success) {
159+
ChipLogError(Zcl, "TargetNavigatorManager::GetClusterRevision error reading cluster revision");
160+
}
158161
return clusterRevision;
159162
}

‎examples/tv-app/android/java/ChannelManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,9 @@ uint16_t ChannelManager::GetClusterRevision(chip::EndpointId endpoint)
760760
}
761761

762762
uint16_t clusterRevision = 0;
763-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
763+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
764+
if (!success) {
765+
ChipLogError(Zcl, "ChannelManager::GetClusterRevision error reading cluster revision");
766+
}
764767
return clusterRevision;
765768
}

‎examples/tv-app/android/java/ContentLauncherManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ uint16_t ContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint)
295295
}
296296

297297
uint16_t clusterRevision = 0;
298-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
298+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
299+
if (!success) {
300+
ChipLogError(Zcl, "ContentLauncherManager::GetClusterRevision error reading cluster revision");
301+
}
299302
return clusterRevision;
300303
}

‎examples/tv-app/android/java/MediaPlaybackManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ uint16_t MediaPlaybackManager::GetClusterRevision(chip::EndpointId endpoint)
611611
}
612612

613613
uint16_t clusterRevision = 0;
614-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
614+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
615+
if (!success) {
616+
ChipLogError(Zcl, "MediaPlaybackManager::GetClusterRevision error reading cluster revision");
617+
}
615618
return clusterRevision;
616619
}

‎examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ uint16_t AccountLoginManager::GetClusterRevision(chip::EndpointId endpoint)
7474
}
7575

7676
uint16_t clusterRevision = 0;
77-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
77+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
78+
if (!success) {
79+
ChipLogError(Zcl, "AccountLoginManager::GetClusterRevision error reading cluster revision");
80+
}
7881
return clusterRevision;
7982
}

‎examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@ uint16_t ChannelManager::GetClusterRevision(chip::EndpointId endpoint)
347347
}
348348

349349
uint16_t clusterRevision = 0;
350-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
350+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
351+
if (!success) {
352+
ChipLogError(Zcl, "ChannelManager::GetClusterRevision error reading cluster revision");
353+
}
351354
return clusterRevision;
352355
}

‎examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ uint16_t ContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint)
214214
}
215215

216216
uint16_t clusterRevision = 0;
217-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
217+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
218+
if (!success) {
219+
ChipLogError(Zcl, "ContentLauncherManager::GetClusterRevision error reading cluster revision");
220+
}
218221
return clusterRevision;
219222
}

‎examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ uint16_t MediaPlaybackManager::GetClusterRevision(chip::EndpointId endpoint)
335335
}
336336

337337
uint16_t clusterRevision = 0;
338-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
338+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
339+
if (!success) {
340+
ChipLogError(Zcl, "MediaPlaybackManager::GetClusterRevision error reading cluster revision");
341+
}
339342
return clusterRevision;
340343
}

‎examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ uint16_t TargetNavigatorManager::GetClusterRevision(chip::EndpointId endpoint)
7676
}
7777

7878
uint16_t clusterRevision = 0;
79-
Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
79+
bool success = (Attributes::ClusterRevision::Get(endpoint, &clusterRevision) == EMBER_ZCL_STATUS_SUCCESS);
80+
if (!success) {
81+
ChipLogError(Zcl, "TargetNavigatorManager::GetClusterRevision error reading cluster revision");
82+
}
83+
8084
return clusterRevision;
8185
}

‎src/app/clusters/application-basic-server/application-basic-server.cpp

+8-16
Original file line numberDiff line numberDiff line change
@@ -170,30 +170,22 @@ CHIP_ERROR ApplicationBasicAttrAccess::Read(const app::ConcreteReadAttributePath
170170

171171
switch (aPath.mAttributeId)
172172
{
173-
case chip::app::Clusters::ApplicationBasic::Attributes::VendorName::Id: {
173+
case chip::app::Clusters::ApplicationBasic::Attributes::VendorName::Id:
174174
return ReadVendorNameAttribute(aEncoder, delegate);
175-
}
176-
case chip::app::Clusters::ApplicationBasic::Attributes::VendorID::Id: {
175+
case chip::app::Clusters::ApplicationBasic::Attributes::VendorID::Id:
177176
return ReadVendorIdAttribute(aEncoder, delegate);
178-
}
179-
case chip::app::Clusters::ApplicationBasic::Attributes::ApplicationName::Id: {
177+
case chip::app::Clusters::ApplicationBasic::Attributes::ApplicationName::Id:
180178
return ReadApplicationNameAttribute(aEncoder, delegate);
181-
}
182-
case chip::app::Clusters::ApplicationBasic::Attributes::ProductID::Id: {
179+
case chip::app::Clusters::ApplicationBasic::Attributes::ProductID::Id:
183180
return ReadProductIdAttribute(aEncoder, delegate);
184-
}
185-
case chip::app::Clusters::ApplicationBasic::Attributes::Application::Id: {
181+
case chip::app::Clusters::ApplicationBasic::Attributes::Application::Id:
186182
return ReadApplicationAttribute(aEncoder, delegate);
187-
}
188-
case chip::app::Clusters::ApplicationBasic::Attributes::Status::Id: {
183+
case chip::app::Clusters::ApplicationBasic::Attributes::Status::Id:
189184
return ReadStatusAttribute(aEncoder, delegate);
190-
}
191-
case chip::app::Clusters::ApplicationBasic::Attributes::ApplicationVersion::Id: {
185+
case chip::app::Clusters::ApplicationBasic::Attributes::ApplicationVersion::Id:
192186
return ReadApplicationVersionAttribute(aEncoder, delegate);
193-
}
194-
case chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::Id: {
187+
case chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::Id:
195188
return ReadAllowedVendorListAttribute(aEncoder, delegate);
196-
}
197189
default: {
198190
break;
199191
}

‎src/app/clusters/media-playback-server/media-playback-server.cpp

+14-28
Original file line numberDiff line numberDiff line change
@@ -170,49 +170,35 @@ CHIP_ERROR MediaPlaybackAttrAccess::Read(const app::ConcreteReadAttributePath &
170170

171171
switch (aPath.mAttributeId)
172172
{
173-
case app::Clusters::MediaPlayback::Attributes::CurrentState::Id: {
173+
case app::Clusters::MediaPlayback::Attributes::CurrentState::Id:
174174
return ReadCurrentStateAttribute(aEncoder, delegate);
175-
}
176-
case app::Clusters::MediaPlayback::Attributes::StartTime::Id: {
175+
case app::Clusters::MediaPlayback::Attributes::StartTime::Id:
177176
return ReadStartTimeAttribute(aEncoder, delegate);
178-
}
179-
case app::Clusters::MediaPlayback::Attributes::Duration::Id: {
177+
case app::Clusters::MediaPlayback::Attributes::Duration::Id:
180178
return ReadDurationAttribute(aEncoder, delegate);
181-
}
182-
case app::Clusters::MediaPlayback::Attributes::SampledPosition::Id: {
179+
case app::Clusters::MediaPlayback::Attributes::SampledPosition::Id:
183180
return ReadSampledPositionAttribute(aEncoder, delegate);
184-
}
185-
case app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::Id: {
181+
case app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::Id:
186182
return ReadPlaybackSpeedAttribute(aEncoder, delegate);
187-
}
188-
case app::Clusters::MediaPlayback::Attributes::SeekRangeStart::Id: {
183+
case app::Clusters::MediaPlayback::Attributes::SeekRangeStart::Id:
189184
return ReadSeekRangeStartAttribute(aEncoder, delegate);
190-
}
191-
case app::Clusters::MediaPlayback::Attributes::SeekRangeEnd::Id: {
185+
case app::Clusters::MediaPlayback::Attributes::SeekRangeEnd::Id:
192186
return ReadSeekRangeEndAttribute(aEncoder, delegate);
193-
}
194-
case app::Clusters::MediaPlayback::Attributes::ActiveAudioTrack::Id: {
187+
case app::Clusters::MediaPlayback::Attributes::ActiveAudioTrack::Id:
195188
return ReadActiveAudioTrackAttribute(aEncoder, delegate);
196-
}
197-
case app::Clusters::MediaPlayback::Attributes::AvailableAudioTracks::Id: {
189+
case app::Clusters::MediaPlayback::Attributes::AvailableAudioTracks::Id:
198190
return ReadAvailableAudioTracksAttribute(aEncoder, delegate);
199-
}
200-
case app::Clusters::MediaPlayback::Attributes::ActiveTextTrack::Id: {
191+
case app::Clusters::MediaPlayback::Attributes::ActiveTextTrack::Id:
201192
return ReadActiveTextTrackAttribute(aEncoder, delegate);
202-
}
203-
case app::Clusters::MediaPlayback::Attributes::AvailableTextTracks::Id: {
193+
case app::Clusters::MediaPlayback::Attributes::AvailableTextTracks::Id:
204194
return ReadAvailableTextTracksAttribute(aEncoder, delegate);
205-
}
206-
case app::Clusters::ContentLauncher::Attributes::FeatureMap::Id: {
195+
case app::Clusters::ContentLauncher::Attributes::FeatureMap::Id:
207196
return ReadFeatureFlagAttribute(endpoint, aEncoder, delegate);
208-
}
209-
case app::Clusters::AccountLogin::Attributes::ClusterRevision::Id: {
197+
case app::Clusters::AccountLogin::Attributes::ClusterRevision::Id:
210198
return ReadRevisionAttribute(endpoint, aEncoder, delegate);
211-
}
212-
default: {
199+
default:
213200
break;
214201
}
215-
}
216202

217203
return CHIP_NO_ERROR;
218204
}

0 commit comments

Comments
 (0)