From 32388117f97769144d1640b6e53ea7bf77014990 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 16 May 2022 16:22:40 +0200 Subject: [PATCH] Update feature flags logic in media clusters & TV app (#18191) * Update logic * Update zap files * Restyle fix * Add feature flag function * Update code per comments --- examples/tv-app/tv-common/tv-app.matter | 9 +- examples/tv-app/tv-common/tv-app.zap | 637 +++++++++++++++++- .../application-launcher-server.cpp | 15 + .../audio-output-server.cpp | 18 +- .../channel-server/channel-server.cpp | 4 +- .../content-launch-server.cpp | 7 +- .../media-input-server/media-input-server.cpp | 17 +- .../tv-app/zap-generated/endpoint_config.h | 144 ++-- 8 files changed, 757 insertions(+), 94 deletions(-) diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 57e7e1088b28e7..4d7b233aa23b3d 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1060,6 +1060,7 @@ server cluster MediaPlayback = 1286 { readonly attribute single playbackSpeed = 4; readonly attribute nullable int64u seekRangeEnd = 5; readonly attribute nullable int64u seekRangeStart = 6; + readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; request struct SkipForwardRequest { @@ -2282,7 +2283,7 @@ endpoint 1 { callback attribute channelList; callback attribute lineup; callback attribute currentChannel; - ram attribute featureMap default = 0x0001; + ram attribute featureMap default = 0x0003; ram attribute clusterRevision default = 1; } @@ -2305,13 +2306,14 @@ endpoint 1 { } server cluster KeypadInput { - ram attribute featureMap default = 0x0001; + ram attribute featureMap default = 0x0007; ram attribute clusterRevision default = 1; } server cluster ContentLauncher { callback attribute acceptHeader; ram attribute supportedStreamingProtocols; + ram attribute featureMap default = 0x0003; ram attribute clusterRevision default = 1; } @@ -2383,13 +2385,14 @@ endpoint 3 { ram attribute playbackSpeed; ram attribute seekRangeEnd; ram attribute seekRangeStart; + ram attribute featureMap default = 0x0003; ram attribute clusterRevision default = 1; } server cluster ContentLauncher { callback attribute acceptHeader; ram attribute supportedStreamingProtocols; - ram attribute featureMap default = 0x0001; + ram attribute featureMap default = 0x0003; ram attribute clusterRevision default = 1; } diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 7178ad9852e28c..c2e5b77a801afa 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -67,6 +67,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -102,6 +103,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -117,6 +119,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -192,6 +195,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -251,6 +255,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -266,6 +271,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -349,6 +355,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -424,6 +431,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -439,6 +447,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -454,6 +463,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -469,6 +479,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -484,6 +495,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -499,6 +511,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -550,6 +563,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -576,6 +590,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -591,6 +606,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -682,6 +698,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -708,6 +725,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -723,6 +741,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -749,6 +768,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -775,6 +795,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -790,6 +811,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -805,6 +827,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -820,6 +843,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -835,6 +859,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -861,6 +886,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -887,6 +913,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -902,6 +929,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -938,6 +966,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -953,6 +982,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -968,6 +998,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -983,6 +1014,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -998,6 +1030,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1013,6 +1046,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1028,6 +1062,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1054,6 +1089,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1080,6 +1116,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1095,6 +1132,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1110,6 +1148,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 1, @@ -1125,6 +1164,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1140,6 +1180,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1155,6 +1196,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -1170,6 +1212,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1185,6 +1228,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1200,6 +1244,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1215,6 +1260,7 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1230,6 +1276,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1245,6 +1292,7 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1260,6 +1308,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1275,6 +1324,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "long_char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1290,6 +1340,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1305,6 +1356,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1320,6 +1372,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -1335,6 +1388,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1350,6 +1404,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1365,6 +1420,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "CapabilityMinimaStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -1380,6 +1436,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1431,6 +1488,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1474,6 +1532,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1510,6 +1569,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1525,6 +1585,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1540,6 +1601,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1576,6 +1638,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "HourFormat", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1591,6 +1654,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "CalendarType", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1606,6 +1670,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1621,6 +1686,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1657,6 +1723,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "TempUnit", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1672,6 +1739,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1687,6 +1755,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1738,6 +1807,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1789,6 +1859,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1804,6 +1875,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "BasicCommissioningInfo", "included": 1, "storageOption": "External", "singleton": 0, @@ -1819,6 +1891,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "RegulatoryLocationType", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1834,6 +1907,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "RegulatoryLocationType", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1849,6 +1923,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "External", "singleton": 0, @@ -1864,6 +1939,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1879,6 +1955,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1954,6 +2031,7 @@ "code": 65532, "mfgCode": null, "side": "client", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1969,6 +2047,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2020,6 +2099,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2035,6 +2115,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2050,6 +2131,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2065,6 +2147,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2080,6 +2163,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2095,6 +2179,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "NetworkCommissioningStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2110,6 +2195,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2125,6 +2211,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int32s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2140,6 +2227,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -2155,6 +2243,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2170,6 +2259,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2215,6 +2305,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2241,6 +2332,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2256,6 +2348,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2271,6 +2364,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2286,6 +2380,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2301,6 +2396,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "External", "singleton": 0, @@ -2316,6 +2412,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2331,6 +2428,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2346,6 +2444,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2361,6 +2460,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2396,6 +2496,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2422,6 +2523,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2437,6 +2539,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2452,6 +2555,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2467,6 +2571,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -2482,6 +2587,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2497,6 +2603,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2523,6 +2630,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2538,6 +2646,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2553,6 +2662,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2568,6 +2678,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2583,6 +2694,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2598,6 +2710,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2613,6 +2726,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2628,6 +2742,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2643,6 +2758,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2658,6 +2774,7 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2673,6 +2790,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2688,6 +2806,7 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2703,6 +2822,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2718,6 +2838,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2733,6 +2854,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2748,6 +2870,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2763,6 +2886,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2778,6 +2902,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2793,6 +2918,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2808,6 +2934,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2823,6 +2950,7 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2838,6 +2966,7 @@ "code": 21, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2853,6 +2982,7 @@ "code": 22, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2868,6 +2998,7 @@ "code": 23, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2883,6 +3014,7 @@ "code": 24, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2898,6 +3030,7 @@ "code": 25, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2913,6 +3046,7 @@ "code": 26, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2928,6 +3062,7 @@ "code": 27, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2943,6 +3078,7 @@ "code": 28, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2958,6 +3094,7 @@ "code": 29, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2973,6 +3110,7 @@ "code": 30, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2988,6 +3126,7 @@ "code": 31, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3003,6 +3142,7 @@ "code": 32, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3018,6 +3158,7 @@ "code": 33, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3033,6 +3174,7 @@ "code": 34, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3048,6 +3190,7 @@ "code": 35, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3063,6 +3206,7 @@ "code": 36, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3078,6 +3222,7 @@ "code": 37, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3093,6 +3238,7 @@ "code": 38, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3108,6 +3254,7 @@ "code": 39, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3123,6 +3270,7 @@ "code": 40, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3138,6 +3286,7 @@ "code": 41, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3153,6 +3302,7 @@ "code": 42, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3168,6 +3318,7 @@ "code": 43, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3183,6 +3334,7 @@ "code": 44, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3198,6 +3350,7 @@ "code": 45, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3213,6 +3366,7 @@ "code": 46, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3228,6 +3382,7 @@ "code": 47, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3243,6 +3398,7 @@ "code": 48, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3258,6 +3414,7 @@ "code": 49, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3273,6 +3430,7 @@ "code": 50, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3288,6 +3446,7 @@ "code": 51, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3303,6 +3462,7 @@ "code": 52, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3318,6 +3478,7 @@ "code": 53, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3333,6 +3494,7 @@ "code": 54, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3348,6 +3510,7 @@ "code": 55, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3363,6 +3526,7 @@ "code": 56, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3378,6 +3542,7 @@ "code": 57, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3393,6 +3558,7 @@ "code": 58, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3408,6 +3574,7 @@ "code": 59, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3423,6 +3590,7 @@ "code": 60, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3438,6 +3606,7 @@ "code": 61, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3453,6 +3622,7 @@ "code": 62, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3468,6 +3638,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3483,6 +3654,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3509,6 +3681,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3535,8 +3708,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3550,8 +3724,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "SecurityType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3565,6 +3740,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "WiFiVersionType", "included": 1, "storageOption": "External", "singleton": 0, @@ -3580,6 +3756,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3595,6 +3772,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int8s", "included": 1, "storageOption": "External", "singleton": 0, @@ -3610,6 +3788,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3625,6 +3804,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3640,6 +3820,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3655,6 +3836,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3670,6 +3852,7 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3685,6 +3868,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3700,6 +3884,7 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3715,6 +3900,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3730,6 +3916,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3745,6 +3932,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3780,6 +3968,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3806,6 +3995,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "PHYRateType", "included": 1, "storageOption": "External", "singleton": 0, @@ -3821,6 +4011,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "External", "singleton": 0, @@ -3836,6 +4027,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3851,6 +4043,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3866,6 +4059,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3881,6 +4075,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3896,6 +4091,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3911,6 +4107,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "External", "singleton": 0, @@ -3926,6 +4123,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "External", "singleton": 0, @@ -3941,6 +4139,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3956,6 +4155,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3982,6 +4182,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4008,6 +4209,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4023,6 +4225,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4038,6 +4241,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4053,6 +4257,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4104,6 +4309,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4130,6 +4336,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4145,6 +4352,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "fabric_idx", "included": 1, "storageOption": "External", "singleton": 0, @@ -4160,6 +4368,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4175,6 +4384,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4274,6 +4484,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4333,6 +4544,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4348,6 +4560,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4363,6 +4576,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4378,6 +4592,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4393,6 +4608,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4408,6 +4624,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "fabric_idx", "included": 1, "storageOption": "External", "singleton": 0, @@ -4423,6 +4640,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4449,6 +4667,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4475,6 +4694,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4490,6 +4710,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4505,6 +4726,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4541,6 +4763,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4556,6 +4779,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4592,6 +4816,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4607,6 +4832,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4818,6 +5044,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4844,6 +5071,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "DlLockState", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4859,6 +5087,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "DlLockType", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4874,6 +5103,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4889,6 +5119,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "DlDoorState", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4904,6 +5135,7 @@ "code": 32, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4919,6 +5151,7 @@ "code": 33, "mfgCode": null, "side": "server", + "type": "char_string", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4934,6 +5167,7 @@ "code": 34, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4949,6 +5183,7 @@ "code": 35, "mfgCode": null, "side": "server", + "type": "int32u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4964,6 +5199,7 @@ "code": 36, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4979,6 +5215,7 @@ "code": 37, "mfgCode": null, "side": "server", + "type": "DlOperatingMode", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -4994,6 +5231,7 @@ "code": 39, "mfgCode": null, "side": "server", + "type": "DlDefaultConfigurationRegister", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5009,6 +5247,7 @@ "code": 40, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5024,6 +5263,7 @@ "code": 41, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5039,6 +5279,7 @@ "code": 42, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5054,6 +5295,7 @@ "code": 43, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5069,6 +5311,7 @@ "code": 48, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5084,6 +5327,7 @@ "code": 49, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5099,6 +5343,7 @@ "code": 50, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5114,6 +5359,7 @@ "code": 51, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5129,6 +5375,7 @@ "code": 64, "mfgCode": null, "side": "server", + "type": "DlAlarmMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5144,6 +5391,7 @@ "code": 65, "mfgCode": null, "side": "server", + "type": "DlKeypadOperationEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5159,6 +5407,7 @@ "code": 66, "mfgCode": null, "side": "server", + "type": "DlRemoteOperationEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5174,6 +5423,7 @@ "code": 67, "mfgCode": null, "side": "server", + "type": "DlManualOperationEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5189,6 +5439,7 @@ "code": 68, "mfgCode": null, "side": "server", + "type": "DlRFIDOperationEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5204,6 +5455,7 @@ "code": 69, "mfgCode": null, "side": "server", + "type": "DlKeypadOperationEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5219,6 +5471,7 @@ "code": 70, "mfgCode": null, "side": "server", + "type": "DlRemoteProgrammingEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5234,6 +5487,7 @@ "code": 71, "mfgCode": null, "side": "server", + "type": "DlRFIDProgrammingEventMask", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5249,6 +5503,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5292,6 +5547,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5318,6 +5574,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5333,6 +5590,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "bitmap16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5348,6 +5606,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5363,6 +5622,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5378,6 +5638,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5517,6 +5778,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5543,6 +5805,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5558,6 +5821,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5573,6 +5837,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5588,6 +5853,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5603,6 +5869,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5618,6 +5885,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5633,6 +5901,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5648,6 +5917,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5663,6 +5933,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5678,6 +5949,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5693,6 +5965,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5708,6 +5981,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5723,6 +5997,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5738,6 +6013,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5753,6 +6029,7 @@ "code": 21, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5768,6 +6045,7 @@ "code": 22, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5783,6 +6061,7 @@ "code": 23, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5798,6 +6077,7 @@ "code": 25, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5813,6 +6093,7 @@ "code": 26, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5828,6 +6109,7 @@ "code": 27, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5843,6 +6125,7 @@ "code": 32, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5858,6 +6141,7 @@ "code": 33, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5873,6 +6157,7 @@ "code": 34, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5888,6 +6173,7 @@ "code": 36, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5903,6 +6189,7 @@ "code": 37, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5918,6 +6205,7 @@ "code": 38, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5933,6 +6221,7 @@ "code": 40, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5948,6 +6237,7 @@ "code": 41, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5963,6 +6253,7 @@ "code": 42, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5978,6 +6269,7 @@ "code": 48, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5993,6 +6285,7 @@ "code": 49, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6008,6 +6301,7 @@ "code": 50, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6023,6 +6317,7 @@ "code": 51, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6038,6 +6333,7 @@ "code": 52, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6053,6 +6349,7 @@ "code": 54, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6068,6 +6365,7 @@ "code": 55, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6083,6 +6381,7 @@ "code": 56, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6098,6 +6397,7 @@ "code": 58, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6113,6 +6413,7 @@ "code": 59, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6128,6 +6429,7 @@ "code": 60, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6143,6 +6445,7 @@ "code": 16384, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6158,6 +6461,7 @@ "code": 16385, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6173,6 +6477,7 @@ "code": 16386, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6188,6 +6493,7 @@ "code": 16387, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6203,6 +6509,7 @@ "code": 16388, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6218,6 +6525,7 @@ "code": 16394, "mfgCode": null, "side": "server", + "type": "bitmap16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6233,6 +6541,7 @@ "code": 16395, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6248,6 +6557,7 @@ "code": 16396, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6263,6 +6573,7 @@ "code": 16397, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6278,6 +6589,7 @@ "code": 16400, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6293,6 +6605,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6319,6 +6632,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6345,6 +6659,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6360,6 +6675,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6375,6 +6691,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6390,6 +6707,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6405,6 +6723,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6431,6 +6750,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6457,6 +6777,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6472,6 +6793,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6487,6 +6809,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6502,6 +6825,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6517,6 +6841,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6552,6 +6877,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6595,6 +6921,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6610,6 +6937,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "enum16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6625,6 +6953,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "bitmap16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6640,6 +6969,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "node_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6655,6 +6985,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6670,6 +7001,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6721,6 +7053,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6756,6 +7089,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6771,6 +7105,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "Bitmap8MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6786,6 +7121,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "Bitmap16MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6801,6 +7137,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "Bitmap32MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6816,6 +7153,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "Bitmap64MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6831,6 +7169,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6846,6 +7185,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6861,6 +7201,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6876,6 +7217,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6891,6 +7233,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "int8s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6906,6 +7249,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "int16s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6921,6 +7265,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int32s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6936,6 +7281,7 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int64s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6951,6 +7297,7 @@ "code": 21, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6966,6 +7313,7 @@ "code": 22, "mfgCode": null, "side": "server", + "type": "enum16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6981,6 +7329,7 @@ "code": 25, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6996,6 +7345,7 @@ "code": 26, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7011,6 +7361,7 @@ "code": 27, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7026,6 +7377,7 @@ "code": 28, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7041,6 +7393,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7100,6 +7453,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7126,6 +7480,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7141,6 +7496,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7167,6 +7523,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7193,6 +7550,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7208,6 +7566,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7223,6 +7582,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7238,6 +7598,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7253,6 +7614,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -7279,6 +7641,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7305,6 +7668,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7320,6 +7684,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7371,6 +7736,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7406,6 +7772,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7421,6 +7788,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "LineupInfo", "included": 1, "storageOption": "External", "singleton": 0, @@ -7436,6 +7804,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "ChannelInfo", "included": 1, "storageOption": "External", "singleton": 0, @@ -7451,6 +7820,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7466,6 +7836,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7481,6 +7852,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7496,11 +7868,12 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0003", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -7511,6 +7884,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7546,6 +7920,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7581,6 +7956,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7596,6 +7972,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7611,6 +7988,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7626,6 +8004,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7641,6 +8020,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7656,6 +8036,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7671,6 +8052,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7730,6 +8112,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7756,6 +8139,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -7771,6 +8155,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7786,6 +8171,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7801,6 +8187,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7816,6 +8203,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7831,6 +8219,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7846,6 +8235,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7881,6 +8271,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7907,6 +8298,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7942,6 +8334,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7968,6 +8361,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7983,6 +8377,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7998,6 +8393,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -8013,11 +8409,12 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0007", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8028,6 +8425,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8071,6 +8469,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8106,6 +8505,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -8121,6 +8521,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8131,11 +8532,44 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "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", + "type": "array", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "AttributeList", "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -8151,11 +8585,12 @@ "code": 65532, "mfgCode": null, "side": "server", - "included": 0, + "type": "bitmap32", + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0003", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8166,6 +8601,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8217,6 +8653,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8252,6 +8689,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -8267,6 +8705,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "ApplicationEP", "included": 1, "storageOption": "External", "singleton": 0, @@ -8282,6 +8721,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -8297,6 +8737,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -8312,6 +8753,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -8327,6 +8769,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8342,6 +8785,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8393,6 +8837,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8428,6 +8873,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8443,6 +8889,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "Bitmap8MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8458,6 +8905,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "Bitmap16MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8473,6 +8921,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "Bitmap32MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8488,6 +8937,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "Bitmap64MaskMap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8503,6 +8953,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8518,6 +8969,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8533,6 +8985,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8548,6 +9001,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8563,6 +9017,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "int8s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8578,6 +9033,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "int16s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8593,6 +9049,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int32s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8608,6 +9065,7 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int64s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8623,6 +9081,7 @@ "code": 21, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8638,6 +9097,7 @@ "code": 22, "mfgCode": null, "side": "server", + "type": "enum16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8653,6 +9113,7 @@ "code": 25, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8668,6 +9129,7 @@ "code": 26, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -8683,6 +9145,7 @@ "code": 27, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -8698,6 +9161,7 @@ "code": 28, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -8713,6 +9177,7 @@ "code": 29, "mfgCode": null, "side": "server", + "type": "long_octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8728,6 +9193,7 @@ "code": 255, "mfgCode": null, "side": "server", + "type": "boolean", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -8743,6 +9209,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8802,6 +9269,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8828,6 +9296,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8843,6 +9312,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8934,6 +9404,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8960,6 +9431,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -8975,6 +9447,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8990,6 +9463,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9005,6 +9479,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9020,6 +9495,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9035,6 +9511,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9050,6 +9527,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9065,6 +9543,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9080,6 +9559,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9095,6 +9575,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9110,6 +9591,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9125,6 +9607,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9140,6 +9623,7 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9155,6 +9639,7 @@ "code": 16384, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -9170,6 +9655,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9185,6 +9671,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9211,6 +9698,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9237,6 +9725,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9252,6 +9741,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9267,6 +9757,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9282,6 +9773,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9297,6 +9789,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -9340,6 +9833,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9366,6 +9860,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9381,6 +9876,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9396,6 +9892,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9411,6 +9908,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9426,6 +9924,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9441,6 +9940,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9456,6 +9956,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9490,6 +9991,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9516,6 +10018,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9531,6 +10034,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9546,6 +10050,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9561,6 +10066,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9576,6 +10082,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -9691,6 +10198,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9726,6 +10234,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "PlaybackStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9741,6 +10250,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "epoch_us", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9756,6 +10266,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9771,6 +10282,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "PlaybackPosition", "included": 1, "storageOption": "External", "singleton": 0, @@ -9786,6 +10298,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "single", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9801,6 +10314,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9816,6 +10330,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9826,11 +10341,44 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "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", + "type": "array", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "AttributeList", "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9846,11 +10394,12 @@ "code": 65532, "mfgCode": null, "side": "server", - "included": 0, + "type": "bitmap32", + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0003", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -9861,6 +10410,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9904,6 +10454,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9939,6 +10490,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -9954,6 +10506,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9969,6 +10522,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9984,6 +10538,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -9999,6 +10554,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -10014,11 +10570,12 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0001", + "defaultValue": "0x0003", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10029,6 +10586,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10055,6 +10613,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10081,6 +10640,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10096,6 +10656,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10111,6 +10672,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10126,6 +10688,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10141,6 +10704,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "ApplicationBasicApplication", "included": 1, "storageOption": "External", "singleton": 0, @@ -10156,6 +10720,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "ApplicationStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10171,6 +10736,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10186,6 +10752,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10201,6 +10768,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -10216,6 +10784,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10231,6 +10800,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10282,6 +10852,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10317,6 +10888,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -10332,6 +10904,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10347,6 +10920,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10381,6 +10955,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10407,6 +10982,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10422,6 +10998,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10437,6 +11014,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10452,6 +11030,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10467,6 +11046,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -10510,6 +11090,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10545,6 +11126,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10560,6 +11142,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10575,6 +11158,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -10590,6 +11174,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10605,6 +11190,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10631,6 +11217,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10657,6 +11244,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10672,6 +11260,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10687,6 +11276,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10702,6 +11292,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10717,6 +11308,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "ApplicationBasicApplication", "included": 1, "storageOption": "External", "singleton": 0, @@ -10732,6 +11324,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "ApplicationStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10747,6 +11340,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10762,6 +11356,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10777,6 +11372,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -10792,6 +11388,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10807,6 +11404,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10841,6 +11439,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10867,6 +11466,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10882,6 +11482,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10897,6 +11498,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10912,6 +11514,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -10927,6 +11530,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -10953,6 +11557,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10979,6 +11584,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10994,6 +11600,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11009,6 +11616,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11024,6 +11632,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11039,6 +11648,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "ApplicationBasicApplication", "included": 1, "storageOption": "External", "singleton": 0, @@ -11054,6 +11664,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "ApplicationStatusEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11069,6 +11680,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11084,6 +11696,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -11099,6 +11712,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -11114,6 +11728,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11129,6 +11744,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11199,5 +11815,6 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ] + ], + "log": [] } \ No newline at end of file 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 1a12db9a628e91..6f38acf9acb163 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -104,6 +105,20 @@ void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) } } +bool HasFeature(chip::EndpointId endpoint, ApplicationLauncherFeature feature) +{ + bool hasFeature = false; + uint32_t featureMap = 0; + + EmberAfStatus status = Attributes::FeatureMap::Get(endpoint, &featureMap); + if (EMBER_ZCL_STATUS_SUCCESS == status) + { + hasFeature = (featureMap & chip::to_underlying(feature)); + } + + return hasFeature; +} + // this attribute should only be enabled for app platform instance (endpoint 1) CHIP_ERROR Delegate::HandleGetCurrentApp(app::AttributeValueEncoder & aEncoder) { 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 3751d91d307d60..b2ad51e23e5ae6 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -180,15 +180,21 @@ bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); exit: - if (err != CHIP_NO_ERROR) + if (HasFeature(endpoint, AudioOutputFeature::kNameUpdates) && err == CHIP_NO_ERROR) { - ChipLogError(Zcl, "emberAfAudioOutputClusterRenameOutputCallback error: %s", err.AsString()); - emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE); + bool success = delegate->HandleRenameOutput(index, name); + Protocols::InteractionModel::Status status = + success ? Protocols::InteractionModel::Status::Success : Protocols::InteractionModel::Status::Failure; + command->AddStatus(commandPath, status); + } + else + { + err != CHIP_NO_ERROR ? ChipLogError(Zcl, "emberAfAudioOutputClusterRenameOutputCallback error: %s", err.AsString()) + : ChipLogError(Zcl, "AudioOutput no name updates feature"); + + command->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure); } - bool success = delegate->HandleRenameOutput(index, name); - EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; - emberAfSendImmediateDefaultResponse(status); return true; } diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp index 479306760a1afe..fab495dac4db33 100644 --- a/src/app/clusters/channel-server/channel-server.cpp +++ b/src/app/clusters/channel-server/channel-server.cpp @@ -162,7 +162,7 @@ CHIP_ERROR ChannelAttrAccess::Read(const app::ConcreteReadAttributePath & aPath, switch (aPath.mAttributeId) { case app::Clusters::Channel::Attributes::ChannelList::Id: { - if (isDelegateNull(delegate, endpoint)) + if (isDelegateNull(delegate, endpoint) || !HasFeature(endpoint, ChannelFeature::kChannelList)) { return aEncoder.EncodeEmptyList(); } @@ -170,7 +170,7 @@ CHIP_ERROR ChannelAttrAccess::Read(const app::ConcreteReadAttributePath & aPath, return ReadChannelListAttribute(aEncoder, delegate); } case app::Clusters::Channel::Attributes::Lineup::Id: { - if (isDelegateNull(delegate, endpoint)) + if (isDelegateNull(delegate, endpoint) || !HasFeature(endpoint, ChannelFeature::kLineupInfo)) { return CHIP_NO_ERROR; } 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 c4dec8c64e20db..29bf6ea3bab263 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -219,7 +219,9 @@ bool emberAfContentLauncherClusterLaunchContentCallback(CommandHandler * command app::CommandResponseHelper responder(commandObj, commandPath); Delegate * delegate = GetDelegate(endpoint); - VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); + + VerifyOrExit(isDelegateNull(delegate, endpoint) != true && HasFeature(endpoint, ContentLauncherFeature::kContentSearch), + err = CHIP_ERROR_INCORRECT_STATE); { delegate->HandleLaunchContent(responder, decodableParameterList, autoplay, data.HasValue() ? data.Value() : CharSpan()); } @@ -252,7 +254,8 @@ bool emberAfContentLauncherClusterLaunchURLCallback(CommandHandler * commandObj, app::CommandResponseHelper responder(commandObj, commandPath); Delegate * delegate = GetDelegate(endpoint); - VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); + VerifyOrExit(isDelegateNull(delegate, endpoint) != true && HasFeature(endpoint, ContentLauncherFeature::kURLPlayback), + err = CHIP_ERROR_INCORRECT_STATE); { delegate->HandleLaunchUrl(responder, contentUrl, displayString.HasValue() ? displayString.Value() : CharSpan(), brandingInformation.HasValue() ? brandingInformation.Value() 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 62890ee0047599..12eda44fe57451 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -247,15 +247,20 @@ bool emberAfMediaInputClusterRenameInputCallback(app::CommandHandler * command, VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); exit: - if (err != CHIP_NO_ERROR) + if (HasFeature(endpoint, MediaInputFeature::kNameUpdates) && err == CHIP_NO_ERROR) { - ChipLogError(Zcl, "emberAfMediaInputClusterRenameInputCallback error: %s", err.AsString()); - emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_FAILURE); + bool success = delegate->HandleRenameInput(index, name); + Protocols::InteractionModel::Status status = + success ? Protocols::InteractionModel::Status::Success : Protocols::InteractionModel::Status::Failure; + command->AddStatus(commandPath, status); + } + else + { + err != CHIP_NO_ERROR ? ChipLogError(Zcl, "emberAfMediaInputClusterRenameInputCallback error: %s", err.AsString()) + : ChipLogError(Zcl, "MediaInput no name updates feature"); + command->AddStatus(commandPath, Protocols::InteractionModel::Status::Failure); } - bool success = delegate->HandleRenameInput(index, name); - EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; - emberAfSendImmediateDefaultResponse(status); return true; } diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index ef220ff9aa9c41..7b240f97e6cc54 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -204,7 +204,7 @@ /* Endpoint: 1, Cluster: Channel (server), big-endian */ \ \ /* 231 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x03, \ \ /* Endpoint: 1, Cluster: Target Navigator (server), big-endian */ \ \ @@ -219,56 +219,62 @@ /* Endpoint: 1, Cluster: Keypad Input (server), big-endian */ \ \ /* 243 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + 0x00, 0x00, 0x00, 0x07, \ \ /* Endpoint: 1, Cluster: Content Launcher (server), big-endian */ \ \ /* 247 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ + /* 251 - FeatureMap, */ \ + 0x00, 0x00, 0x00, 0x03, \ + \ /* Endpoint: 1, Cluster: Application Launcher (server), big-endian */ \ \ - /* 251 - FeatureMap, */ \ + /* 255 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 2, Cluster: Level Control (server), big-endian */ \ \ - /* 255 - FeatureMap, */ \ + /* 259 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 2, Cluster: Audio Output (server), big-endian */ \ \ - /* 259 - FeatureMap, */ \ + /* 263 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 3, Cluster: Media Playback (server), big-endian */ \ \ - /* 263 - StartTime, */ \ + /* 267 - StartTime, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, \ \ - /* 271 - Duration, */ \ + /* 275 - Duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 279 - PlaybackSpeed, */ \ + /* 283 - PlaybackSpeed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 283 - SeekRangeEnd, */ \ + /* 287 - SeekRangeEnd, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 291 - SeekRangeStart, */ \ + /* 295 - SeekRangeStart, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ + /* 303 - FeatureMap, */ \ + 0x00, 0x00, 0x00, 0x03, \ + \ /* Endpoint: 3, Cluster: Content Launcher (server), big-endian */ \ \ - /* 299 - SupportedStreamingProtocols, */ \ + /* 307 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 303 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x01, \ + /* 311 - FeatureMap, */ \ + 0x00, 0x00, 0x00, 0x03, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), big-endian */ \ \ - /* 307 - SupportedStreamingProtocols, */ \ + /* 315 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ } @@ -451,7 +457,7 @@ /* Endpoint: 1, Cluster: Channel (server), little-endian */ \ \ /* 231 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x03, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Target Navigator (server), little-endian */ \ \ @@ -466,62 +472,68 @@ /* Endpoint: 1, Cluster: Keypad Input (server), little-endian */ \ \ /* 243 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + 0x07, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Content Launcher (server), little-endian */ \ \ /* 247 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ + /* 251 - FeatureMap, */ \ + 0x03, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 1, Cluster: Application Launcher (server), little-endian */ \ \ - /* 251 - FeatureMap, */ \ + /* 255 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: Level Control (server), little-endian */ \ \ - /* 255 - FeatureMap, */ \ + /* 259 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: Audio Output (server), little-endian */ \ \ - /* 259 - FeatureMap, */ \ + /* 263 - FeatureMap, */ \ 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Media Playback (server), little-endian */ \ \ - /* 263 - StartTime, */ \ + /* 267 - StartTime, */ \ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 271 - Duration, */ \ + /* 275 - Duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 279 - PlaybackSpeed, */ \ + /* 283 - PlaybackSpeed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 283 - SeekRangeEnd, */ \ + /* 287 - SeekRangeEnd, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 291 - SeekRangeStart, */ \ + /* 295 - SeekRangeStart, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ + /* 303 - FeatureMap, */ \ + 0x03, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 3, Cluster: Content Launcher (server), little-endian */ \ \ - /* 299 - SupportedStreamingProtocols, */ \ + /* 307 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 303 - FeatureMap, */ \ - 0x01, 0x00, 0x00, 0x00, \ + /* 311 - FeatureMap, */ \ + 0x03, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), little-endian */ \ \ - /* 307 - SupportedStreamingProtocols, */ \ + /* 315 - SupportedStreamingProtocols, */ \ 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (68) +#define GENERATED_DEFAULTS_COUNT (70) #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -554,7 +566,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 306 +#define GENERATED_ATTRIBUTE_COUNT 308 #define GENERATED_ATTRIBUTES \ { \ \ @@ -897,15 +909,16 @@ /* Endpoint: 1, 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(247) }, /* SupportedStreamingProtocols */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + ZAP_LONG_DEFAULTS_INDEX(247) }, /* SupportedStreamingProtocols */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(251) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { 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 */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(251) }, /* FeatureMap */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(255) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: On/Off (server) */ \ @@ -935,7 +948,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(255) }, /* FeatureMap */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(259) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -948,7 +961,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(259) }, /* FeatureMap */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(263) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Descriptor (server) */ \ @@ -960,20 +973,21 @@ \ /* 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(263) }, /* StartTime */ \ - { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(271) }, /* Duration */ \ + { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(267) }, /* StartTime */ \ + { 0x00000002, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(275) }, /* 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(279) }, /* PlaybackSpeed */ \ - { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(283) }, /* SeekRangeEnd */ \ - { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(291) }, /* SeekRangeStart */ \ + { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_LONG_DEFAULTS_INDEX(283) }, /* PlaybackSpeed */ \ + { 0x00000005, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(287) }, /* SeekRangeEnd */ \ + { 0x00000006, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(295) }, /* SeekRangeStart */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(303) }, /* FeatureMap */ \ { 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(299) }, /* SupportedStreamingProtocols */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(303) }, /* FeatureMap */ \ + ZAP_LONG_DEFAULTS_INDEX(307) }, /* SupportedStreamingProtocols */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(311) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ @@ -1000,7 +1014,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(307) }, /* SupportedStreamingProtocols */ \ + ZAP_LONG_DEFAULTS_INDEX(315) }, /* SupportedStreamingProtocols */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ @@ -1643,8 +1657,8 @@ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ .attributes = ZAP_ATTRIBUTE_INDEX(215), \ - .attributeCount = 3, \ - .clusterSize = 6, \ + .attributeCount = 4, \ + .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 80 ) ,\ @@ -1653,7 +1667,7 @@ { \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ .clusterId = 0x0000050C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(218), \ + .attributes = ZAP_ATTRIBUTE_INDEX(219), \ .attributeCount = 4, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1664,7 +1678,7 @@ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(222), \ + .attributes = ZAP_ATTRIBUTE_INDEX(223), \ .attributeCount = 2, \ .clusterSize = 3, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -1675,7 +1689,7 @@ { \ /* Endpoint: 2, Cluster: Level Control (server) */ \ .clusterId = 0x00000008, \ - .attributes = ZAP_ATTRIBUTE_INDEX(224), \ + .attributes = ZAP_ATTRIBUTE_INDEX(225), \ .attributeCount = 16, \ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -1686,7 +1700,7 @@ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(240), \ + .attributes = ZAP_ATTRIBUTE_INDEX(241), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1697,7 +1711,7 @@ { \ /* Endpoint: 2, Cluster: Audio Output (server) */ \ .clusterId = 0x0000050B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(245), \ + .attributes = ZAP_ATTRIBUTE_INDEX(246), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1708,7 +1722,7 @@ { \ /* Endpoint: 3, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(249), \ + .attributes = ZAP_ATTRIBUTE_INDEX(250), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1719,9 +1733,9 @@ { \ /* Endpoint: 3, Cluster: Media Playback (server) */ \ .clusterId = 0x00000506, \ - .attributes = ZAP_ATTRIBUTE_INDEX(254), \ - .attributeCount = 8, \ - .clusterSize = 39, \ + .attributes = ZAP_ATTRIBUTE_INDEX(255), \ + .attributeCount = 9, \ + .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 107 ) ,\ @@ -1730,7 +1744,7 @@ { \ /* Endpoint: 3, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(262), \ + .attributes = ZAP_ATTRIBUTE_INDEX(264), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1741,7 +1755,7 @@ { \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(266), \ + .attributes = ZAP_ATTRIBUTE_INDEX(268), \ .attributeCount = 9, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1752,7 +1766,7 @@ { \ /* Endpoint: 3, Cluster: Account Login (server) */ \ .clusterId = 0x0000050E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(275), \ + .attributes = ZAP_ATTRIBUTE_INDEX(277), \ .attributeCount = 1, \ .clusterSize = 2, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1763,7 +1777,7 @@ { \ /* Endpoint: 4, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(276), \ + .attributes = ZAP_ATTRIBUTE_INDEX(278), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1774,7 +1788,7 @@ { \ /* Endpoint: 4, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(281), \ + .attributes = ZAP_ATTRIBUTE_INDEX(283), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1785,7 +1799,7 @@ { \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(284), \ + .attributes = ZAP_ATTRIBUTE_INDEX(286), \ .attributeCount = 9, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1796,7 +1810,7 @@ { \ /* Endpoint: 5, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(293), \ + .attributes = ZAP_ATTRIBUTE_INDEX(295), \ .attributeCount = 5, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1807,7 +1821,7 @@ { \ /* Endpoint: 5, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(298), \ + .attributes = ZAP_ATTRIBUTE_INDEX(300), \ .attributeCount = 8, \ .clusterSize = 106, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -1826,8 +1840,8 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 26, 439 }, { 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 }, \ + { ZAP_CLUSTER_INDEX(0), 26, 439 }, { ZAP_CLUSTER_INDEX(26), 10, 82 }, { ZAP_CLUSTER_INDEX(36), 4, 37 }, \ + { ZAP_CLUSTER_INDEX(40), 5, 161 }, { ZAP_CLUSTER_INDEX(45), 3, 112 }, { ZAP_CLUSTER_INDEX(48), 2, 106 }, \ } // Largest attribute size is needed for various buffers @@ -1839,7 +1853,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (37) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (929) +#define ATTRIBUTE_MAX_SIZE (937) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (6)