Update ZAP to tip. (#14677)

Slightly smaller data in endpoint_config.
project-chip · Feb 3, 2022 · 4267a9b · 4267a9b
1 parent 6c00d7a
commit 4267a9b
Show file tree

Hide file tree

Showing 19 changed files with 1,162 additions and 2,204 deletions.
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
@@ -94,7 +94,10 @@ constexpr const EmberAfAttributeMinMaxValue minMaxDefaults[] = GENERATED_MIN_MAX
 GENERATED_FUNCTION_ARRAYS
 #endif
 
-constexpr const chip::CommandId generatedCommands[]                 = GENERATED_COMMANDS;
+#ifdef GENERATED_COMMANDS
+constexpr const chip::CommandId generatedCommands[] = GENERATED_COMMANDS;
+#endif // GENERATED_COMMANDS
+
 constexpr const EmberAfAttributeMetadata generatedAttributes[]      = GENERATED_ATTRIBUTES;
 constexpr const EmberAfCluster generatedClusters[]                  = GENERATED_CLUSTERS;
 constexpr const EmberAfEndpointType generatedEmberAfEndpointTypes[] = GENERATED_ENDPOINT_TYPES;

diff --git a/src/app/zap-templates/templates/app/endpoint_config.zapt b/src/app/zap-templates/templates/app/endpoint_config.zapt
@@ -41,9 +41,18 @@
 // Cluster function static arrays
 #define GENERATED_FUNCTION_ARRAYS   {{chip_endpoint_generated_functions}}
 
+{{#chip_endpoint_generated_commands_list}}
+{{#first}}
 // clang-format off
-#define GENERATED_COMMANDS {{chip_endpoint_generated_commands_list}}
+#define GENERATED_COMMANDS { \
+{{/first}}
+{{text}}
+{{#last}}
+}
+
 // clang-format on
+{{/last}}
+{{/chip_endpoint_generated_commands_list}}
 
 #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT {{endpoint_cluster_count}}

diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
@@ -180,9 +180,9 @@ function chip_endpoint_generated_functions()
   return ret.concat('\n');
 }
 
-function chip_endpoint_generated_commands_list()
+function chip_endpoint_generated_commands_list(options)
 {
-  let ret = '{ \\\n';
+  let ret = [];
   this.clusterList.forEach((c) => {
     let clientGeneratedCommands = [];
     let serverGeneratedCommands = [];
@@ -197,18 +197,18 @@ function chip_endpoint_generated_commands_list()
     });
 
     if (clientGeneratedCommands.length > 0 || serverGeneratedCommands.length > 0) {
-      ret = ret.concat(`  /* ${c.comment} */\\\n`);
+      ret.push({ text : `  /* ${c.comment} */\\` });
     }
     if (clientGeneratedCommands.length > 0) {
       clientGeneratedCommands.push('chip::kInvalidCommandId /* end of list */')
-      ret = ret.concat(`  /*   client_generated */ \\\n  ${clientGeneratedCommands.join(', \\\n  ')}, \\\n`);
+      ret.push({ text : `  /*   client_generated */ \\\n  ${clientGeneratedCommands.join(', \\\n  ')}, \\` });
     }
     if (serverGeneratedCommands.length > 0) {
       serverGeneratedCommands.push('chip::kInvalidCommandId /* end of list */')
-      ret = ret.concat(`  /*   server_generated */ \\\n  ${serverGeneratedCommands.join(', \\\n  ')}, \\\n`);
+      ret.push({ text : `  /*   server_generated */ \\\n  ${serverGeneratedCommands.join(', \\\n  ')}, \\` });
     }
   })
-  return ret.concat('}\n');
+  return templateUtil.collectBlocks(ret, options, this);
 }
 
 /**

diff --git a/third_party/zap/repo b/third_party/zap/repo
+2 −0		Jenkinsfile
+1 −1		cypress/integration/attributes/check-validation.spec.js
+63 −0		cypress/integration/custom_xml/custom_xml.spec.js
+337 −0		cypress/integration/custom_xml/custom_xml_vendor.xml
+1,129 −1,126		docs/zap-schema.svg
+1 −1		package.json
+84 −61		src-electron/db/query-impexp.js
+7 −0		src-electron/generator/helper-endpointconfig.js
+3 −2		src-electron/generator/helper-zcl.js
+43 −6		src-electron/importexport/import-json.js
+0 −2		src-electron/rest/file-ops.js
+2 −3		src-electron/rest/user-data.js
+6 −6		src-electron/types/env-types.ts
+0 −3		src-electron/util/env.ts
+1 −1		src-electron/util/zcl-util.js
+1 −7		test/endpoint-config.test.js
+0 −20		test/tokens.test.js