Trim null characters on spaces when searching for zigbee model. Koenk…

…k/zigbee2mqtt#810
Koenkk · Jan 14, 2019 · 489a23c · 489a23c · qm3ster · Jan 14, 2019
1 parent aa32156
commit 489a23c
Show file tree

Hide file tree

Showing 6 changed files with 282 additions and 99 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ install:
   - npm install
 
 script:
+  - npm test
   - npm run verify
   - npm run eslint
 

diff --git a/converters/toZigbee.js b/converters/toZigbee.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const utils = require('./utils');
-const zclId = require('@zigbee/zcl-id');
+const zclId = require('zcl-id');
 
 const cfg = {
     default: {

diff --git a/index.js b/index.js
@@ -13,7 +13,15 @@ for (const device of devices) {
 
 module.exports = {
     devices,
-    findByZigbeeModel: (model) => byZigbeeModel.get(model),
+    findByZigbeeModel: (model) => {
+        let device = byZigbeeModel.get(model);
+
+        if (!device) {
+            device = byZigbeeModel.get(model.replace(/\0.*$/g,'').trim());
+        }
+
+        return device;
+    },
     toZigbeeConverters: toZigbee,
     fromZigbeeConverters: fromZigbee,
 };