Merge pull request #144 from tecimovic/silabs

Silabs
project-chip · May 7, 2021 · f035d8d · f035d8d
2 parents e3a60c2 + aa6d481
commit f035d8d
Show file tree

Hide file tree

Showing 77 changed files with 3,563 additions and 2,232 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,6 +42,7 @@ module.exports = {
     'no-implicit-globals': 'error',
     'block-scoped-var': 'error',
     'vars-on-top': 'error',
+    'guard-for-in': 'error',
 
     'import/first': 'off',
     'import/named': 'error',

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -364,7 +364,8 @@ pipeline
                                      remoteJenkinsName: 'jnkaus016',
                                      shouldNotFailBuild: true,
                                      useCrumbCache: true,
-                                     useJobInfoCache: true
+                                     useJobInfoCache: true,
+                                     disabled: true
                 }
             }
         }

diff --git a/apack.info b/apack.info
@@ -4,7 +4,7 @@ label=Zigbee Cluster Configurator
 description=Graphical configuration tool for application and libraries based on Zigbee Cluster Library.
 path=.,node_modules/.bin/,ZAP.app/Contents/MacOS
 requiredFeatureLevel=apack.core:8
-featureLevel=30
+featureLevel=35
 
 id=zclConfigurator
 

diff --git a/apack.json b/apack.json
@@ -4,7 +4,7 @@
   "description": "Graphical configuration tool for application and libraries based on Zigbee Cluster Library.",
   "path": [".", "node_modules/.bin/", "ZAP.app/Contents/MacOS"],
   "requiredFeatureLevel": "apack.core:8",
-  "featureLevel": 30,
+  "featureLevel": 35,
   "uc.triggerExtension": "zap",
   "executable": {
     "zap:win32.x86_64": {

diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "zap",
   "version": "0.99.6",
-  "featureLevel": 30,
   "description": "Configuration tool for the Zigbee Cluster Library",
   "productName": "zap",
   "cordovaId": "",
@@ -28,6 +27,7 @@
     "test:unit:watchAll": "jest --watchAll",
     "postinstall": "electron-builder install-app-deps && husky install",
     "zap": "node src-script/zap-start.js --logToStdout --gen ./test/gen-template/zigbee/gen-templates.json",
+    "zap-dev": "npm run build-spa && quasar dev -m electron",
     "zap-devserver": "node src-script/zap-start.js server --allowCors --logToStdout --gen ./test/gen-template/zigbee/gen-templates.json --reuseZapInstance",
     "server": "node src-script/zap-start.js server --logToStdout --gen ./test/gen-template/zigbee/gen-templates.json --reuseZapInstance",
     "stop": "node src-script/zap-start.js stop --reuseZapInstance",

diff --git a/src-electron/db/db-api.js b/src-electron/db/db-api.js
@@ -157,7 +157,7 @@ async function dbRemove(db, query, args) {
  * @param {*} db
  * @param {*} query
  * @param {*} args
- * @returns A promise that resolves without an argument, or rejects with an error from the query.
+ * @returns A promise that resolves with a number of changed rows, or rejects with an error from the query.
  */
 async function dbUpdate(db, query, args) {
   return new Promise((resolve, reject) => {
@@ -167,7 +167,7 @@ async function dbUpdate(db, query, args) {
         reject(err)
       } else {
         env.logSql(`Executed update: ${query}: ${args}`)
-        resolve()
+        resolve(this.changes)
       }
     })
   })

diff --git a/src-electron/db/db-mapping.js b/src-electron/db/db-mapping.js
@@ -65,6 +65,7 @@ exports.map = {
     if (x == null) return undefined
     return {
       id: x.CLUSTER_ID,
+      packageRef: x.PACKAGE_REF,
       code: x.CODE,
       manufacturerCode: x.MANUFACTURER_CODE,
       label: x.NAME,
@@ -80,6 +81,7 @@ exports.map = {
     return {
       id: x.ATTRIBUTE_ID,
       clusterRef: x.CLUSTER_REF,
+      packageRef: x.PACKAGE_REF,
       code: x.CODE,
       clusterCode: x.CLUSTER_CODE,
       manufacturerCode: x.MANUFACTURER_CODE,
@@ -104,6 +106,7 @@ exports.map = {
     return {
       id: x.COMMAND_ID,
       clusterRef: x.CLUSTER_REF,
+      packageRef: x.PACKAGE_REF,
       code: x.CODE,
       manufacturerCode: x.MANUFACTURER_CODE,
       label: x.NAME,