bt-sensors-plugin-sk 1.1.0-beta.2.1.4.2 → 1.1.0-beta.2.1.4.5

package/index.js

@@ -1,6 +1,8 @@
 const fs = require('fs')
 const util = require('util')
 const path = require('path')
+const packageInfo = require("./package.json")
+
 const {createBluetooth} = require('node-ble')
 const {bluetooth, destroy} = createBluetooth()
 
@@ -152,8 +154,8 @@ module.exports =  function (app) {
 		classMap = utilities_sk.loadClasses(path.join(__dirname, 'sensor_classes'))
 	}
 
-	app.debug('Loading plugin')
-	
+	app.debug(`Loading plugin ${packageInfo.version}`)	
+
 	plugin.schema = {			
 		type: "object",
 		description: "NOTE: \n 1) Plugin must be enabled to configure your sensors. \n"+
@@ -414,7 +416,7 @@ module.exports =  function (app) {
 			if (plugin.schema.properties.peripherals.items.dependencies)
 				plugin.schema.properties.peripherals.items.dependencies.mac_address.oneOf=[]
 		} else {
-			app.debug('Plugin build Beta 2.4.1.2 started');
+			app.debug(`Loading plugin ${packageInfo.version} started` )
 			
 		}
 		starts++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.1.4.2",
+  "version": "1.1.0-beta.2.1.4.5",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic, Mopeka tank reader and preliminary support for Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/GoveeTH.js

@@ -36,6 +36,7 @@ class GoveeTH extends BTSensor{
 
     async init(){
         await super.init()
+        this.initMetadata()
     }
     initMetadata(){
         this.addMetadatum('temp','K', 'temperature')
@@ -63,4 +64,4 @@ class GoveeTH extends BTSensor{
         }
    }                         
 }
-module.exports=GoveeTH
+module.exports=GoveeTH

package/sensor_classes/Victron/VictronSensor.js

@@ -1,11 +1,6 @@
 const BTSensor = require("../../BTSensor.js");
 const crypto = require('node:crypto');
-const int24 = require('int24')
-const util = require('util')
 const VC = require('./VictronConstants.js');
-const BLACKLISTED = require("../BlackListedDevice.js");
-const { resolve } = require("node:path");
-const { setMaxIdleHTTPParsers } = require("node:http");
 function sleep(x) {
     return new Promise((resolve) => {
       setTimeout(() => {
@@ -20,7 +15,6 @@ function sleep(x) {
         this.encryptionKey = config?.encryptionKey
     }
     
-    
     static async identifyMode(device, mode){
             
         var md = await this.getDeviceProp(device,'ManufacturerData')
@@ -54,15 +48,10 @@ function sleep(x) {
                 return null
         } 
     }
-    
-
 
     async init(){
         await super.init()
-        var md = this.addMetadatum('encryptionKey','', "Encryption Key")
-        md.isParam = true
-        this.metadata = new Map(super.getMetadata())
-        md = this.addMetadatum('encryptionKey','', "Encryption Key")
+        const md =this.addMetadatum('encryptionKey','', "Encryption Key")
         md.isParam = true
         this.model_id=this.getManufacturerData(0x2e1).readUInt16LE(2)
     }

package/sensor_classes/VictronACCharger.js

@@ -35,7 +35,7 @@ class VictronACCharger extends VictronSensor{
     initMetadata(){
         this.addMetadatum('state','', 'device state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
-        this.addMetadatum('error','', 'error code', 
+        this.addMetadatum('chargerError','', 'charger error code', 
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
  
         this.addMetadatum('batt1','V', 'battery 1 voltage')
@@ -67,7 +67,7 @@ class VictronACCharger extends VictronSensor{
         this.emit("batt3",  this.NaNif(br.read_unsigned_int(13),0x1FFF)/100)
         this.emit("curr3", this.NaNif(br.read_unsigned_int(11),0x7FF)/10)
         this.emit("temp", this.NaNif(br.read_unsigned_int(7),0x7F)+233.15)
-        this.emit("acCurr", this.NaNif(br.read_unsigned_int(9),0x1FF)/10)
+        this.emit("acCurr", this.NaNif(br.read_unsigned_int(9),0x1FF)/100)
     }
 }
-module.exports=VictronACCharger
+module.exports=VictronACCharger

package/sensor_classes/VictronSmartLithium.js

@@ -16,10 +16,19 @@ Start Bit	Nr of Bits	Meaning	Units	Range	NA Value	Remark
 152	7	Battery temperature	1°C	-40..86 °C	0x7F	VE_REG_BAT_TEMPERATURE Temperature = Record value - 40
 159	1	Unused				
 VE_REG_BATTERY_CELL_VOLTAGE 0x00 ( 0) when cell voltage < 2.61V 0x01 ( 1) when cell voltage == 2.61V 0x7D (125) when cell voltage == 3.85V 0x7E (126) when cell voltage > 3.85 0x7F (127) when cell voltage is not available / unknown
-*/const VictronSensor = require ("./Victron/VictronSensor") 
+*/
+
+const VictronSensor = require ("./Victron/VictronSensor") 
 const VC = require("./Victron/VictronConstants")
 const BitReader = require("./_BitReader")
 
+const BALANCERSTATUS = {
+    0:"Unknown",
+    1:"Balanced",
+    2:"Balancing",
+    3:"Cell imbalance",
+    0xF:"Not applicable"
+}
 function _toCellVoltage(val){    
     return val==0x7F?NaN:2.6+(val/100)
 }
@@ -51,15 +60,15 @@ class VictronSmartLithium extends VictronSensor{
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
             (buff)=>{return this.NaNif((buff.readUInt16LE(13)&0xFFF),0xFFF)/100})
         this.addMetadatum('balancerStatus','', 'balancer status', //TODO
-            (buff)=>{return this.NaNif((buff.readUInt8(14)>>4),0xF)})
+            (buff)=>{return BALANCERSTATUS[this.NaNif((buff.readUInt8(14)>>4),0xF)]})
         this.addMetadatum('batteryTemp','K', 'battery temperature', 
             (buff)=>{return this.NaNif((buff.readUInt8(15)&0x7F),0x7F)+233.15})          
     }
     emitValuesFrom(buffer){
         super.emitValuesFrom(buffer)
         const br = new BitReader(buffer.subarray(6,13))
-        for (let i = 1; i<8; i++)
+        for (let i = 0; i<8; i++)
             this.emit(`cell${i+1}Voltage`,_toCellVoltage(br.read_unsigned_int(7)))
     }
 }
-module.exports=VictronSmartLithium
+module.exports=VictronSmartLithium