@signalk/vedirect-serial-usb 1.4.0 → 1.5.0

package/index.js

@@ -37,13 +37,13 @@ module.exports = function (app) {
     } else {
       if (options.device) {
         oldConfig = {vedirect: [{device: 'Serial', connection: options.device, ignoreChecksum: options.ignoreChecksum,
-          mainBatt: options.mainBatt, auxBatt: options.auxBatt, solar: options.solar}]}
+          mainBatt: options.mainBatt, auxBatt: options.auxBatt, bmv: options.bmv, solar: options.solar}]}
       } else if (options.udpPort) {
         oldConfig = {vedirect: [{device: 'UDP', port: options.udpPort, ignoreChecksum: options.ignoreChecksum,
-          mainBatt: options.mainBatt, auxBatt: options.auxBatt, solar: options.solar}]}
+          mainBatt: options.mainBatt, auxBatt: options.auxBatt, bmv: options.bmv, solar: options.solar}]}
       } else if (options.host) {
         oldConfig = {vedirect: [{device: 'TCP', connection: options.host, port: options.tcpPort, ignoreChecksum: options.ignoreChecksum,
-          mainBatt: options.mainBatt, auxBatt: options.auxBatt, solar: options.solar}]}
+          mainBatt: options.mainBatt, auxBatt: options.auxBatt, bmv: options.bmv, solar: options.solar}]}
       }
       parser[0] = new Parser(oldConfig)
 
@@ -139,6 +139,11 @@ module.exports = function (app) {
               title: 'Aux Battery name in SK path',
               default: 'Starter'
             },
+            bmv: {
+              type: 'string',
+              title: 'BMV name in SK path',
+              default: 'bmv'
+            },
             solar: {
               type: 'string',
               title: 'Solar name in SK path',

package/lib/Parser.js

@@ -7,6 +7,7 @@ const defaults = {
   defaultUnitId: 'victronDevice',
   mainBatt: 'house',
   auxBatt: 'starter',
+  bmv: 'bmv',
   solar: 'solar'
 }
 
@@ -358,6 +359,10 @@ class VEDirectParser extends EventEmitter {
             unitID = this.options.vedirect[items].auxBatt
           }
 
+          if (field.unitId === 'bmv' && this.options.hasOwnProperty('bmv')) {
+            unitID = this.options.vedirect[items].bmv
+          }
+
           if (field.unitId === 'solar' && this.options.hasOwnProperty('solar')) {
             unitID = this.options.vedirect[items].solar
           }

package/lib/fields.js

@@ -241,6 +241,8 @@ module.exports = {
   RELAY: {
     name: 'relay',
     type: 'boolean',
+    path: 'electrical.batteries.*.relay',
+    unitId: 'bmv',
     value (value) {
       value = value.toUpperCase()
       return value === 'ON' ? 1 : 0

package/lib/tcp.js

@@ -4,6 +4,7 @@ let client = [];
 function makeConnection(host, port, debug, items) {
   client[items] = new Net.Socket();
   client[items].connect({ port: port, host: host });
+  client[items].setTimeout(5000);
   debug(`Connection to ${host}:${port}`);
   return client[items]
 }
@@ -17,9 +18,8 @@ function onClose(host, port, parser, debug, items) {
   if(client[items]) {
     setTimeout(() => {
       debug('Trying to reconnect');
-      client[items].destroy();
       module.exports.connect(host, port, parser, debug, items);
-    }, 10000)
+    }, 10000);
   }
 }
 
@@ -31,11 +31,17 @@ module.exports = {
     });
     client[items].on('close', () => {
       debug('TCP connection closed');
+      client[items].destroy();
       onClose(host, port, parser, debug, items);
     });
     client[items].on('error', () => {
       debug('TCP connection error');
+      client[items].destroy();
     });
+    client[items].on('timeout', () => {
+      debug('TCP connection timeout');
+      client[items].destroy();
+    }); 
   },
   close: (debug, items) => {
     if (client[items]) {

package/migration.js

@@ -19,6 +19,7 @@ fs.readFile(path.resolve(jsonPath, 'vedirect-signalk.json'), 'UTF-8', (err, data
         'ignoreChecksum': obj.configuration.ignoreChecksum,
         'mainBatt': obj.configuration.mainBatt,
         'auxBatt': obj.configuration.auxBatt,
+        'bmv': obj.configuration.bmv,
         'solar': obj.configuration.solar
       }]
     } else if (obj.configuration.udpPort) {
@@ -29,6 +30,7 @@ fs.readFile(path.resolve(jsonPath, 'vedirect-signalk.json'), 'UTF-8', (err, data
         'ignoreChecksum': obj.configuration.ignoreChecksum,
         'mainBatt': obj.configuration.mainBatt,
         'auxBatt': obj.configuration.auxBatt,
+        'bmv': obj.configuration.bmv,
         'solar': obj.configuration.solar
       }]
     } else if (obj.configuration.host) {
@@ -39,6 +41,7 @@ fs.readFile(path.resolve(jsonPath, 'vedirect-signalk.json'), 'UTF-8', (err, data
         'ignoreChecksum': obj.configuration.ignoreChecksum,
         'mainBatt': obj.configuration.mainBatt,
         'auxBatt': obj.configuration.auxBatt,
+        'bmv': obj.configuration.bmv,
         'solar': obj.configuration.solar
       }]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/vedirect-serial-usb",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Signal K Node.js server plugin to read VE.Direct data via serial USB",
   "main": "index.js",
   "scripts": {

package/standalone.js

@@ -30,6 +30,7 @@ class VEDirect extends EventEmitter {
         ignoreChecksum: true,
         mainBatt: 'House',
         auxBatt: 'Starter',
+        bmv: 'bmv',
         solar: 'Main',
         ...(config || {}),
       }
@@ -64,4 +65,4 @@ class VEDirect extends EventEmitter {
   }
 }
 
-module.exports = VEDirect
+module.exports = VEDirect