Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve list of TV issues #17574

Merged
merged 3 commits into from
Apr 21, 2022
Merged

Resolve list of TV issues #17574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cefee2
Add logic to resolve issues
lazarkov Apr 20, 2022
77cd5f6
Restyle fix
lazarkov Apr 20, 2022
42ce285
Run zap regen script
lazarkov Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ server cluster ApplicationLauncher = 1292 {

readonly attribute INT16U catalogList[] = 0;
attribute nullable ApplicationEP currentApp = 1;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct LaunchAppRequest {
Expand Down
82 changes: 56 additions & 26 deletions examples/tv-app/tv-common/tv-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7452,11 +7452,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -7467,11 +7467,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -7612,11 +7612,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -7627,11 +7627,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -7787,11 +7787,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -7802,11 +7802,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -7969,11 +7969,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -7984,11 +7984,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -8277,6 +8277,36 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand All @@ -8297,11 +8327,11 @@
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "0x0001",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9367,11 +9397,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -9382,11 +9412,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -9940,11 +9970,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -9955,11 +9985,11 @@
"mfgCode": null,
"side": "server",
"included": 0,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/account-login-server/account-login-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "AccountLogin returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "AccountLogin returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetAccountLoginDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "AccountLogin NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "AccountLogin NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, AccountLogin::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -72,7 +72,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Account Login has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Account Login has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/application-basic-server/application-basic-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "ApplicationBasic returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "ApplicationBasic returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetApplicationBasicDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "ApplicationBasic NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "ApplicationBasic NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, chip::app::Clusters::ApplicationBasic::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -74,7 +74,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Application Basic has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Application Basic has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/application-launcher-server/application-launcher-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "ApplicationLauncher returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "ApplicationLauncher returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetApplicationLauncherDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "ApplicationLauncher NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "ApplicationLauncher NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ApplicationLauncher::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -79,7 +79,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Application Launcher has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Application Launcher has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/audio-output-server/audio-output-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Audio Output has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Audio Output has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/channel-server/channel-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "Channel returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Channel returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetChannelDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "Channel NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Channel NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, Channel::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -90,7 +90,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Channel has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Channel has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/content-launch-server/content-launch-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "Content Launcher returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Content Launcher returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetContentLauncherDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "Content Launcher NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Content Launcher NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ContentLauncher::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -95,7 +95,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Content Launcher has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Content Launcher has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/app/clusters/keypad-input-server/keypad-input-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ Delegate * GetDelegate(EndpointId endpoint)
ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint);
if (app != nullptr)
{
ChipLogError(Zcl, "KeypadInput returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "KeypadInput returning ContentApp delegate for endpoint:%u", endpoint);
return app->GetKeypadInputDelegate();
}
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ChipLogError(Zcl, "KeypadInput NOT returning ContentApp delegate for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "KeypadInput NOT returning ContentApp delegate for endpoint:%u", endpoint);

uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, KeypadInput::Id);
return ((ep == 0xFFFF || ep >= EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]);
Expand All @@ -72,7 +72,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Keypad Input has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Keypad Input has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/low-power-server/low-power-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "LowPower has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "LowPower has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/media-input-server/media-input-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
{
if (delegate == nullptr)
{
ChipLogError(Zcl, "Media Input has no delegate set for endpoint:%u", endpoint);
ChipLogProgress(Zcl, "Media Input has no delegate set for endpoint:%u", endpoint);
return true;
}
return false;
Expand Down
Loading