From 188db3b9bdde38a4cc6a777f7735a6f7b2f0be6d Mon Sep 17 00:00:00 2001 From: Bharat Dandu Date: Fri, 4 Feb 2022 02:29:25 +0530 Subject: [PATCH] Regening after rebase Github#342 --- .../all-clusters-app.matter | 6 - .../light-switch-app.matter | 45 - .../lighting-common/lighting-app.matter | 18 - .../tv-casting-common/tv-casting-app.matter | 6 - .../zap-templates/templates/chip/helper.js | 232 +++-- .../zap-generated/endpoint_config.h | 308 ------ .../zap-generated/CHIPClientCallbacks.h | 24 - .../bridge-app/zap-generated/CHIPClusters.h | 54 - .../zap-generated/endpoint_config.h | 195 ---- .../zap-generated/endpoint_config.h | 111 -- .../zap-generated/endpoint_config.h | 136 --- .../zap-generated/CHIPClientCallbacks.h | 24 - .../zap-generated/CHIPClusters.h | 69 -- .../zap-generated/endpoint_config.h | 58 -- .../app1/zap-generated/endpoint_config.h | 86 -- .../app2/zap-generated/endpoint_config.h | 86 -- .../pump-app/zap-generated/endpoint_config.h | 114 --- .../zap-generated/endpoint_config.h | 100 -- .../zap-generated/endpoint_config.h | 127 --- .../tv-app/zap-generated/endpoint_config.h | 946 ------------------ .../zap-generated/endpoint_config.h | 234 ----- 21 files changed, 134 insertions(+), 2845 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 2ca8ac8e583939..7550b3de7bb6a2 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1664,7 +1664,6 @@ server cluster IasZone = 1280 { request struct ZoneEnrollResponseRequest { IasEnrollResponseCode enrollResponseCode = 0; INT8U zoneId = 1; -<<<<<<< HEAD } response struct ZoneEnrollRequest { @@ -1677,11 +1676,6 @@ server cluster IasZone = 1280 { BITMAP8 extendedStatus = 1; INT8U zoneId = 2; INT16U delay = 3; -<<<<<<< HEAD -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server -======= ->>>>>>> Fixing the response structs for commands in .matter generated files such that response struct should be defined for all incoming commands from server to client and outgoing commands from server to client } command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index d4fad0a079cb9f..8bd5b9fd9b5c3f 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -618,10 +618,6 @@ client cluster Groups = 4 { readonly attribute bitmap8 nameSupport = 0; readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server request struct AddGroupRequest { INT16U groupId = 0; @@ -644,17 +640,6 @@ client cluster Groups = 4 { request struct ViewGroupRequest { INT16U groupId = 0; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Restore the previous asBlocks behavior -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server -======= -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template command AddGroup(AddGroupRequest): AddGroupResponse = 0; command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; @@ -662,12 +647,6 @@ client cluster Groups = 4 { command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; -<<<<<<< HEAD ->>>>>>> Fixing the response structs for commands in .matter generated files such that response struct should be defined for all incoming commands from server to client and outgoing commands from server to client -======= ->>>>>>> Regening after rebasing master -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template } client cluster Identify = 3 { @@ -1170,10 +1149,6 @@ client cluster Scenes = 5 { readonly attribute bitmap8 nameSupport = 4; readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server request struct AddSceneRequest { INT16U groupId = 0; @@ -1211,10 +1186,6 @@ client cluster Scenes = 5 { INT16U groupId = 0; INT8U sceneId = 1; } -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Fixing the response structs for commands in .matter generated files such that response struct should be defined for all incoming commands from server to client and outgoing commands from server to client response struct AddSceneResponse { ENUM8 status = 0; @@ -1255,16 +1226,6 @@ client cluster Scenes = 5 { CHAR_STRING sceneName = 4; SceneExtensionFieldSet extensionFieldSets[] = 5; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Restore the previous asBlocks behavior -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server -======= -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template command AddScene(AddSceneRequest): AddSceneResponse = 0; command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; @@ -1273,12 +1234,6 @@ client cluster Scenes = 5 { command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; -<<<<<<< HEAD ->>>>>>> Fixing the response structs for commands in .matter generated files such that response struct should be defined for all incoming commands from server to client and outgoing commands from server to client -======= ->>>>>>> Regening after rebasing master -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index efd03c1c5485d3..45cb848d28cc47 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1105,10 +1105,6 @@ client cluster OnOff = 6 { attribute enum8 startUpOnOff = 16387; readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server request struct OffWithEffectRequest { OnOffEffectIdentifier effectId = 0; @@ -1120,12 +1116,6 @@ client cluster OnOff = 6 { int16u onTime = 1; int16u offWaitTime = 2; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template command Off(): DefaultSuccess = 0; command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; @@ -1133,14 +1123,6 @@ client cluster OnOff = 6 { command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; command Toggle(): DefaultSuccess = 2; -<<<<<<< HEAD ->>>>>>> - Reverting from zcl_command_arguments to chip_cluster_command_arguments_with_structs_expanded -======= ->>>>>>> Cleaning up asBlock and regening -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server -======= ->>>>>>> Cleaning up the remaining non determinism in MatterIDL template } server cluster OnOff = 6 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index a872ec484a1296..c274f43e36f11f 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1545,7 +1545,6 @@ server cluster IasZone = 1280 { request struct ZoneEnrollResponseRequest { IasEnrollResponseCode enrollResponseCode = 0; INT8U zoneId = 1; -<<<<<<< HEAD } response struct ZoneEnrollRequest { @@ -1558,11 +1557,6 @@ server cluster IasZone = 1280 { BITMAP8 extendedStatus = 1; INT8U zoneId = 2; INT16U delay = 3; -<<<<<<< HEAD -======= ->>>>>>> Fixing the request structs for commands in .matter generated files such that request struct should be defined for all incoming commands from client to server and outgoing commands from client to server -======= ->>>>>>> Fixing the response structs for commands in .matter generated files such that response struct should be defined for all incoming commands from server to client and outgoing commands from server to client } command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0; diff --git a/src/app/zap-templates/templates/chip/helper.js b/src/app/zap-templates/templates/chip/helper.js index e0ea6c90c3492a..4309bfc77c5258 100644 --- a/src/app/zap-templates/templates/chip/helper.js +++ b/src/app/zap-templates/templates/chip/helper.js @@ -16,16 +16,17 @@ */ // Import helpers from zap core -const zapPath = '../../../../../third_party/zap/repo/dist/src-electron/'; +const zapPath = '../../../../../third_party/zap/repo/dist/src-electron/'; const templateUtil = require(zapPath + 'generator/template-util.js'); -const zclHelper = require(zapPath + 'generator/helper-zcl.js'); +const zclHelper = require(zapPath + 'generator/helper-zcl.js'); const iteratorUtil = require(zapPath + 'util/iterator-util.js'); const { asBlocks, ensureClusters } = require('../../common/ClustersHelper.js'); -const StringHelper = require('../../common/StringHelper.js'); -const ChipTypesHelper = require('../../common/ChipTypesHelper.js'); +const StringHelper = require('../../common/StringHelper.js'); +const ChipTypesHelper = require('../../common/ChipTypesHelper.js'); -function throwErrorIfUndefined(item, errorMsg, conditions) { +function throwErrorIfUndefined(item, errorMsg, conditions) +{ conditions.forEach(condition => { if (condition == undefined) { console.log(item); @@ -35,57 +36,64 @@ function throwErrorIfUndefined(item, errorMsg, conditions) { }); } -function checkIsInsideClusterBlock(context, name) { +function checkIsInsideClusterBlock(context, name) +{ const clusterName = context.name ? context.name : context.clusterName; const clusterSide = context.side ? context.side : context.clusterSide; - const errorMsg = name + ': Not inside a ({#chip_server_clusters}} block.'; - throwErrorIfUndefined(context, errorMsg, [clusterName, clusterSide]); + const errorMsg = name + ': Not inside a ({#chip_server_clusters}} block.'; + throwErrorIfUndefined(context, errorMsg, [ clusterName, clusterSide ]); return { clusterName, clusterSide }; } -function checkIsInsideCommandBlock(context, name) { +function checkIsInsideCommandBlock(context, name) +{ const clusterName = context.clusterName; const clusterSide = context.clusterSide; - const commandId = context.id; - const errorMsg = name + ': Not inside a ({#chip_cluster_commands}} block.'; + const commandId = context.id; + const errorMsg = name + ': Not inside a ({#chip_cluster_commands}} block.'; - throwErrorIfUndefined(context, errorMsg, [commandId, clusterName, clusterSide]); + throwErrorIfUndefined(context, errorMsg, [ commandId, clusterName, clusterSide ]); return commandId; } -function checkIsInsideAttributeBlock(context, name) { - const code = context.code; +function checkIsInsideAttributeBlock(context, name) +{ + const code = context.code; const errorMsg = name + ': Not inside a ({#chip_server_attributes}} block.'; - throwErrorIfUndefined(context, errorMsg, [code]); + throwErrorIfUndefined(context, errorMsg, [ code ]); } -function checkIsChipType(context, name) { - const type = context.chipType; +function checkIsChipType(context, name) +{ + const type = context.chipType; const errorMsg = name + ': Could not find chipType'; - throwErrorIfUndefined(context, errorMsg, [type]); + throwErrorIfUndefined(context, errorMsg, [ type ]); return type; } -function getCommands(methodName) { +function getCommands(methodName) +{ const { clusterName, clusterSide } = checkIsInsideClusterBlock(this, methodName); return clusterSide == 'client' ? ensureClusters(this).getClientCommands(clusterName) - : ensureClusters(this).getServerCommands(clusterName); + : ensureClusters(this).getServerCommands(clusterName); } -function getAttributes(methodName) { +function getAttributes(methodName) +{ const { clusterName, clusterSide } = checkIsInsideClusterBlock(this, methodName); return ensureClusters(this).getAttributesByClusterName(clusterName); } -function getResponses(methodName) { +function getResponses(methodName) +{ const { clusterName, clusterSide } = checkIsInsideClusterBlock(this, methodName); return clusterSide == 'client' ? ensureClusters(this).getClientResponses(clusterName) - : ensureClusters(this).getServerResponses(clusterName); + : ensureClusters(this).getServerResponses(clusterName); } /** @@ -93,7 +101,8 @@ function getResponses(methodName) { * * @param {*} options */ -function chip_server_clusters(options) { +function chip_server_clusters(options) +{ return asBlocks.call(this, ensureClusters(this).getServerClusters(), options); } @@ -101,7 +110,8 @@ function chip_server_clusters(options) { * Check if there is any enabled server clusters * */ -function chip_has_server_clusters(options) { +function chip_has_server_clusters(options) +{ return ensureClusters(this).getServerClusters().then(clusters => !!clusters.length); } @@ -110,7 +120,8 @@ function chip_has_server_clusters(options) { * * @param {*} options */ -function chip_client_clusters(options) { +function chip_client_clusters(options) +{ return asBlocks.call(this, ensureClusters(this).getClientClusters(), options); } @@ -118,7 +129,8 @@ function chip_client_clusters(options) { * Check if there is any enabled client clusters * */ -function chip_has_client_clusters(options) { +function chip_has_client_clusters(options) +{ return ensureClusters(this).getClientClusters().then(clusters => !!clusters.length); } @@ -127,7 +139,8 @@ function chip_has_client_clusters(options) { * * @param {*} options */ -function chip_clusters(options) { +function chip_clusters(options) +{ return asBlocks.call(this, ensureClusters(this).getClusters(), options); } @@ -135,7 +148,8 @@ function chip_clusters(options) { * Check if there is any enabled clusters * */ -function chip_has_clusters(options) { +function chip_has_clusters(options) +{ return ensureClusters(this).getClusters().then(clusters => !!clusters.length); } @@ -144,28 +158,33 @@ function chip_has_clusters(options) { * * @param {*} options */ -function chip_server_global_responses(options) { +function chip_server_global_responses(options) +{ return asBlocks.call(this, getServerGlobalAttributeResponses(this), options); } -async function if_in_global_responses(options) { - const attribute = this.response.arguments[0]; - const globalResponses = await getServerGlobalAttributeResponses(this); +async function if_in_global_responses(options) +{ + const attribute = this.response.arguments[0]; + const globalResponses = await getServerGlobalAttributeResponses(this); const responseTypeExists = globalResponses.find( - // Some fields of item/attribute here may be undefined. - item => item.isArray == attribute.isArray && item.isStruct == attribute.isStruct && item.chipType == attribute.chipType - && item.isNullable == attribute.isNullable && item.isOptional == attribute.isOptional) + // Some fields of item/attribute here may be undefined. + item => item.isArray == attribute.isArray && item.isStruct == attribute.isStruct && item.chipType == attribute.chipType + && item.isNullable == attribute.isNullable && item.isOptional == attribute.isOptional) - if (responseTypeExists) { + if (responseTypeExists) + { return options.fn(this); } - else { + else + { return options.inverse(this); } } -function getServerGlobalAttributeResponses(context) { - const sorter = (a, b) => a.chipCallback.name.localeCompare(b.chipCallback.name, 'en', { numeric: true }); +function getServerGlobalAttributeResponses(context) +{ + const sorter = (a, b) => a.chipCallback.name.localeCompare(b.chipCallback.name, 'en', { numeric : true }); const reducer = (unique, item) => { const { type, size, isArray, isOptional, isNullable, chipCallback, chipType } = item.response.arguments[0]; @@ -179,7 +198,7 @@ function getServerGlobalAttributeResponses(context) { return unique; } - return [...unique, { chipCallback, chipType, size, isOptional, isNullable }]; + return [...unique, { chipCallback, chipType, size, isOptional, isNullable } ]; }; const filter = attributes => attributes.reduce(reducer, []).sort(sorter); @@ -194,7 +213,8 @@ function getServerGlobalAttributeResponses(context) { * * @param {*} options */ -function chip_cluster_commands(options) { +function chip_cluster_commands(options) +{ const commands = getCommands.call(this, 'chip_cluster_commands'); return asBlocks.call(this, commands, options); @@ -208,7 +228,8 @@ function chip_cluster_commands(options) { * * @param {*} options */ -function chip_cluster_responses(options) { +function chip_cluster_responses(options) +{ const responses = getResponses.call(this, 'chip_cluster_responses'); return asBlocks.call(this, responses, options); @@ -222,9 +243,10 @@ function chip_cluster_responses(options) { * * @param {*} options */ -function chip_cluster_command_arguments(options) { +function chip_cluster_command_arguments(options) +{ const commandId = checkIsInsideCommandBlock(this, 'chip_cluster_command_arguments'); - const commands = getCommands.call(this.parent, 'chip_cluster_commands_argments'); + const commands = getCommands.call(this.parent, 'chip_cluster_commands_argments'); const filter = command => command.id == commandId; return asBlocks.call(this, commands.then(items => items.find(filter).arguments), options); @@ -249,9 +271,10 @@ function chip_cluster_command_arguments(options) { * * @param {*} options */ -function chip_cluster_command_arguments_with_structs_expanded(options) { +function chip_cluster_command_arguments_with_structs_expanded(options) +{ const commandId = checkIsInsideCommandBlock(this, 'chip_cluster_command_arguments'); - const commands = getCommands.call(this.parent, 'chip_cluster_command_arguments_with_structs_expanded'); + const commands = getCommands.call(this.parent, 'chip_cluster_command_arguments_with_structs_expanded'); const filter = command => command.id == commandId; return asBlocks.call(this, commands.then(items => { @@ -261,7 +284,7 @@ function chip_cluster_command_arguments_with_structs_expanded(options) { } return item.expandedArguments || item.arguments; }), - options); + options); } /** @@ -272,7 +295,8 @@ function chip_cluster_command_arguments_with_structs_expanded(options) { * * @param {*} options */ -function chip_cluster_response_arguments(options) { +function chip_cluster_response_arguments(options) +{ const commandId = checkIsInsideCommandBlock(this, 'chip_cluster_response_arguments'); const responses = getResponses.call(this.parent, 'chip_cluster_responses_argments'); @@ -288,9 +312,10 @@ function chip_cluster_response_arguments(options) { * * @param {*} options */ -function chip_server_has_list_attributes(options) { +function chip_server_has_list_attributes(options) +{ const { clusterName } = checkIsInsideClusterBlock(this, 'chip_server_has_list_attributes'); - const attributes = ensureClusters(this).getServerAttributes(clusterName); + const attributes = ensureClusters(this).getServerAttributes(clusterName); const filter = attribute => attribute.isArray; return attributes.then(items => items.find(filter)); @@ -304,9 +329,10 @@ function chip_server_has_list_attributes(options) { * * @param {*} options */ -function chip_client_has_list_attributes(options) { +function chip_client_has_list_attributes(options) +{ const { clusterName } = checkIsInsideClusterBlock(this, 'chip_client_has_list_attributes'); - const attributes = ensureClusters(this).getClientAttributes(clusterName); + const attributes = ensureClusters(this).getClientAttributes(clusterName); const filter = attribute => attribute.isArray; return attributes.then(items => items.find(filter)); @@ -320,9 +346,10 @@ function chip_client_has_list_attributes(options) { * * @param {*} options */ -function chip_server_has_reportable_attributes(options) { +function chip_server_has_reportable_attributes(options) +{ const { clusterName } = checkIsInsideClusterBlock(this, 'chip_server_has_reportable_attributes'); - const attributes = ensureClusters(this).getServerAttributes(clusterName); + const attributes = ensureClusters(this).getServerAttributes(clusterName); const filter = attribute => attribute.isReportableAttribute; return attributes.then(items => items.find(filter)); @@ -337,9 +364,10 @@ function chip_server_has_reportable_attributes(options) { * * @param {*} options */ -function chip_server_cluster_attributes(options) { +function chip_server_cluster_attributes(options) +{ const { clusterName } = checkIsInsideClusterBlock(this, 'chip_server_cluster_attributes'); - const attributes = ensureClusters(this).getServerAttributes(clusterName); + const attributes = ensureClusters(this).getServerAttributes(clusterName); return asBlocks.call(this, attributes, options); } @@ -353,14 +381,16 @@ function chip_server_cluster_attributes(options) { * * @param {*} options */ -function chip_server_cluster_events(options) { +function chip_server_cluster_events(options) +{ const { clusterName } = checkIsInsideClusterBlock(this, 'chip_server_cluster_events'); - const events = ensureClusters(this).getServerEvents(clusterName); + const events = ensureClusters(this).getServerEvents(clusterName); return asBlocks.call(this, events, options); } -function chip_attribute_list_entryTypes(options) { +function chip_attribute_list_entryTypes(options) +{ checkIsInsideAttributeBlock(this, 'chip_attribute_list_entry_types'); return templateUtil.collectBlocks(this.items, options, this); } @@ -372,23 +402,25 @@ function chip_attribute_list_entryTypes(options) { * 1) Are not manufacturer-specific (to exclude MfgSpecificPing) * 2) Are available in the isCommandAvailable sense. */ -function chip_available_cluster_commands(options) { +function chip_available_cluster_commands(options) +{ const { clusterName, clusterSide } = checkIsInsideClusterBlock(this, 'chip_available_cluster_commands'); - let promise = iteratorUtil.all_user_cluster_commands_helper.call(this, options) - .then(endpointCommands => endpointCommands.filter(command => { - return command.clusterName == clusterName - && zclHelper.isCommandAvailable( - clusterSide, command.incoming, command.outgoing, command.commandSource, command.name) - && /* exclude MfgSpecificPing */ !command.mfgCode; - })) - .then(filteredCommands => templateUtil.collectBlocks(filteredCommands, options, this)); + let promise = iteratorUtil.all_user_cluster_commands_helper.call(this, options) + .then(endpointCommands => endpointCommands.filter(command => { + return command.clusterName == clusterName + && zclHelper.isCommandAvailable( + clusterSide, command.incoming, command.outgoing, command.commandSource, command.name) + && /* exclude MfgSpecificPing */ !command.mfgCode; + })) + .then(filteredCommands => templateUtil.collectBlocks(filteredCommands, options, this)); return promise; } /** * Creates block iterator over structures belonging to the current cluster */ -async function chip_cluster_specific_structs(options) { +async function chip_cluster_specific_structs(options) +{ const { clusterName, clusterSide } = checkIsInsideClusterBlock(this, 'chip_cluster_specific_structs'); const structs = await ensureClusters(this).getStructuresByClusterName(clusterName); @@ -399,17 +431,20 @@ async function chip_cluster_specific_structs(options) { /** * Creates block iterator over structures that are shared between clusters */ -async function chip_shared_structs(options) { +async function chip_shared_structs(options) +{ const structs = await ensureClusters(this).getSharedStructs(); return templateUtil.collectBlocks(structs, options, this); } -async function chip_endpoints(options) { +async function chip_endpoints(options) +{ const endpoints = await ensureClusters(this).getEndPoints(); return templateUtil.collectBlocks(endpoints, options, this); } -async function chip_endpoint_clusters(options) { +async function chip_endpoint_clusters(options) +{ const clusters = this.clusters; return templateUtil.collectBlocks(clusters, options, this); } @@ -418,12 +453,13 @@ async function chip_endpoint_clusters(options) { * Checks whether a type is an enum for purposes of its chipType. That includes * both spec-defined enum types and types that we map to enum types in our code. */ -async function if_chip_enum(type, options) { +async function if_chip_enum(type, options) +{ if (type.toLowerCase() == 'vendor_id') { return options.fn(this); } - let pkgId = await templateUtil.ensureZclPackageId(this); + let pkgId = await templateUtil.ensureZclPackageId(this); let checkResult = await zclHelper.isEnum(this.global.db, type, pkgId); let result; if (checkResult != 'unknown') { @@ -437,27 +473,27 @@ async function if_chip_enum(type, options) { // // Module exports // -exports.chip_clusters = chip_clusters; -exports.chip_has_clusters = chip_has_clusters; -exports.chip_client_clusters = chip_client_clusters; -exports.chip_has_client_clusters = chip_has_client_clusters; -exports.chip_server_clusters = chip_server_clusters; -exports.chip_has_server_clusters = chip_has_server_clusters; -exports.chip_cluster_commands = chip_cluster_commands; -exports.chip_cluster_command_arguments = chip_cluster_command_arguments; +exports.chip_clusters = chip_clusters; +exports.chip_has_clusters = chip_has_clusters; +exports.chip_client_clusters = chip_client_clusters; +exports.chip_has_client_clusters = chip_has_client_clusters; +exports.chip_server_clusters = chip_server_clusters; +exports.chip_has_server_clusters = chip_has_server_clusters; +exports.chip_cluster_commands = chip_cluster_commands; +exports.chip_cluster_command_arguments = chip_cluster_command_arguments; exports.chip_cluster_command_arguments_with_structs_expanded = chip_cluster_command_arguments_with_structs_expanded; -exports.chip_server_global_responses = chip_server_global_responses; -exports.chip_cluster_responses = chip_cluster_responses; -exports.chip_cluster_response_arguments = chip_cluster_response_arguments -exports.chip_attribute_list_entryTypes = chip_attribute_list_entryTypes; -exports.chip_server_cluster_attributes = chip_server_cluster_attributes; -exports.chip_server_cluster_events = chip_server_cluster_events; -exports.chip_server_has_list_attributes = chip_server_has_list_attributes; -exports.chip_server_has_reportable_attributes = chip_server_has_reportable_attributes; -exports.chip_available_cluster_commands = chip_available_cluster_commands; -exports.chip_endpoints = chip_endpoints; -exports.chip_endpoint_clusters = chip_endpoint_clusters; -exports.if_chip_enum = if_chip_enum; -exports.if_in_global_responses = if_in_global_responses; -exports.chip_cluster_specific_structs = chip_cluster_specific_structs; -exports.chip_shared_structs = chip_shared_structs; +exports.chip_server_global_responses = chip_server_global_responses; +exports.chip_cluster_responses = chip_cluster_responses; +exports.chip_cluster_response_arguments = chip_cluster_response_arguments +exports.chip_attribute_list_entryTypes = chip_attribute_list_entryTypes; +exports.chip_server_cluster_attributes = chip_server_cluster_attributes; +exports.chip_server_cluster_events = chip_server_cluster_events; +exports.chip_server_has_list_attributes = chip_server_has_list_attributes; +exports.chip_server_has_reportable_attributes = chip_server_has_reportable_attributes; +exports.chip_available_cluster_commands = chip_available_cluster_commands; +exports.chip_endpoints = chip_endpoints; +exports.chip_endpoint_clusters = chip_endpoint_clusters; +exports.if_chip_enum = if_chip_enum; +exports.if_in_global_responses = if_in_global_responses; +exports.chip_cluster_specific_structs = chip_cluster_specific_structs; +exports.chip_shared_structs = chip_shared_structs; diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 2b7bd795675d78..d5d6623c595a1d 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -2859,7 +2859,6 @@ #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask #define GENERATED_CLUSTER_COUNT 76 -<<<<<<< HEAD // clang-format off #define GENERATED_CLUSTERS { \ @@ -3702,305 +3701,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTERS \ - { \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(0), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 0, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(3), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 0, Cluster: Groups (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(5), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0x0000001F, ZAP_ATTRIBUTE_INDEX(11), 3, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Access Control (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(14), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(34), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - { \ - 0x0000002A, ZAP_ATTRIBUTE_INDEX(34), 5, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(39), \ - 3, \ - 292, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(42), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(46), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x0000002E, ZAP_ATTRIBUTE_INDEX(49), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Power Source Configuration (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(51), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(57), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(67), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(67), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(76), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(82), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(147), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(162), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(173), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(177), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x0000003F, ZAP_ATTRIBUTE_INDEX(184), 5, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(189), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(191), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(193), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(197), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(200), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000005, \ - ZAP_ATTRIBUTE_INDEX(202), \ - 6, \ - 8, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(208), \ - 7, \ - 13, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { \ - 0x00000007, ZAP_ATTRIBUTE_INDEX(215), 3, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: On/off Switch Configuration (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(218), \ - 16, \ - 27, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { \ - 0x0000000F, ZAP_ATTRIBUTE_INDEX(234), 4, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(238), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(243), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binding (server) */ \ - { \ - 0x00000025, ZAP_ATTRIBUTE_INDEX(244), 4, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Bridged Actions (server) */ \ - { \ - 0x0000002F, ZAP_ATTRIBUTE_INDEX(248), 11, 88, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Power Source (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(259), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000039, ZAP_ATTRIBUTE_INDEX(269), 16, 679, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Bridged Device Basic (server) */ \ - { \ - 0x0000003B, ZAP_ATTRIBUTE_INDEX(285), 5, 9, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Switch (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(290), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(292), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: User Label (server) */ \ - { \ - 0x00000045, ZAP_ATTRIBUTE_INDEX(294), 2, 3, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Boolean State (server) */ \ - { \ - 0x00000050, ZAP_ATTRIBUTE_INDEX(296), 6, 38, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Mode Select (server) */ \ - { 0x00000101, \ - ZAP_ATTRIBUTE_INDEX(302), \ - 32, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | \ - ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ - { \ - 0x00000102, ZAP_ATTRIBUTE_INDEX(334), 20, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ - { \ - 0x00000103, ZAP_ATTRIBUTE_INDEX(354), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ - { \ - 0x00000200, \ - ZAP_ATTRIBUTE_INDEX(359), \ - 26, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayPumpConfigurationAndControlServer \ - }, /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ - { 0x00000201, \ - ZAP_ATTRIBUTE_INDEX(385), \ - 19, \ - 34, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThermostatServer }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { \ - 0x00000204, \ - ZAP_ATTRIBUTE_INDEX(404), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayThermostatUserInterfaceConfigurationServer \ - }, /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - { 0x00000300, \ - ZAP_ATTRIBUTE_INDEX(408), \ - 53, \ - 341, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ - { \ - 0x00000400, ZAP_ATTRIBUTE_INDEX(461), 6, 11, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(467), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(472), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(476), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(481), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ - { 0x00000406, \ - ZAP_ATTRIBUTE_INDEX(486), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOccupancySensingServer }, /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { 0x00000500, \ - ZAP_ATTRIBUTE_INDEX(490), \ - 6, \ - 16, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ - ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ - chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ - { \ - 0x00000503, ZAP_ATTRIBUTE_INDEX(496), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ - { \ - 0x00000504, ZAP_ATTRIBUTE_INDEX(498), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Channel (server) */ \ - { \ - 0x00000505, ZAP_ATTRIBUTE_INDEX(500), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ - { \ - 0x00000506, ZAP_ATTRIBUTE_INDEX(503), 7, 39, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Media Playback (server) */ \ - { \ - 0x00000507, ZAP_ATTRIBUTE_INDEX(510), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Media Input (server) */ \ - { \ - 0x00000508, ZAP_ATTRIBUTE_INDEX(513), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Low Power (server) */ \ - { \ - 0x00000509, ZAP_ATTRIBUTE_INDEX(514), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(515), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ - { \ - 0x0000050B, ZAP_ATTRIBUTE_INDEX(518), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Audio Output (server) */ \ - { \ - 0x0000050C, ZAP_ATTRIBUTE_INDEX(521), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(523), 8, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ - { \ - 0x0000050E, ZAP_ATTRIBUTE_INDEX(531), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Account Login (server) */ \ - { \ - 0x0000050F, ZAP_ATTRIBUTE_INDEX(532), 81, 3285, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ - { \ - 0x00000B04, ZAP_ATTRIBUTE_INDEX(613), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(625), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 2, Cluster: Groups (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(627), \ - 7, \ - 13, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(634), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ - { 0x00000406, \ - ZAP_ATTRIBUTE_INDEX(639), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOccupancySensingServer }, /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -4009,11 +3709,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 26, 864 }, { ZAP_CLUSTER_INDEX(26), 46, 6876 }, { ZAP_CLUSTER_INDEX(72), 4, 21 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 26, 1118 }, { ZAP_CLUSTER_INDEX(26), 46, 6876 }, { ZAP_CLUSTER_INDEX(72), 4, 21 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -4023,11 +3719,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (718) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (7761) -======= -#define ATTRIBUTE_MAX_SIZE (8015) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3) diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h index b1c1ea5688ba93..8c6de4343606e1 100644 --- a/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h @@ -16,9 +16,7 @@ */ // THIS FILE IS GENERATED BY ZAP -<<<<<<< HEAD -<<<<<<< HEAD #pragma once #include @@ -49,25 +47,3 @@ void AccessControlClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * chip::Callback::Cancelable * onFailureCallback); typedef void (*AccessControlAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -======= -#include "CHIPClusters.h" - -#include -#include - -namespace chip { - -using namespace app::Clusters; -using namespace System; -using namespace Encoding::LittleEndian; - -namespace Controller { - -// TODO(#4502): onCompletion is not used by IM for now. -// TODO(#4503): length should be passed to commands when byte string is in argument list. -// TODO(#4503): Commands should take group id as an argument. -} // namespace Controller -} // namespace chip ->>>>>>> - Adding changes to the zap templates such that the incoming and outgoing commands are generated with determinism. Using the upto date helpers in the *.zapt templates -======= ->>>>>>> - Cleaning the templates further such that we have lesser diff to what we generated before diff --git a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h index b3dbe7a575a469..9f5073338704b1 100644 --- a/zzz_generated/bridge-app/zap-generated/CHIPClusters.h +++ b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP -<<<<<<< HEAD // Prevent multiple inclusion #pragma once @@ -31,65 +30,12 @@ namespace chip { namespace Controller { -<<<<<<< HEAD -<<<<<<< HEAD class DLL_EXPORT AccessControlCluster : public ClusterBase { public: AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {} ~AccessControlCluster() {} -======= -class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase -{ -public: - GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {} - ~GeneralCommissioningCluster() {} - - // Cluster Commands - CHIP_ERROR ArmFailSafeResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); - CHIP_ERROR CommissioningCompleteResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); - CHIP_ERROR SetRegulatoryConfigResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); -}; - -class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase -{ -public: - NetworkCommissioningCluster() : ClusterBase(app::Clusters::NetworkCommissioning::Id) {} - ~NetworkCommissioningCluster() {} - - // Cluster Commands - CHIP_ERROR ConnectNetworkResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText, int32_t errorValue); - CHIP_ERROR NetworkConfigResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText); - CHIP_ERROR ScanNetworksResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText); -}; - -class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase -{ -public: - OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {} - ~OperationalCredentialsCluster() {} - - // Cluster Commands - CHIP_ERROR AttestationResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan attestationElements, chip::ByteSpan signature); - CHIP_ERROR CertificateChainResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan certificate); - CHIP_ERROR NOCResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t statusCode, - uint8_t fabricIndex, chip::CharSpan debugText); - CHIP_ERROR OpCSRResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan NOCSRElements, chip::ByteSpan attestationSignature); ->>>>>>> - Adding changes to the zap templates such that the incoming and outgoing commands are generated with determinism. Using the upto date helpers in the *.zapt templates }; -======= ->>>>>>> - Generation for outgoing commands which originate from the client side only. } // namespace Controller } // namespace chip -======= ->>>>>>> - Cleaning the templates further such that we have lesser diff to what we generated before diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h index 7273fdfe9131fe..847e5cd746ceb7 100644 --- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h @@ -78,7 +78,6 @@ #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask #define GENERATED_CLUSTER_COUNT 63 -<<<<<<< HEAD // clang-format off #define GENERATED_CLUSTERS { \ @@ -778,200 +777,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x00000003, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Identify (client) */ \ - { \ - 0x00000004, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Groups (client) */ \ - { \ - 0x00000005, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Scenes (client) */ \ - { \ - 0x00000006, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: On/Off (client) */ \ - { \ - 0x00000007, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: On/off Switch Configuration (client) */ \ - { \ - 0x00000008, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Level Control (client) */ \ - { \ - 0x0000000F, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Binary Input (Basic) (client) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (client) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Binding (client) */ \ - { \ - 0x0000001F, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Access Control (client) */ \ - { \ - 0x00000025, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Bridged Actions (client) */ \ - { \ - 0x00000028, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Basic (client) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: OTA Software Update Provider (client) */ \ - { \ - 0x0000002A, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: OTA Software Update Requestor (client) */ \ - { \ - 0x0000002B, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Localization Configuration (client) */ \ - { \ - 0x0000002C, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Time Format Localization (client) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Unit Localization (client) */ \ - { \ - 0x0000002E, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Power Source Configuration (client) */ \ - { \ - 0x0000002F, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Power Source (client) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: General Commissioning (client) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Network Commissioning (client) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Diagnostic Logs (client) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: General Diagnostics (client) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Software Diagnostics (client) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Thread Network Diagnostics (client) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: WiFi Network Diagnostics (client) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Ethernet Network Diagnostics (client) */ \ - { \ - 0x00000039, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Bridged Device Basic (client) */ \ - { \ - 0x0000003B, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Switch (client) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: AdministratorCommissioning (client) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Operational Credentials (client) */ \ - { \ - 0x0000003F, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Group Key Management (client) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Fixed Label (client) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: User Label (client) */ \ - { \ - 0x00000045, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Boolean State (client) */ \ - { \ - 0x00000050, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Mode Select (client) */ \ - { \ - 0x00000101, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Door Lock (client) */ \ - { \ - 0x00000102, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Window Covering (client) */ \ - { \ - 0x00000103, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Barrier Control (client) */ \ - { \ - 0x00000200, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \ - { \ - 0x00000201, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Thermostat (client) */ \ - { \ - 0x00000204, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (client) */ \ - { \ - 0x00000300, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Color Control (client) */ \ - { \ - 0x00000400, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Illuminance Measurement (client) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (client) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (client) */ \ - { \ - 0x00000406, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Occupancy Sensing (client) */ \ - { \ - 0x00000503, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Wake on LAN (client) */ \ - { \ - 0x00000504, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Channel (client) */ \ - { \ - 0x00000505, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Target Navigator (client) */ \ - { \ - 0x00000506, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Media Playback (client) */ \ - { \ - 0x00000507, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Media Input (client) */ \ - { \ - 0x00000508, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Low Power (client) */ \ - { \ - 0x00000509, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Keypad Input (client) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Content Launcher (client) */ \ - { \ - 0x0000050B, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Audio Output (client) */ \ - { \ - 0x0000050C, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Application Launcher (client) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Application Basic (client) */ \ - { \ - 0x0000050E, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Account Login (client) */ \ - { \ - 0x0000050F, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Test Cluster (client) */ \ - { \ - 0x00000B04, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index 42a2b1b3e01ad7..7c54cd66b979ac 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -510,11 +510,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 185 -======= -#define GENERATED_ATTRIBUTE_COUNT 181 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -894,7 +890,6 @@ #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask #define GENERATED_CLUSTER_COUNT 28 -<<<<<<< HEAD // clang-format off #define GENERATED_CLUSTERS { \ @@ -1209,104 +1204,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0x0000001F, ZAP_ATTRIBUTE_INDEX(6), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Access Control (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(6), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(26), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - { \ - 0x0000002A, ZAP_ATTRIBUTE_INDEX(26), 5, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(31), \ - 2, \ - 36, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(33), 6, 16, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(39), 10, 48, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(49), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(49), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(58), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(64), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(129), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(144), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003B, ZAP_ATTRIBUTE_INDEX(155), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Switch (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(155), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(159), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(166), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(168), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000003, ZAP_ATTRIBUTE_INDEX(170), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Identify (client) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(170), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { \ - 0x00000004, ZAP_ATTRIBUTE_INDEX(174), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Groups (client) */ \ - { \ - 0x00000005, ZAP_ATTRIBUTE_INDEX(174), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Scenes (client) */ \ - { \ - 0x00000006, ZAP_ATTRIBUTE_INDEX(174), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: On/Off (client) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(174), 6, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(180), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binding (server) */ \ - { \ - 0x00000300, ZAP_ATTRIBUTE_INDEX(181), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Color Control (client) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -1315,11 +1212,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 20, 567 }, { ZAP_CLUSTER_INDEX(20), 8, 7 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 20, 565 }, { ZAP_CLUSTER_INDEX(20), 8, 7 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -1329,11 +1222,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (574) -======= -#define ATTRIBUTE_MAX_SIZE (572) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index f82c495a673763..8e3c198726d804 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -558,11 +558,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 242 -======= -#define GENERATED_ATTRIBUTE_COUNT 238 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -1108,7 +1104,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 30 // clang-format off @@ -1446,129 +1441,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 29 -#define GENERATED_CLUSTERS \ - { \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(0), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 0, Cluster: Groups (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(2), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(7), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(27), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - { \ - 0x0000002A, ZAP_ATTRIBUTE_INDEX(27), 5, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(32), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(35), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(39), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(45), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(55), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(55), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(64), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(70), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(135), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(150), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003B, ZAP_ATTRIBUTE_INDEX(161), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Switch (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(161), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(165), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(172), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(174), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(176), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(179), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(181), \ - 7, \ - 13, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(188), \ - 16, \ - 27, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(204), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { 0x00000300, \ - ZAP_ATTRIBUTE_INDEX(209), \ - 22, \ - 36, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ - { 0x00000406, \ - ZAP_ATTRIBUTE_INDEX(231), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOccupancySensingServer }, /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { \ - 0x00000006, ZAP_ATTRIBUTE_INDEX(235), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 2, Cluster: On/Off (client) */ \ - { \ - 0x00000007, ZAP_ATTRIBUTE_INDEX(235), 3, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 2, Cluster: On/off Switch Configuration (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -1577,11 +1449,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 21, 586 }, { ZAP_CLUSTER_INDEX(21), 7, 89 }, { ZAP_CLUSTER_INDEX(28), 2, 4 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 20, 838 }, { ZAP_CLUSTER_INDEX(20), 7, 89 }, { ZAP_CLUSTER_INDEX(27), 2, 4 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -1591,11 +1459,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (679) -======= -#define ATTRIBUTE_MAX_SIZE (931) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3) diff --git a/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h index b1c1ea5688ba93..8c6de4343606e1 100644 --- a/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h @@ -16,9 +16,7 @@ */ // THIS FILE IS GENERATED BY ZAP -<<<<<<< HEAD -<<<<<<< HEAD #pragma once #include @@ -49,25 +47,3 @@ void AccessControlClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * chip::Callback::Cancelable * onFailureCallback); typedef void (*AccessControlAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -======= -#include "CHIPClusters.h" - -#include -#include - -namespace chip { - -using namespace app::Clusters; -using namespace System; -using namespace Encoding::LittleEndian; - -namespace Controller { - -// TODO(#4502): onCompletion is not used by IM for now. -// TODO(#4503): length should be passed to commands when byte string is in argument list. -// TODO(#4503): Commands should take group id as an argument. -} // namespace Controller -} // namespace chip ->>>>>>> - Adding changes to the zap templates such that the incoming and outgoing commands are generated with determinism. Using the upto date helpers in the *.zapt templates -======= ->>>>>>> - Cleaning the templates further such that we have lesser diff to what we generated before diff --git a/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h b/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h index 66ab62d1cdc755..9f5073338704b1 100644 --- a/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h +++ b/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP -<<<<<<< HEAD // Prevent multiple inclusion #pragma once @@ -31,80 +30,12 @@ namespace chip { namespace Controller { -<<<<<<< HEAD -<<<<<<< HEAD class DLL_EXPORT AccessControlCluster : public ClusterBase { public: AccessControlCluster() : ClusterBase(app::Clusters::AccessControl::Id) {} ~AccessControlCluster() {} -======= -class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase -{ -public: - GeneralCommissioningCluster() : ClusterBase(app::Clusters::GeneralCommissioning::Id) {} - ~GeneralCommissioningCluster() {} - - // Cluster Commands - CHIP_ERROR ArmFailSafeResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); - CHIP_ERROR CommissioningCompleteResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); - CHIP_ERROR SetRegulatoryConfigResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t errorCode, chip::CharSpan debugText); -}; - -class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase -{ -public: - NetworkCommissioningCluster() : ClusterBase(app::Clusters::NetworkCommissioning::Id) {} - ~NetworkCommissioningCluster() {} - - // Cluster Commands - CHIP_ERROR ConnectNetworkResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText, int32_t errorValue); - CHIP_ERROR NetworkConfigResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText); - CHIP_ERROR ScanNetworksResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t networkingStatus, chip::CharSpan debugText); -}; - -class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase -{ -public: - OtaSoftwareUpdateProviderCluster() : ClusterBase(app::Clusters::OtaSoftwareUpdateProvider::Id) {} - ~OtaSoftwareUpdateProviderCluster() {} - - // Cluster Commands - CHIP_ERROR ApplyUpdateResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t action, uint32_t delayedActionTime); - CHIP_ERROR QueryImageResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t status, uint32_t delayedActionTime, chip::CharSpan imageURI, uint32_t softwareVersion, - chip::CharSpan softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded, - chip::ByteSpan metadataForRequestor); -}; - -class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase -{ -public: - OperationalCredentialsCluster() : ClusterBase(app::Clusters::OperationalCredentials::Id) {} - ~OperationalCredentialsCluster() {} - - // Cluster Commands - CHIP_ERROR AttestationResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan attestationElements, chip::ByteSpan signature); - CHIP_ERROR CertificateChainResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan certificate); - CHIP_ERROR NOCResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t statusCode, - uint8_t fabricIndex, chip::CharSpan debugText); - CHIP_ERROR OpCSRResponse(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan NOCSRElements, chip::ByteSpan attestationSignature); ->>>>>>> - Adding changes to the zap templates such that the incoming and outgoing commands are generated with determinism. Using the upto date helpers in the *.zapt templates }; -======= ->>>>>>> - Generation for outgoing commands which originate from the client side only. } // namespace Controller } // namespace chip -======= ->>>>>>> - Cleaning the templates further such that we have lesser diff to what we generated before diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index 22c29f63becfab..bf9f2977a9344c 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -116,11 +116,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 63 -======= -#define GENERATED_ATTRIBUTE_COUNT 59 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -311,7 +307,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 11 // clang-format off @@ -440,51 +435,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 10 -#define GENERATED_CLUSTERS \ - { \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(0), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(20), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ - { \ - 0x0000002A, ZAP_ATTRIBUTE_INDEX(20), 5, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(25), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(28), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(32), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(38), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(48), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(55), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(57), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -493,11 +443,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 11, 172 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 10, 424 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -507,11 +453,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (172) -======= -#define ATTRIBUTE_MAX_SIZE (424) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (1) diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index c834df8bcaa5bb..dc5f79cc56f017 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -455,7 +455,6 @@ #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask #define GENERATED_CLUSTER_COUNT 16 -<<<<<<< HEAD // clang-format off #define GENERATED_CLUSTERS { \ @@ -638,83 +637,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(5), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(25), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (client) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(25), 3, 264, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(28), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(38), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (client) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(38), 6, 324, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(44), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Temperature Measurement (client) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(44), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Temperature Measurement (server) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(48), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(51), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000005, \ - ZAP_ATTRIBUTE_INDEX(53), \ - 6, \ - 8, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(59), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(61), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(63), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 1, Cluster: Basic (server) */ \ - { 0x00000300, \ - ZAP_ATTRIBUTE_INDEX(83), \ - 6, \ - 11, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -723,11 +645,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 9, 441 }, { ZAP_CLUSTER_INDEX(9), 7, 72 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 9, 695 }, { ZAP_CLUSTER_INDEX(9), 7, 72 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -737,11 +655,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (78) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (513) -======= -#define ATTRIBUTE_MAX_SIZE (767) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index c834df8bcaa5bb..dc5f79cc56f017 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -455,7 +455,6 @@ #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask #define GENERATED_CLUSTER_COUNT 16 -<<<<<<< HEAD // clang-format off #define GENERATED_CLUSTERS { \ @@ -638,83 +637,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(5), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(25), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (client) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(25), 3, 264, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(28), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(38), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (client) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(38), 6, 324, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(44), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Temperature Measurement (client) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(44), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Temperature Measurement (server) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(48), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(51), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000005, \ - ZAP_ATTRIBUTE_INDEX(53), \ - 6, \ - 8, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(59), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(61), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(63), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 1, Cluster: Basic (server) */ \ - { 0x00000300, \ - ZAP_ATTRIBUTE_INDEX(83), \ - 6, \ - 11, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -723,11 +645,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 9, 441 }, { ZAP_CLUSTER_INDEX(9), 7, 72 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 9, 695 }, { ZAP_CLUSTER_INDEX(9), 7, 72 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -737,11 +655,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (78) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (513) -======= -#define ATTRIBUTE_MAX_SIZE (767) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index 1b88f40e89982a..ad26e0ff3ce9b2 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -464,11 +464,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 197 -======= -#define GENERATED_ATTRIBUTE_COUNT 193 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -863,7 +859,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 26 // clang-format off @@ -1157,107 +1152,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 25 -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(5), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(25), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(28), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(32), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(35), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(41), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(51), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(51), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(60), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(66), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(131), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(135), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(142), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(144), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(146), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(148), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(150), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x00000200, \ - ZAP_ATTRIBUTE_INDEX(155), \ - 26, \ - 54, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayPumpConfigurationAndControlServer \ - }, /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(181), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(181), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(185), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(185), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(189), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (client) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(189), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -1266,11 +1160,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 16, 470 }, { ZAP_CLUSTER_INDEX(16), 10, 84 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 15, 722 }, { ZAP_CLUSTER_INDEX(15), 10, 84 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -1280,11 +1170,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (554) -======= -#define ATTRIBUTE_MAX_SIZE (806) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index 3d8b8f0ab2e8bd..a8ca403ba6495d 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -536,11 +536,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 181 -======= -#define GENERATED_ATTRIBUTE_COUNT 177 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -884,7 +880,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 25 // clang-format off @@ -1167,93 +1162,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 24 -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x00000008, ZAP_ATTRIBUTE_INDEX(0), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Level Control (client) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(5), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(25), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(28), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(32), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(35), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(41), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(51), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(51), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(60), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(66), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(131), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(146), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(157), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(161), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(168), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(170), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000006, ZAP_ATTRIBUTE_INDEX(172), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: On/Off (client) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(172), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x00000200, ZAP_ATTRIBUTE_INDEX(177), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(177), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(177), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(177), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (client) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -1262,11 +1170,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 19, 585 }, { ZAP_CLUSTER_INDEX(19), 6, 0 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 18, 837 }, { ZAP_CLUSTER_INDEX(18), 6, 0 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -1276,11 +1180,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (585) -======= -#define ATTRIBUTE_MAX_SIZE (837) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 511a840ee55c43..64891b1e5d80ce 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -629,11 +629,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 233 -======= -#define GENERATED_ATTRIBUTE_COUNT 229 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -1164,7 +1160,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 28 // clang-format off @@ -1480,120 +1475,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 27 -#define GENERATED_CLUSTERS \ - { \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(0), \ - 2, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 0, Cluster: Identify (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(2), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(8), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(28), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(29), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(32), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(36), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(39), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(45), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(55), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(55), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(64), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(70), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(135), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(150), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(161), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(165), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x0000003F, ZAP_ATTRIBUTE_INDEX(172), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(175), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(177), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000003, ZAP_ATTRIBUTE_INDEX(179), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Identify (client) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(179), \ - 3, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(182), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000005, \ - ZAP_ATTRIBUTE_INDEX(184), \ - 6, \ - 8, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(190), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 1, Cluster: Basic (server) */ \ - { 0x00000201, \ - ZAP_ATTRIBUTE_INDEX(210), \ - 19, \ - 34, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThermostatServer }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -1602,11 +1483,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 22, 1103 }, { ZAP_CLUSTER_INDEX(22), 6, 89 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 21, 1355 }, { ZAP_CLUSTER_INDEX(21), 6, 89 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -1616,11 +1493,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (78) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (1192) -======= -#define ATTRIBUTE_MAX_SIZE (1444) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index e6625b34b9d4ae..7bba63265e1a34 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -47,7 +47,6 @@ \ /* Endpoint: 0, Cluster: Network Commissioning (server), big-endian */ \ \ -<<<<<<< HEAD /* 22 - Networks, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -55,35 +54,18 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 38 - FeatureMap, */ \ -======= - /* 276 - Networks, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 288 - LastConnectErrorValue, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 292 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), big-endian */ \ \ -<<<<<<< HEAD /* 42 - UpTime, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 50 - TotalOperationalHours, */ \ -======= - /* 296 - UpTime, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 304 - TotalOperationalHours, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Software Diagnostics (server), big-endian */ \ \ -<<<<<<< HEAD /* 54 - CurrentHeapFree, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -94,23 +76,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 78 - FeatureMap, */ \ -======= - /* 308 - CurrentHeapFree, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 316 - CurrentHeapUsed, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 324 - CurrentHeapHighWatermark, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 332 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), big-endian */ \ \ -<<<<<<< HEAD /* 82 - NetworkName, */ \ 0x00, 0x00, \ \ @@ -238,140 +207,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 267 - FeatureMap, */ \ -======= - /* 336 - NetworkName, */ \ - 0x00, 0x00, \ - \ - /* 338 - ExtendedPanId, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 346 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 354 - PartitionId, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 358 - TxTotalCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 362 - TxUnicastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 366 - TxBroadcastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 370 - TxAckRequestedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 374 - TxAckedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 378 - TxNoAckRequestedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 382 - TxDataCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 386 - TxDataPollCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 390 - TxBeaconCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 394 - TxBeaconRequestCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 398 - TxOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 402 - TxRetryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 406 - TxDirectMaxRetryExpiryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 410 - TxIndirectMaxRetryExpiryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 414 - TxErrCcaCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 418 - TxErrAbortCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 422 - TxErrBusyChannelCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 426 - RxTotalCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 430 - RxUnicastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 434 - RxBroadcastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 438 - RxDataCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 442 - RxDataPollCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 446 - RxBeaconCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 450 - RxBeaconRequestCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 454 - RxOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 458 - RxAddressFilteredCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 462 - RxDestAddrFilteredCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 466 - RxDuplicatedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 470 - RxErrNoFrameCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 474 - RxErrUnknownNeighborCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 478 - RxErrInvalidSrcAddrCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 482 - RxErrSecCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 486 - RxErrFcsCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 490 - RxErrOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 494 - ActiveTimestamp, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 502 - PendingTimestamp, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 510 - delay, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 514 - ChannelMask, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 521 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x0F, \ \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server), big-endian */ \ \ -<<<<<<< HEAD /* 271 - BeaconLostCount, */ \ 0x00, 0x00, 0x00, 0x00, \ \ @@ -397,38 +236,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 311 - FeatureMap, */ \ -======= - /* 525 - BeaconLostCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 529 - BeaconRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 533 - PacketMulticastRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 537 - PacketMulticastTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 541 - PacketUnicastRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 545 - PacketUnicastTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 549 - CurrentMaxRate, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 557 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 565 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x03, \ \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server), big-endian */ \ \ -<<<<<<< HEAD /* 315 - PacketRxCount, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -448,36 +259,11 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 363 - FeatureMap, */ \ -======= - /* 569 - PacketRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 577 - PacketTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 585 - TxErrCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 593 - CollisionCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 601 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 609 - TimeSinceReset, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 617 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x03, \ \ /* Endpoint: 0, Cluster: Group Key Management (server), big-endian */ \ \ -<<<<<<< HEAD /* 367 - groupKeyMap, */ \ -======= - /* 621 - groupKeyMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -493,11 +279,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 621 - groupTable, */ \ -======= - /* 875 - groupTable, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -515,11 +297,7 @@ \ /* Endpoint: 1, Cluster: Channel (server), big-endian */ \ \ -<<<<<<< HEAD /* 875 - channel list, */ \ -======= - /* 1129 - channel list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -537,11 +315,7 @@ \ /* Endpoint: 1, Cluster: Target Navigator (server), big-endian */ \ \ -<<<<<<< HEAD /* 1129 - target navigator list, */ \ -======= - /* 1383 - target navigator list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -559,11 +333,7 @@ \ /* Endpoint: 1, Cluster: Media Input (server), big-endian */ \ \ -<<<<<<< HEAD /* 1383 - media input list, */ \ -======= - /* 1637 - media input list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -581,11 +351,7 @@ \ /* Endpoint: 1, Cluster: Content Launcher (server), big-endian */ \ \ -<<<<<<< HEAD /* 1637 - accept header list, */ \ -======= - /* 1891 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -601,20 +367,12 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 1891 - supported streaming protocols, */ \ -======= - /* 2145 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Application Launcher (server), big-endian */ \ \ -<<<<<<< HEAD /* 1895 - application launcher list, */ \ -======= - /* 2149 - application launcher list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -632,20 +390,12 @@ \ /* Endpoint: 2, Cluster: Level Control (server), big-endian */ \ \ -<<<<<<< HEAD /* 2149 - FeatureMap, */ \ -======= - /* 2403 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 2, Cluster: Audio Output (server), big-endian */ \ \ -<<<<<<< HEAD /* 2153 - audio output list, */ \ -======= - /* 2407 - audio output list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -663,7 +413,6 @@ \ /* Endpoint: 3, Cluster: Media Playback (server), big-endian */ \ \ -<<<<<<< HEAD /* 2407 - start time, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, \ \ @@ -677,30 +426,11 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 2435 - seek range start, */ \ -======= - /* 2661 - start time, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, \ - \ - /* 2669 - duration, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2677 - playback speed, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2681 - seek range end, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2689 - seek range start, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Content Launcher (server), big-endian */ \ \ -<<<<<<< HEAD /* 2443 - accept header list, */ \ -======= - /* 2697 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -716,30 +446,18 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 2697 - supported streaming protocols, */ \ -======= - /* 2951 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Application Basic (server), big-endian */ \ \ -<<<<<<< HEAD /* 2701 - allowed vendor list, */ \ -======= - /* 2955 - allowed vendor list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), big-endian */ \ \ -<<<<<<< HEAD /* 2733 - accept header list, */ \ -======= - /* 2987 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -755,20 +473,12 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 2987 - supported streaming protocols, */ \ -======= - /* 3241 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Application Basic (server), big-endian */ \ \ -<<<<<<< HEAD /* 2991 - allowed vendor list, */ \ -======= - /* 3245 - allowed vendor list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } @@ -797,7 +507,6 @@ \ /* Endpoint: 0, Cluster: Network Commissioning (server), little-endian */ \ \ -<<<<<<< HEAD /* 22 - Networks, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -805,35 +514,18 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 38 - FeatureMap, */ \ -======= - /* 276 - Networks, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 288 - LastConnectErrorValue, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 292 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Diagnostics (server), little-endian */ \ \ -<<<<<<< HEAD /* 42 - UpTime, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 50 - TotalOperationalHours, */ \ -======= - /* 296 - UpTime, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 304 - TotalOperationalHours, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Software Diagnostics (server), little-endian */ \ \ -<<<<<<< HEAD /* 54 - CurrentHeapFree, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -844,23 +536,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 78 - FeatureMap, */ \ -======= - /* 308 - CurrentHeapFree, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 316 - CurrentHeapUsed, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 324 - CurrentHeapHighWatermark, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 332 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server), little-endian */ \ \ -<<<<<<< HEAD /* 82 - NetworkName, */ \ 0x00, 0x00, \ \ @@ -988,140 +667,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 267 - FeatureMap, */ \ -======= - /* 336 - NetworkName, */ \ - 0x00, 0x00, \ - \ - /* 338 - ExtendedPanId, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 346 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 354 - PartitionId, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 358 - TxTotalCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 362 - TxUnicastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 366 - TxBroadcastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 370 - TxAckRequestedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 374 - TxAckedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 378 - TxNoAckRequestedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 382 - TxDataCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 386 - TxDataPollCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 390 - TxBeaconCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 394 - TxBeaconRequestCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 398 - TxOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 402 - TxRetryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 406 - TxDirectMaxRetryExpiryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 410 - TxIndirectMaxRetryExpiryCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 414 - TxErrCcaCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 418 - TxErrAbortCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 422 - TxErrBusyChannelCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 426 - RxTotalCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 430 - RxUnicastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 434 - RxBroadcastCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 438 - RxDataCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 442 - RxDataPollCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 446 - RxBeaconCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 450 - RxBeaconRequestCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 454 - RxOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 458 - RxAddressFilteredCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 462 - RxDestAddrFilteredCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 466 - RxDuplicatedCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 470 - RxErrNoFrameCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 474 - RxErrUnknownNeighborCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 478 - RxErrInvalidSrcAddrCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 482 - RxErrSecCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 486 - RxErrFcsCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 490 - RxErrOtherCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 494 - ActiveTimestamp, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 502 - PendingTimestamp, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 510 - delay, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 514 - ChannelMask, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 521 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x0F, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server), little-endian */ \ \ -<<<<<<< HEAD /* 271 - BeaconLostCount, */ \ 0x00, 0x00, 0x00, 0x00, \ \ @@ -1147,38 +696,10 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 311 - FeatureMap, */ \ -======= - /* 525 - BeaconLostCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 529 - BeaconRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 533 - PacketMulticastRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 537 - PacketMulticastTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 541 - PacketUnicastRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 545 - PacketUnicastTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 549 - CurrentMaxRate, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 557 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 565 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x03, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server), little-endian */ \ \ -<<<<<<< HEAD /* 315 - PacketRxCount, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -1198,36 +719,11 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 363 - FeatureMap, */ \ -======= - /* 569 - PacketRxCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 577 - PacketTxCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 585 - TxErrCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 593 - CollisionCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 601 - OverrunCount, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 609 - TimeSinceReset, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 617 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x03, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: Group Key Management (server), little-endian */ \ \ -<<<<<<< HEAD /* 367 - groupKeyMap, */ \ -======= - /* 621 - groupKeyMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1243,11 +739,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 621 - groupTable, */ \ -======= - /* 875 - groupTable, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1265,11 +757,7 @@ \ /* Endpoint: 1, Cluster: Channel (server), little-endian */ \ \ -<<<<<<< HEAD /* 875 - channel list, */ \ -======= - /* 1129 - channel list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1287,11 +775,7 @@ \ /* Endpoint: 1, Cluster: Target Navigator (server), little-endian */ \ \ -<<<<<<< HEAD /* 1129 - target navigator list, */ \ -======= - /* 1383 - target navigator list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1309,11 +793,7 @@ \ /* Endpoint: 1, Cluster: Media Input (server), little-endian */ \ \ -<<<<<<< HEAD /* 1383 - media input list, */ \ -======= - /* 1637 - media input list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1331,11 +811,7 @@ \ /* Endpoint: 1, Cluster: Content Launcher (server), little-endian */ \ \ -<<<<<<< HEAD /* 1637 - accept header list, */ \ -======= - /* 1891 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1351,20 +827,12 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 1891 - supported streaming protocols, */ \ -======= - /* 2145 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Application Launcher (server), little-endian */ \ \ -<<<<<<< HEAD /* 1895 - application launcher list, */ \ -======= - /* 2149 - application launcher list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1382,20 +850,12 @@ \ /* Endpoint: 2, Cluster: Level Control (server), little-endian */ \ \ -<<<<<<< HEAD /* 2149 - FeatureMap, */ \ -======= - /* 2403 - FeatureMap, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: Audio Output (server), little-endian */ \ \ -<<<<<<< HEAD /* 2153 - audio output list, */ \ -======= - /* 2407 - audio output list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1413,7 +873,6 @@ \ /* Endpoint: 3, Cluster: Media Playback (server), little-endian */ \ \ -<<<<<<< HEAD /* 2407 - start time, */ \ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ @@ -1427,30 +886,11 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* 2435 - seek range start, */ \ -======= - /* 2661 - start time, */ \ - 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2669 - duration, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2677 - playback speed, */ \ - 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2681 - seek range end, */ \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - \ - /* 2689 - seek range start, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Content Launcher (server), little-endian */ \ \ -<<<<<<< HEAD /* 2443 - accept header list, */ \ -======= - /* 2697 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1466,30 +906,18 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 2697 - supported streaming protocols, */ \ -======= - /* 2951 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 3, Cluster: Application Basic (server), little-endian */ \ \ -<<<<<<< HEAD /* 2701 - allowed vendor list, */ \ -======= - /* 2955 - allowed vendor list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Content Launcher (server), little-endian */ \ \ -<<<<<<< HEAD /* 2733 - accept header list, */ \ -======= - /* 2987 - accept header list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1505,31 +933,19 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ -<<<<<<< HEAD /* 2987 - supported streaming protocols, */ \ -======= - /* 3241 - supported streaming protocols, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 4, Cluster: Application Basic (server), little-endian */ \ \ -<<<<<<< HEAD /* 2991 - allowed vendor list, */ \ -======= - /* 3245 - allowed vendor list, */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -<<<<<<< HEAD #define GENERATED_DEFAULTS_COUNT (93) -======= -#define GENERATED_DEFAULTS_COUNT (94) ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -1562,11 +978,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 294 -======= -#define GENERATED_ATTRIBUTE_COUNT 290 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -1657,7 +1069,6 @@ \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ { 0x00000000, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(10) }, /* Breadcrumb */ \ -<<<<<<< HEAD { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* BasicCommissioningInfo */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* RegulatoryConfig */ \ @@ -1668,43 +1079,21 @@ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* MaxNetworks */ \ { 0x00000001, ZAP_TYPE(ARRAY), 12, 0, ZAP_LONG_DEFAULTS_INDEX(22) }, /* Networks */ \ -======= - { 0x00000001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(18) }, /* BasicCommissioningInfoList */ \ - { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* RegulatoryConfig */ \ - { 0x00000003, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* LocationCapability */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(272) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* MaxNetworks */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 12, 0, ZAP_LONG_DEFAULTS_INDEX(276) }, /* Networks */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* ScanMaxTimeSeconds */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* ConnectMaxTimeSeconds */ \ { 0x00000004, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* InterfaceEnabled */ \ { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* LastNetworkingStatus */ \ { 0x00000006, ZAP_TYPE(OCTET_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* LastNetworkID */ \ -<<<<<<< HEAD { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(34) }, /* LastConnectErrorValue */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(38) }, /* FeatureMap */ \ -======= - { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(288) }, /* LastConnectErrorValue */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(292) }, /* FeatureMap */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NetworkInterfaces */ \ { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RebootCount */ \ -<<<<<<< HEAD { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(42) }, /* UpTime */ \ { 0x00000003, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(50) }, /* TotalOperationalHours */ \ { 0x00000004, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ -======= - { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(296) }, /* UpTime */ \ - { 0x00000003, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(304) }, /* TotalOperationalHours */ \ - { 0x00000004, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* BootReasons */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000005, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveHardwareFaults */ \ { 0x00000006, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActiveRadioFaults */ \ @@ -1714,24 +1103,15 @@ \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ThreadMetrics */ \ -<<<<<<< HEAD { 0x00000001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(54) }, /* CurrentHeapFree */ \ { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(62) }, /* CurrentHeapUsed */ \ { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(70) }, /* CurrentHeapHighWatermark */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(78) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ -======= - { 0x00000001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(308) }, /* CurrentHeapFree */ \ - { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(316) }, /* CurrentHeapUsed */ \ - { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(324) }, /* CurrentHeapHighWatermark */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(332) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ { 0x00000000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* channel */ \ { 0x00000001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* RoutingRole */ \ -<<<<<<< HEAD { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(82) }, /* NetworkName */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \ { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(84) }, /* ExtendedPanId */ \ @@ -1740,16 +1120,6 @@ { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \ { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */ \ { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(100) }, /* PartitionId */ \ -======= - { 0x00000002, ZAP_TYPE(CHAR_STRING), 17, 0, ZAP_LONG_DEFAULTS_INDEX(336) }, /* NetworkName */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PanId */ \ - { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(338) }, /* ExtendedPanId */ \ - { 0x00000005, ZAP_TYPE(OCTET_STRING), 18, 0, ZAP_EMPTY_DEFAULT() }, /* MeshLocalPrefix */ \ - { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(346) }, /* OverrunCount */ \ - { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* NeighborTableList */ \ - { 0x00000008, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* RouteTableList */ \ - { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(354) }, /* PartitionId */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* weighting */ \ { 0x0000000B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* DataVersion */ \ { 0x0000000C, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* StableDataVersion */ \ @@ -1762,7 +1132,6 @@ { 0x00000013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* PartitionIdChangeCount */ \ { 0x00000014, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* BetterPartitionAttachAttemptCount */ \ { 0x00000015, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ParentChangeCount */ \ -<<<<<<< HEAD { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(104) }, /* TxTotalCount */ \ { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(108) }, /* TxUnicastCount */ \ { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(112) }, /* TxBroadcastCount */ \ @@ -1802,56 +1171,11 @@ { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(256) }, /* delay */ \ { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(260) }, /* ChannelMask */ \ -======= - { 0x00000016, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(358) }, /* TxTotalCount */ \ - { 0x00000017, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(362) }, /* TxUnicastCount */ \ - { 0x00000018, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(366) }, /* TxBroadcastCount */ \ - { 0x00000019, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(370) }, /* TxAckRequestedCount */ \ - { 0x0000001A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(374) }, /* TxAckedCount */ \ - { 0x0000001B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(378) }, /* TxNoAckRequestedCount */ \ - { 0x0000001C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(382) }, /* TxDataCount */ \ - { 0x0000001D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(386) }, /* TxDataPollCount */ \ - { 0x0000001E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(390) }, /* TxBeaconCount */ \ - { 0x0000001F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(394) }, /* TxBeaconRequestCount */ \ - { 0x00000020, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(398) }, /* TxOtherCount */ \ - { 0x00000021, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(402) }, /* TxRetryCount */ \ - { 0x00000022, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(406) }, /* TxDirectMaxRetryExpiryCount */ \ - { 0x00000023, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(410) }, /* TxIndirectMaxRetryExpiryCount */ \ - { 0x00000024, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(414) }, /* TxErrCcaCount */ \ - { 0x00000025, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(418) }, /* TxErrAbortCount */ \ - { 0x00000026, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(422) }, /* TxErrBusyChannelCount */ \ - { 0x00000027, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(426) }, /* RxTotalCount */ \ - { 0x00000028, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(430) }, /* RxUnicastCount */ \ - { 0x00000029, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(434) }, /* RxBroadcastCount */ \ - { 0x0000002A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(438) }, /* RxDataCount */ \ - { 0x0000002B, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(442) }, /* RxDataPollCount */ \ - { 0x0000002C, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(446) }, /* RxBeaconCount */ \ - { 0x0000002D, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(450) }, /* RxBeaconRequestCount */ \ - { 0x0000002E, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(454) }, /* RxOtherCount */ \ - { 0x0000002F, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(458) }, /* RxAddressFilteredCount */ \ - { 0x00000030, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(462) }, /* RxDestAddrFilteredCount */ \ - { 0x00000031, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(466) }, /* RxDuplicatedCount */ \ - { 0x00000032, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(470) }, /* RxErrNoFrameCount */ \ - { 0x00000033, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(474) }, /* RxErrUnknownNeighborCount */ \ - { 0x00000034, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(478) }, /* RxErrInvalidSrcAddrCount */ \ - { 0x00000035, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(482) }, /* RxErrSecCount */ \ - { 0x00000036, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(486) }, /* RxErrFcsCount */ \ - { 0x00000037, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(490) }, /* RxErrOtherCount */ \ - { 0x00000038, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(494) }, /* ActiveTimestamp */ \ - { 0x00000039, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(502) }, /* PendingTimestamp */ \ - { 0x0000003A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(510) }, /* delay */ \ - { 0x0000003B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SecurityPolicy */ \ - { 0x0000003C, ZAP_TYPE(OCTET_STRING), 5, 0, ZAP_LONG_DEFAULTS_INDEX(514) }, /* ChannelMask */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000003D, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* OperationalDatasetComponents */ \ { 0x0000003E, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* ActiveNetworkFaultsList */ \ -<<<<<<< HEAD { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(267) }, /* FeatureMap */ \ -======= - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(521) }, /* FeatureMap */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ @@ -1860,7 +1184,6 @@ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* WiFiVersion */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* ChannelNumber */ \ { 0x00000004, ZAP_TYPE(INT8S), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Rssi */ \ -<<<<<<< HEAD { 0x00000005, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(271) }, /* BeaconLostCount */ \ { 0x00000006, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(275) }, /* BeaconRxCount */ \ { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(279) }, /* PacketMulticastRxCount */ \ @@ -1870,23 +1193,11 @@ { 0x0000000B, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(295) }, /* CurrentMaxRate */ \ { 0x0000000C, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(303) }, /* OverrunCount */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(311) }, /* FeatureMap */ \ -======= - { 0x00000005, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(525) }, /* BeaconLostCount */ \ - { 0x00000006, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(529) }, /* BeaconRxCount */ \ - { 0x00000007, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(533) }, /* PacketMulticastRxCount */ \ - { 0x00000008, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(537) }, /* PacketMulticastTxCount */ \ - { 0x00000009, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(541) }, /* PacketUnicastRxCount */ \ - { 0x0000000A, ZAP_TYPE(INT32U), 4, 0, ZAP_LONG_DEFAULTS_INDEX(545) }, /* PacketUnicastTxCount */ \ - { 0x0000000B, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(549) }, /* CurrentMaxRate */ \ - { 0x0000000C, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(557) }, /* OverrunCount */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(565) }, /* FeatureMap */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* PHYRate */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* FullDuplex */ \ -<<<<<<< HEAD { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(315) }, /* PacketRxCount */ \ { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(323) }, /* PacketTxCount */ \ { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(331) }, /* TxErrCount */ \ @@ -1895,16 +1206,6 @@ { 0x00000007, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CarrierDetect */ \ { 0x00000008, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(355) }, /* TimeSinceReset */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(363) }, /* FeatureMap */ \ -======= - { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(569) }, /* PacketRxCount */ \ - { 0x00000003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(577) }, /* PacketTxCount */ \ - { 0x00000004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(585) }, /* TxErrCount */ \ - { 0x00000005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(593) }, /* CollisionCount */ \ - { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(601) }, /* OverrunCount */ \ - { 0x00000007, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CarrierDetect */ \ - { 0x00000008, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(609) }, /* TimeSinceReset */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(617) }, /* FeatureMap */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ @@ -1926,15 +1227,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(367) }, /* groupKeyMap */ \ { 0x00000001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(621) }, /* groupTable */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(621) }, /* groupKeyMap */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(875) }, /* groupTable */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* label list */ \ @@ -1967,11 +1262,7 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Channel (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(875) }, /* channel list */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1129) }, /* channel list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* channel lineup */ \ { 0x00000002, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ @@ -1979,20 +1270,12 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1129) }, /* target navigator list */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1383) }, /* target navigator list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* current navigator target */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Media Input (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1383) }, /* media input list */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1637) }, /* media input list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current media input */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ @@ -2003,7 +1286,6 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1637) }, /* accept header list */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_LONG_DEFAULTS_INDEX(1891) }, /* supported streaming protocols */ \ @@ -2011,15 +1293,6 @@ \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1895) }, /* application launcher list */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1891) }, /* accept header list */ \ - { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(2145) }, /* supported streaming protocols */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 1, Cluster: Application Launcher (server) */ \ - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2149) }, /* application launcher list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000001, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* application launcher app */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ @@ -2051,11 +1324,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 */ \ -<<<<<<< HEAD { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(2149) }, /* FeatureMap */ \ -======= - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(2403) }, /* FeatureMap */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -2066,11 +1335,7 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Audio Output (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2153) }, /* audio output list */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2407) }, /* audio output list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current audio output */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ @@ -2083,7 +1348,6 @@ \ /* Endpoint: 3, Cluster: Media Playback (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* playback state */ \ -<<<<<<< HEAD { 0x00000001, ZAP_TYPE(EPOCH_US), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2407) }, /* start time */ \ { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2415) }, /* duration */ \ { 0x00000003, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ @@ -2097,21 +1361,6 @@ { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2443) }, /* accept header list */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_LONG_DEFAULTS_INDEX(2697) }, /* supported streaming protocols */ \ -======= - { 0x00000001, ZAP_TYPE(EPOCH_US), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2661) }, /* start time */ \ - { 0x00000002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2669) }, /* duration */ \ - { 0x00000003, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* position */ \ - { 0x00000004, ZAP_TYPE(SINGLE), 4, 0, ZAP_LONG_DEFAULTS_INDEX(2677) }, /* playback speed */ \ - { 0x00000005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2681) }, /* seek range end */ \ - { 0x00000006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2689) }, /* seek range start */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 3, Cluster: Content Launcher (server) */ \ - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2697) }, /* accept header list */ \ - { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(2951) }, /* supported streaming protocols */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ @@ -2123,11 +1372,7 @@ ZAP_EMPTY_DEFAULT() }, /* application app */ \ { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ -<<<<<<< HEAD { 0x00000007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(2701) }, /* allowed vendor list */ \ -======= - { 0x00000007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(2955) }, /* allowed vendor list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Account Login (server) */ \ @@ -2141,15 +1386,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Content Launcher (server) */ \ -<<<<<<< HEAD { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2733) }, /* accept header list */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_LONG_DEFAULTS_INDEX(2987) }, /* supported streaming protocols */ \ -======= - { 0x00000000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2987) }, /* accept header list */ \ - { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3241) }, /* supported streaming protocols */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ @@ -2161,11 +1400,7 @@ ZAP_EMPTY_DEFAULT() }, /* application app */ \ { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ -<<<<<<< HEAD { 0x00000007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(2991) }, /* allowed vendor list */ \ -======= - { 0x00000007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(3245) }, /* allowed vendor list */ \ ->>>>>>> Using responseRef instead of the complicated logic in the template { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 5, Cluster: Descriptor (server) */ \ @@ -2413,7 +1648,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 50 // clang-format off @@ -2971,177 +2205,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 49 -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(5), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Binding (client) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(6), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(30), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(34), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(37), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (client) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(37), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(43), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (client) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(43), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(53), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(53), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(62), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(68), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(133), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(148), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(159), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(163), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (client) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(163), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x0000003F, ZAP_ATTRIBUTE_INDEX(170), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(173), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(175), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(177), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(181), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(183), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x00000503, ZAP_ATTRIBUTE_INDEX(188), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ - { \ - 0x00000504, ZAP_ATTRIBUTE_INDEX(190), 4, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Channel (server) */ \ - { \ - 0x00000505, ZAP_ATTRIBUTE_INDEX(194), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ - { \ - 0x00000507, ZAP_ATTRIBUTE_INDEX(197), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Media Input (server) */ \ - { \ - 0x00000508, ZAP_ATTRIBUTE_INDEX(200), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Low Power (server) */ \ - { \ - 0x00000509, ZAP_ATTRIBUTE_INDEX(201), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(202), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ - { \ - 0x0000050C, ZAP_ATTRIBUTE_INDEX(205), 3, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(208), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(210), \ - 16, \ - 27, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 2, Cluster: Level Control (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(226), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ - { \ - 0x0000050B, ZAP_ATTRIBUTE_INDEX(231), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 2, Cluster: Audio Output (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(234), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 3, Cluster: Descriptor (server) */ \ - { \ - 0x00000506, ZAP_ATTRIBUTE_INDEX(239), 8, 39, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 3, Cluster: Media Playback (server) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(247), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 3, Cluster: Content Launcher (server) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(250), 9, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 3, Cluster: Application Basic (server) */ \ - { \ - 0x0000050E, ZAP_ATTRIBUTE_INDEX(259), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 3, Cluster: Account Login (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(260), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 4, Cluster: Descriptor (server) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(265), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 4, Cluster: Content Launcher (server) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(268), 9, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 4, Cluster: Application Basic (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(277), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 5, Cluster: Descriptor (server) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(282), 8, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 5, Cluster: Application Basic (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -3150,13 +2213,8 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 26, 1107 }, { ZAP_CLUSTER_INDEX(26), 10, 1328 }, { ZAP_CLUSTER_INDEX(36), 4, 287 }, \ { ZAP_CLUSTER_INDEX(40), 5, 439 }, { ZAP_CLUSTER_INDEX(45), 3, 398 }, { ZAP_CLUSTER_INDEX(48), 2, 106 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 25, 1359 }, { ZAP_CLUSTER_INDEX(25), 10, 1328 }, { ZAP_CLUSTER_INDEX(35), 4, 287 }, \ - { ZAP_CLUSTER_INDEX(39), 5, 439 }, { ZAP_CLUSTER_INDEX(44), 3, 398 }, { ZAP_CLUSTER_INDEX(47), 2, 106 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -3166,11 +2224,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (39) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (3665) -======= -#define ATTRIBUTE_MAX_SIZE (3917) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (6) diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index f0a8d745fde777..b8e83700414fec 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -841,11 +841,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -<<<<<<< HEAD #define GENERATED_ATTRIBUTE_COUNT 416 -======= -#define GENERATED_ATTRIBUTE_COUNT 412 ->>>>>>> Using responseRef instead of the complicated logic in the template #define GENERATED_ATTRIBUTES \ { \ \ @@ -1720,7 +1716,6 @@ // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -<<<<<<< HEAD #define GENERATED_CLUSTER_COUNT 58 // clang-format off @@ -2366,227 +2361,6 @@ } // clang-format on -======= -#define GENERATED_CLUSTER_COUNT 57 -#define GENERATED_CLUSTERS \ - { \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0x00000028, \ - ZAP_ATTRIBUTE_INDEX(6), \ - 20, \ - 39, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ - { \ - 0x00000029, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ - { 0x0000002B, \ - ZAP_ATTRIBUTE_INDEX(27), \ - 3, \ - 38, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayLocalizationConfigurationServer }, /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ - { 0x0000002C, \ - ZAP_ATTRIBUTE_INDEX(30), \ - 4, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayTimeFormatLocalizationServer }, /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ - { \ - 0x0000002D, ZAP_ATTRIBUTE_INDEX(34), 3, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Unit Localization (server) */ \ - { \ - 0x00000030, ZAP_ATTRIBUTE_INDEX(37), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { \ - 0x00000031, ZAP_ATTRIBUTE_INDEX(43), 10, 60, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { \ - 0x00000032, ZAP_ATTRIBUTE_INDEX(53), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ - { \ - 0x00000033, ZAP_ATTRIBUTE_INDEX(53), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { \ - 0x00000034, ZAP_ATTRIBUTE_INDEX(62), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ - { \ - 0x00000035, ZAP_ATTRIBUTE_INDEX(68), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ - { \ - 0x00000036, ZAP_ATTRIBUTE_INDEX(133), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ - { \ - 0x00000037, ZAP_ATTRIBUTE_INDEX(148), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ - { \ - 0x0000003C, ZAP_ATTRIBUTE_INDEX(159), 4, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ - { \ - 0x0000003E, ZAP_ATTRIBUTE_INDEX(163), 7, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { \ - 0x0000003F, ZAP_ATTRIBUTE_INDEX(170), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(173), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Fixed Label (server) */ \ - { \ - 0x00000041, ZAP_ATTRIBUTE_INDEX(175), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: User Label (server) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(177), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { 0x00000003, \ - ZAP_ATTRIBUTE_INDEX(181), \ - 2, \ - 4, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \ - { 0x00000004, \ - ZAP_ATTRIBUTE_INDEX(183), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \ - { 0x00000005, \ - ZAP_ATTRIBUTE_INDEX(185), \ - 6, \ - 8, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(191), \ - 7, \ - 13, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/Off (server) */ \ - { 0x00000008, \ - ZAP_ATTRIBUTE_INDEX(198), \ - 15, \ - 23, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \ - { \ - 0x0000000F, ZAP_ATTRIBUTE_INDEX(213), 4, 5, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(217), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ - { \ - 0x0000001E, ZAP_ATTRIBUTE_INDEX(222), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binding (server) */ \ - { \ - 0x00000039, ZAP_ATTRIBUTE_INDEX(223), 15, 36, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Bridged Device Basic (server) */ \ - { \ - 0x0000003B, ZAP_ATTRIBUTE_INDEX(238), 3, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Switch (server) */ \ - { \ - 0x00000040, ZAP_ATTRIBUTE_INDEX(241), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Fixed Label (server) */ \ - { 0x00000101, \ - ZAP_ATTRIBUTE_INDEX(243), \ - 28, \ - 46, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | \ - ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ - chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ - { \ - 0x00000102, ZAP_ATTRIBUTE_INDEX(271), 19, 31, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ - { \ - 0x00000103, ZAP_ATTRIBUTE_INDEX(290), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ - { 0x00000201, \ - ZAP_ATTRIBUTE_INDEX(295), \ - 10, \ - 17, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayThermostatServer }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { 0x00000300, \ - ZAP_ATTRIBUTE_INDEX(305), \ - 51, \ - 337, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ - { \ - 0x00000402, ZAP_ATTRIBUTE_INDEX(356), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ - { \ - 0x00000403, ZAP_ATTRIBUTE_INDEX(360), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ - { \ - 0x00000404, ZAP_ATTRIBUTE_INDEX(364), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { \ - 0x00000405, ZAP_ATTRIBUTE_INDEX(368), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ - { 0x00000500, \ - ZAP_ATTRIBUTE_INDEX(372), \ - 6, \ - 16, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ - ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ - chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ - { \ - 0x00000503, ZAP_ATTRIBUTE_INDEX(378), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ - { \ - 0x00000504, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Channel (client) */ \ - { \ - 0x00000505, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Target Navigator (client) */ \ - { \ - 0x00000506, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Media Playback (client) */ \ - { \ - 0x00000507, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Media Input (client) */ \ - { \ - 0x00000509, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Keypad Input (client) */ \ - { \ - 0x0000050A, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Content Launcher (client) */ \ - { \ - 0x0000050B, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Audio Output (client) */ \ - { \ - 0x0000050C, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Application Launcher (client) */ \ - { \ - 0x0000050D, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Application Basic (client) */ \ - { \ - 0x0000050E, ZAP_ATTRIBUTE_INDEX(380), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Account Login (client) */ \ - { \ - 0x0000050F, ZAP_ATTRIBUTE_INDEX(380), 21, 1582, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ - { 0x00000006, \ - ZAP_ATTRIBUTE_INDEX(401), \ - 2, \ - 3, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ - { \ - 0x0000001D, ZAP_ATTRIBUTE_INDEX(403), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ - { 0x00000406, \ - ZAP_ATTRIBUTE_INDEX(408), \ - 4, \ - 5, \ - ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - chipFuncArrayOccupancySensingServer }, /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - } ->>>>>>> Using responseRef instead of the complicated logic in the template #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) @@ -2595,11 +2369,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ -<<<<<<< HEAD { ZAP_CLUSTER_INDEX(0), 22, 1107 }, { ZAP_CLUSTER_INDEX(22), 33, 2457 }, { ZAP_CLUSTER_INDEX(55), 3, 8 }, \ -======= - { ZAP_CLUSTER_INDEX(0), 21, 1359 }, { ZAP_CLUSTER_INDEX(21), 33, 2457 }, { ZAP_CLUSTER_INDEX(54), 3, 8 }, \ ->>>>>>> Using responseRef instead of the complicated logic in the template } // Largest attribute size is needed for various buffers @@ -2609,11 +2379,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (75) // Total size of attribute storage -<<<<<<< HEAD #define ATTRIBUTE_MAX_SIZE (3572) -======= -#define ATTRIBUTE_MAX_SIZE (3824) ->>>>>>> Using responseRef instead of the complicated logic in the template // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3)