From 2bb230ecdb7029b828b40277b50e86e515039f4e Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 21 Apr 2022 08:48:39 +0200 Subject: [PATCH] Resolve list of TV issues (#17574) --- examples/tv-app/tv-common/tv-app.matter | 1 + examples/tv-app/tv-common/tv-app.zap | 82 +++++++++---- .../account-login-server.cpp | 6 +- .../application-basic-server.cpp | 6 +- .../application-launcher-server.cpp | 6 +- .../audio-output-server.cpp | 2 +- .../channel-server/channel-server.cpp | 6 +- .../content-launch-server.cpp | 6 +- .../keypad-input-server.cpp | 6 +- .../low-power-server/low-power-server.cpp | 2 +- .../media-input-server/media-input-server.cpp | 2 +- .../target-navigator-server.cpp | 6 +- .../wake-on-lan-server/wake-on-lan-server.cpp | 2 +- .../tv-app/zap-generated/endpoint_config.h | 115 ++++++++++-------- 14 files changed, 145 insertions(+), 103 deletions(-) diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 5ad8bb4bd3e33b..d22d3a1315e0a9 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -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 { diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 596c798bfd7652..7b4794118165a7 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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, @@ -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, @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp index 150032b41cf313..5c0cd46b2bd2a1 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp index c938a118f43628..b7e3820ab47287 100644 --- a/src/app/clusters/application-basic-server/application-basic-server.cpp +++ b/src/app/clusters/application-basic-server/application-basic-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp index c0d7e0a05026ea..1f456e234893f8 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp index 21ae4422dac67b..3751d91d307d60 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -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; diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp index 4d18b045cba1ef..479306760a1afe 100644 --- a/src/app/clusters/channel-server/channel-server.cpp +++ b/src/app/clusters/channel-server/channel-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp index 8ac64a0150356a..c4dec8c64e20db 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp index f45c125ed8285c..1389caa20c1326 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -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]); @@ -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; diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp index 99a3c432de7271..17cb40c549b425 100644 --- a/src/app/clusters/low-power-server/low-power-server.cpp +++ b/src/app/clusters/low-power-server/low-power-server.cpp @@ -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; diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp index 8c86d18b1de415..62890ee0047599 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -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; diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index dfe015d715595a..b4ed629d8b3013 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -60,11 +60,11 @@ Delegate * GetDelegate(EndpointId endpoint) ContentApp * app = ContentAppPlatform::GetInstance().GetContentApp(endpoint); if (app != nullptr) { - ChipLogError(Zcl, "TargetNavigator returning ContentApp delegate for endpoint:%u", endpoint); + ChipLogProgress(Zcl, "TargetNavigator returning ContentApp delegate for endpoint:%u", endpoint); return app->GetTargetNavigatorDelegate(); } #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED - ChipLogError(Zcl, "TargetNavigator NOT returning ContentApp delegate for endpoint:%u", endpoint); + ChipLogProgress(Zcl, "TargetNavigator NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, TargetNavigator::Id); return ((ep == 0xFFFF || ep >= EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]); @@ -74,7 +74,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint) { if (delegate == nullptr) { - ChipLogError(Zcl, "Target Navigator has no delegate set for endpoint:%u", endpoint); + ChipLogProgress(Zcl, "Target Navigator has no delegate set for endpoint:%u", endpoint); return true; } return false; diff --git a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp index 9cc8c333731d11..4b3bfa6bd1b345 100644 --- a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp +++ b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp @@ -58,7 +58,7 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint) { if (delegate == nullptr) { - ChipLogError(Zcl, "WakeOnLan has no delegate set for endpoint:%u", endpoint); + ChipLogProgress(Zcl, "WakeOnLan has no delegate set for endpoint:%u", endpoint); return true; } return false; diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 78c5c834b7e4f3..41fb169b3b6c89 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -285,44 +285,49 @@ /* 371 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* Endpoint: 2, Cluster: Level Control (server), big-endian */ \ + /* Endpoint: 1, Cluster: Application Launcher (server), big-endian */ \ \ /* 375 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ - /* Endpoint: 2, Cluster: Audio Output (server), big-endian */ \ + /* Endpoint: 2, Cluster: Level Control (server), big-endian */ \ \ /* 379 - FeatureMap, */ \ + 0x00, 0x00, 0x00, 0x01, \ + \ + /* Endpoint: 2, Cluster: Audio Output (server), big-endian */ \ + \ + /* 383 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 3, Cluster: Media Playback (server), big-endian */ \ \ - /* 383 - StartTime, */ \ + /* 387 - StartTime, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, \ \ - /* 391 - Duration, */ \ + /* 395 - Duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 399 - PlaybackSpeed, */ \ + /* 403 - PlaybackSpeed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 403 - SeekRangeEnd, */ \ + /* 407 - SeekRangeEnd, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 411 - SeekRangeStart, */ \ + /* 415 - SeekRangeStart, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Content Launcher (server), big-endian */ \ \ - /* 419 - SupportedStreamingProtocols, */ \ + /* 423 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 423 - FeatureMap, */ \ + /* 427 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), big-endian */ \ \ - /* 427 - SupportedStreamingProtocols, */ \ + /* 431 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ } @@ -586,50 +591,55 @@ /* 371 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* Endpoint: 2, Cluster: Level Control (server), little-endian */ \ + /* Endpoint: 1, Cluster: Application Launcher (server), little-endian */ \ \ /* 375 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ - /* Endpoint: 2, Cluster: Audio Output (server), little-endian */ \ + /* Endpoint: 2, Cluster: Level Control (server), little-endian */ \ \ /* 379 - FeatureMap, */ \ + 0x01, 0x00, 0x00, 0x00, \ + \ + /* Endpoint: 2, Cluster: Audio Output (server), little-endian */ \ + \ + /* 383 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Media Playback (server), little-endian */ \ \ - /* 383 - StartTime, */ \ + /* 387 - StartTime, */ \ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 391 - Duration, */ \ + /* 395 - Duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 399 - PlaybackSpeed, */ \ + /* 403 - PlaybackSpeed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 403 - SeekRangeEnd, */ \ + /* 407 - SeekRangeEnd, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 411 - SeekRangeStart, */ \ + /* 415 - SeekRangeStart, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Content Launcher (server), little-endian */ \ \ - /* 419 - SupportedStreamingProtocols, */ \ + /* 423 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 423 - FeatureMap, */ \ + /* 427 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), little-endian */ \ \ - /* 427 - SupportedStreamingProtocols, */ \ + /* 431 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (86) +#define GENERATED_DEFAULTS_COUNT (87) #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -662,7 +672,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 305 +#define GENERATED_ATTRIBUTE_COUNT 306 #define GENERATED_ATTRIBUTES \ { \ \ @@ -995,8 +1005,9 @@ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* CatalogList */ \ { 0x00000001, ZAP_TYPE(STRUCT), 0, \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_EMPTY_DEFAULT() }, /* CurrentApp */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + ZAP_EMPTY_DEFAULT() }, /* CurrentApp */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(375) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: On/Off (server) */ \ { 0x00000000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \ @@ -1025,7 +1036,7 @@ { 0x00004000, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(255) }, /* start up current level */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(375) }, /* FeatureMap */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(379) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -1038,7 +1049,7 @@ /* Endpoint: 2, Cluster: Audio Output (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* OutputList */ \ { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentOutput */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(379) }, /* FeatureMap */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(383) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Descriptor (server) */ \ @@ -1050,20 +1061,20 @@ \ /* Endpoint: 3, Cluster: Media Playback (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentState */ \ - { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(383) }, /* StartTime */ \ - { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(391) }, /* Duration */ \ + { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(387) }, /* StartTime */ \ + { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(395) }, /* Duration */ \ { 0x00000003, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* SampledPosition */ \ - { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_LONG_DEFAULTS_INDEX(399) }, /* PlaybackSpeed */ \ - { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(403) }, /* SeekRangeEnd */ \ - { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(411) }, /* SeekRangeStart */ \ + { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_LONG_DEFAULTS_INDEX(403) }, /* PlaybackSpeed */ \ + { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(407) }, /* SeekRangeEnd */ \ + { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(415) }, /* SeekRangeStart */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Content Launcher (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AcceptHeader */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(419) }, /* SupportedStreamingProtocols */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(423) }, /* FeatureMap */ \ + ZAP_LONG_DEFAULTS_INDEX(423) }, /* SupportedStreamingProtocols */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(427) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ @@ -1090,7 +1101,7 @@ /* Endpoint: 4, Cluster: Content Launcher (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AcceptHeader */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(427) }, /* SupportedStreamingProtocols */ \ + ZAP_LONG_DEFAULTS_INDEX(431) }, /* SupportedStreamingProtocols */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ @@ -1736,8 +1747,8 @@ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ .clusterId = 0x0000050C, \ .attributes = ZAP_ATTRIBUTE_INDEX(218), \ - .attributeCount = 3, \ - .clusterSize = 2, \ + .attributeCount = 4, \ + .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\ @@ -1746,7 +1757,7 @@ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(221), \ + .attributes = ZAP_ATTRIBUTE_INDEX(222), \ .attributeCount = 2, \ .clusterSize = 3, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -1757,7 +1768,7 @@ { \ /* Endpoint: 2, Cluster: Level Control (server) */ \ .clusterId = 0x00000008, \ - .attributes = ZAP_ATTRIBUTE_INDEX(223), \ + .attributes = ZAP_ATTRIBUTE_INDEX(224), \ .attributeCount = 16, \ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -1768,7 +1779,7 @@ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(239), \ + .attributes = ZAP_ATTRIBUTE_INDEX(240), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1779,7 +1790,7 @@ { \ /* Endpoint: 2, Cluster: Audio Output (server) */ \ .clusterId = 0x0000050B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(244), \ + .attributes = ZAP_ATTRIBUTE_INDEX(245), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1790,7 +1801,7 @@ { \ /* Endpoint: 3, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(248), \ + .attributes = ZAP_ATTRIBUTE_INDEX(249), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1801,7 +1812,7 @@ { \ /* Endpoint: 3, Cluster: Media Playback (server) */ \ .clusterId = 0x00000506, \ - .attributes = ZAP_ATTRIBUTE_INDEX(253), \ + .attributes = ZAP_ATTRIBUTE_INDEX(254), \ .attributeCount = 8, \ .clusterSize = 39, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1812,7 +1823,7 @@ { \ /* Endpoint: 3, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(261), \ + .attributes = ZAP_ATTRIBUTE_INDEX(262), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1823,7 +1834,7 @@ { \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(265), \ + .attributes = ZAP_ATTRIBUTE_INDEX(266), \ .attributeCount = 9, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1834,7 +1845,7 @@ { \ /* Endpoint: 3, Cluster: Account Login (server) */ \ .clusterId = 0x0000050E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(274), \ + .attributes = ZAP_ATTRIBUTE_INDEX(275), \ .attributeCount = 1, \ .clusterSize = 2, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1845,7 +1856,7 @@ { \ /* Endpoint: 4, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(275), \ + .attributes = ZAP_ATTRIBUTE_INDEX(276), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1856,7 +1867,7 @@ { \ /* Endpoint: 4, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(280), \ + .attributes = ZAP_ATTRIBUTE_INDEX(281), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1867,7 +1878,7 @@ { \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(283), \ + .attributes = ZAP_ATTRIBUTE_INDEX(284), \ .attributeCount = 9, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1878,7 +1889,7 @@ { \ /* Endpoint: 5, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(292), \ + .attributes = ZAP_ATTRIBUTE_INDEX(293), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1889,7 +1900,7 @@ { \ /* Endpoint: 5, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(297), \ + .attributes = ZAP_ATTRIBUTE_INDEX(298), \ .attributeCount = 8, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1908,7 +1919,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 26, 587 }, { ZAP_CLUSTER_INDEX(26), 10, 74 }, { ZAP_CLUSTER_INDEX(36), 4, 37 }, \ + { ZAP_CLUSTER_INDEX(0), 26, 587 }, { ZAP_CLUSTER_INDEX(26), 10, 78 }, { ZAP_CLUSTER_INDEX(36), 4, 37 }, \ { ZAP_CLUSTER_INDEX(40), 5, 157 }, { ZAP_CLUSTER_INDEX(45), 3, 112 }, { ZAP_CLUSTER_INDEX(48), 2, 106 }, \ } @@ -1921,7 +1932,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (1073) +#define ATTRIBUTE_MAX_SIZE (1077) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (6)