bt-sensors-plugin-sk 1.1.0-beta.2.1.1 → 1.1.0-beta.2.1.3

package/README.md

@@ -3,7 +3,7 @@
 
 ## WHAT IT IS
 
-BT Sensors Plugin for Signalk is a lightweight BLE (Bluetooth Low Energy) framework for connecting to Bluetooth sensors on your boat and sending deltas to Signalk paths with the values the sensors reports. <br>
+BT Sensors Plugin for Signalk is a lightweight BLE (Bluetooth Low Energy) framework for listening and connecting to Bluetooth sensors on your boat and sending deltas to Signalk paths with the values the sensors reports. <br>
 
 The Plugin currently supports every documented Victron device (AC Charger, Battery Monitor, DC-DC Converter, DC Energy Meter, GX Device, Inverter, Inverter RS, Lynx Smart BMS, Orion XS, Smart Battery Protect, Smart Lithium and VE Bus),  Xiaomi devices, [ATC devices](https://github.com/atc1441/ATC_MiThermometer), RuuviTags and Inkbird thermometers.
 
@@ -71,7 +71,7 @@ Then press the + button to add a sensor. Your screen should look something like
 
 <br><br>
 
-Select the sensor you want to connect to from the drop down.<br>
+Select the sensor you want Signalk to listen to from the drop down.<br>
 
 If you don't see your device and you know that it's on and nearby to the server, it may not be currently supported. But fear not, you can add custom sensor classes yourself. (Check out [the development section](#development).). <br><br>
 

package/index.js

@@ -48,8 +48,8 @@ class MissingSensor  {
 	getDisplayName(){
 		return `OUT OF RANGE DEVICE (${this.getName()} ${this.getMacAddress()})`
 	}
-	disconnect(){}
-	connect(){}
+	stopListening(){}
+	listen(){}
 }
 module.exports =  function (app) {
 	const adapterID = 'hci0'
@@ -159,7 +159,7 @@ module.exports =  function (app) {
 	plugin.schema = {			
 		type: "object",
 		description: "NOTE: \n 1) Plugin must be enabled to configure your sensors. \n"+
-		"2) You will have to wait until the scanner has found and connected to your device before seeing your device's config fields and saving the configuration. \n"+
+		"2) You will have to wait until the scanner has found your device before seeing your device's config fields and saving the configuration. \n"+
 		"3) To refresh the list of available devices and their configurations, just open and close the config screen by clicking on the arrow symbol in the config's top bar. \n"+
 		"4) If you submit and get errors it may be because the configured devices have not yet all been discovered.",
 		required:["discoveryTimeout", "discoveryInterval"],
@@ -310,7 +310,7 @@ module.exports =  function (app) {
 		})
 		.catch((e)=>{
 			if (s)
-				s.disconnect()		
+				s.stopListening()		
 			app.debug(`Unable to communicate with device ${deviceNameAndAddress(config)} Reason: ${e?.message??e}`)
 			reject( e?.message??e )	
 		})})
@@ -346,22 +346,24 @@ module.exports =  function (app) {
 				if (deviceConfig.active) {
 					createPaths(deviceConfig)
 					initPaths(deviceConfig)
-					const result = Promise.resolve(deviceConfig.sensor.connect())
+					const result = Promise.resolve(deviceConfig.sensor.listen())
 					result.then(() => {
-						app.debug(`Connected to ${deviceConfig.sensor.getDisplayName()}`);
-						app.setPluginStatus(`Initial scan complete. Connected to ${++found} sensors.`);
+						app.debug(`Listening for changes from ${deviceConfig.sensor.getDisplayName()}`);
+						app.setPluginStatus(`Initial scan complete. Listening to ${++found} sensors.`);
 					})
 				}
 
 			})
 			.catch((error)=>
 				{
+					
 					const msg =`Sensor at ${deviceConfig.mac_address} unavailable. Reason: ${error}`
 					app.debug(msg)
 					app.debug(error)
 					app.setPluginError(msg)
 					deviceConfig.sensor=new MissingSensor(deviceConfig)
 					addSensorToList(deviceConfig.sensor) //add sensor to list with known options
+				
 				})
 		}
 		function findDevices (discoveryTimeout) {
@@ -439,13 +441,15 @@ module.exports =  function (app) {
 		plugin.stopped=true
 		plugin.uiSchema.peripherals['ui:disabled']=true
 		if ((sensorMap)){
+			plugin.schema.properties.peripherals.items.properties.mac_address.enum=[]
+			plugin.schema.properties.peripherals.items.properties.mac_address.enumNames=[]
 			sensorMap.forEach(async (sensor, mac)=> {
 				try{
-					await sensor.disconnect()
-					app.debug(`Disconnected from ${mac}`)
+					await sensor.stopListening()
+					app.debug(`No longer listening to ${mac}`)
 				}
 				catch (e){
-					app.debug(`Error disconnecting from ${mac}: ${e.message}`)
+					app.debug(`Error stopping listening to ${mac}: ${e.message}`)
 				}
 			})				
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.1.1",
+  "version": "1.1.0-beta.2.1.3",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/ATC.js

@@ -1,6 +1,12 @@
 const BTSensor = require("../BTSensor");
 class ATC extends BTSensor{
-
+    
+    constructor(device, config={}){
+        super(device,config)
+        if (config.parser){
+            this.parser=config.parser
+        }
+    }
     static async identify(device){
         try{
             const regex = /^ATC_[A-Fa-f0-9]{6}$/
@@ -15,22 +21,48 @@ class ATC extends BTSensor{
     }
   
     async init() {
-        await super.init() 
-        this.addMetadatum('temp','K', 'temperature',
-            (buff,offset)=>{return ((buff.readInt16LE(offset))/100) + 273.1})
-        this.addMetadatum('humidity','ratio', 'humidity',
-            (buff,offset)=>{return ((buff.readUInt16LE(offset))/10000)})
-        this.addMetadatum('voltage', 'V',  'sensor battery voltage',
-            (buff,offset)=>{return ((buff.readUInt16LE(offset))/1000)})
+        await super.init()
+        const md=this.addMetadatum('parser','','data parsing strategy')
+        md.isParam=true
+        md.enum=["ATC-LE","ATC-BE"]
+        if (!this.parser){
+            this.parser="ATC-LE"
+        }
+        this.initMetadata()
+    }
+    initMetadata(){
+        if (this.parser=="ATC-LE"){
+            this.addMetadatum('voltage', 'V',  'sensor battery voltage',
+                (buff)=>{return ((buff.readUInt16LE(10))/1000)})
+            this.addMetadatum('batteryStrength', 'ratio',  'sensor battery strength',
+                (buff)=>{return ((buff.readUInt8(12))/100)})
+            this.addMetadatum('temp','K', 'temperature',
+                (buff)=>{return parseFloat((273.15+(buff.readInt16LE(6))/100).toFixed(2))})
+            this.addMetadatum('humidity','ratio', 'humidity',
+                (buff)=>{return ((buff.readUInt16LE(8))/10000)})
+        
+            } else{
+                this.addMetadatum('voltage', 'V',  'sensor battery voltage',
+                    (buff)=>{return ((buff.readUInt16BE(10))/1000)})
+                this.addMetadatum('batteryStrength', 'ratio',  'sensor battery strength',
+                    (buff)=>{return ((buff.readUInt8(9))/100)})
+                this.addMetadatum('temp','K', 'temperature',
+                    (buff)=>{return parseFloat((273.15+(buff.readInt16BE(6))/100).toFixed(2))})
+                this.addMetadatum('humidity','ratio', 'humidity',
+                    (buff)=>{return ((buff.readUInt8(8))/100)})
+            
+            }
     }
     propertiesChanged(props){
         super.propertiesChanged(props)    
         const buff = this.getServiceData("0000181a-0000-1000-8000-00805f9b34fb")
         if (!buff)
             throw new Error("Unable to get service data for "+this.getDisplayName())
-        this.emitData("temp", buff, 6)
-        this.emitData("humidity", buff, 8)
-        this.emitData("voltage", buff, 10)
+        this.emitData("temp", buff)
+        this.emitData("humidity", buff)
+        this.emitData("voltage", buff)
+        this.emitData("batteryStrength", buff)
+        
     }                    
     getManufacturer(){
         return "ATC1441 (custom firmware see: https://github.com/atc1441)"

package/sensor_classes/BlackListedDevice.js

@@ -12,7 +12,13 @@ class BLACKLISTED extends BTSensor{
     reasonForBlacklisting() {
         switch ( this.getManufacturerID()){
             case (0x004C): return "Randomized MAC address"
+            case (0x02e1): return "Device is using VE.Smart" //NOTE: Victron/VictronSensor class 
+                                                             //determines if a device is using VE.Smart
+                                                             //in identify(). If so, identify() returns
+                                                             //BlackListedDevice
+        
             default: return ""
+            
         }
 
     }

package/sensor_classes/Inkbird.js

@@ -36,7 +36,7 @@ class Inkbird extends BTSensor{
             const data = this.getManufacturerData(key)
             if (!data)
                 throw new Error("Unable to get manufacturer data for "+this.getDisplayName())
-            this.emit("temp", (parseInt(key)/100) + 273.1);
+            this.emit("temp", parseFloat((273.15+parseInt(key)/100).toFixed(2))) ;
             this.emit('battery', data[5]/100)
             if (this.getMetadata().has('humidity')){
                 this.emit("temp", data.readUInt16LE(0)/100);

package/sensor_classes/RuuviTag.js

@@ -40,10 +40,10 @@ class RuuviTag extends BTSensor{
  **/
     _initModeV5(){
         this.addMetadatum("temp","K","temperature in Kelvin", 
-            (buffer)=>{ return (buffer.readInt16BE(1)*.005).toFixed(3)+273.15}
+            (buffer)=>{ return parseFloat((273.15+buffer.readInt16BE(1)*.005).toFixed(3))}
         )
         this.addMetadatum("humidity","ratio","humidity", 
-            (buffer)=>{ return ((buffer.readUInt16BE(3)*.0025)/100).toFixed(2)}
+            (buffer)=>{ return parseFloat(((buffer.readUInt16BE(3)*.0025)/100).toFixed(2))}
         )
         this.addMetadatum("pressure","Pa","atmospheric pressure", 
             (buffer)=>{ return buffer.readUInt16BE(5)+50000}
@@ -58,7 +58,7 @@ class RuuviTag extends BTSensor{
             (buffer)=>{ return buffer.readInt16BE(11)}
         )
         this.addMetadatum("battV","V","battery voltage", 
-            (buffer)=>{ return 1.6+(buffer.readUInt16BE(13)>>5)/1000}
+            (buffer)=>{ return parseFloat((1.6+(buffer.readUInt16BE(13)>>5)/1000).toFixed(2))}
         )
         this.addMetadatum("mc","","movement counter", 
             (buffer)=>{ return buffer.readUInt16BE(13) && 0x1F}

package/sensor_classes/Victron/VictronConstants.js

@@ -126,6 +126,8 @@ module.exports = {
     0xA06F: "BlueSolar MPPT 150|45 rev2",
     0xA070: "BlueSolar MPPT 150|60 rev2",
     0xA071: "BlueSolar MPPT 150|70 rev2",
+    0xA0F0: "Smart Lithium Battery 4 cells 12v 330AH",
+    0xA0EE: "Smart Lithium Battery",
     0xA102: "SmartSolar MPPT VE.Can 150/70",
     0xA103: "SmartSolar MPPT VE.Can 150/45",
     0xA104: "SmartSolar MPPT VE.Can 150/60",
@@ -193,6 +195,8 @@ module.exports = {
     0xA2A1: "Phoenix Inverter 12V 3000VA 230V",
     0xA2A2: "Phoenix Inverter 24V 3000VA 230V",
     0xA2A4: "Phoenix Inverter 48V 3000VA 230V",
+    0xA31A: "Blue Smart AC Charger IP67",
+    0xA33C: "Blue Smart AC Charger IP65",
     0xA340: "Phoenix Smart IP43 Charger 12|50 (1+1)",
     0xA341: "Phoenix Smart IP43 Charger 12|50 (3)",
     0xA342: "Phoenix Smart IP43 Charger 24|25 (1+1)",
@@ -201,6 +205,7 @@ module.exports = {
     0xA345: "Phoenix Smart IP43 Charger 12|30 (3)",
     0xA346: "Phoenix Smart IP43 Charger 24|16 (1+1)",
     0xA347: "Phoenix Smart IP43 Charger 24|16 (3)",
+    0xA350: "Phoenix Smart IP43 Charger 12|50 (1+1) 120-240V A350",
     0xA381: "BMV-712 Smart",
     0xA382: "BMV-710H Smart",
     0xA383: "BMV-712 Smart Rev2",

package/sensor_classes/Victron/VictronSensor.js

@@ -2,7 +2,8 @@ const BTSensor = require("../../BTSensor.js");
 const crypto = require('node:crypto');
 const int24 = require('int24')
 const util = require('util')
-const VC = require('./VictronConstants.js')
+const VC = require('./VictronConstants.js');
+const BLACKLISTED = require("../BlackListedDevice.js");
  
   class VictronSensor extends BTSensor{
 
@@ -17,10 +18,14 @@ const VC = require('./VictronConstants.js')
             const md = await this.getDeviceProp(device,'ManufacturerData')
             if (!md) return null   
             const data = md[0x2e1]
+            if (data.value[0]==0x2) { //VE.Smart is on
+                return BLACKLISTED
+            }
             if (data && data.value[0]==0x10 && data.value[4]==mode)
                 return this
-            else
+            else {
                 return null
+            }
         } catch (e){
             console.log(e)
             return null
@@ -28,20 +33,6 @@ const VC = require('./VictronConstants.js')
         
     }
 
-    getAuxModeAndCurrent(offset, decData=null){
-        if (decData==null){
-            decData=this.getManufacturerData(0x2e1)
-            if (this.encryptionKey)
-                decData=this.decrypt(decData)
-            else 
-                return {current:NaN, auxMode:NaN}
-        } 
-        const auxModeAndCurrent = int24.readInt24LE(decData,offset)
-        return {
-            current : (this.NaNif(auxModeAndCurrent >> 2,0x3FFFFF))/1000,
-            auxMode : auxModeAndCurrent & 0b11
-        }
-    }
 
     async init(){
         await super.init()
@@ -85,17 +76,21 @@ const VC = require('./VictronConstants.js')
     propertiesChanged(props){
         super.propertiesChanged(props)
         if (this.usingGATT()) return
+        
         try{
-            const buff = this.getManufacturerData(0x2e1)             
-            const decData=this.decrypt(buff)
-            this.emitValuesFrom(decData)
+            const md = this.getManufacturerData(0x2e1)
+            if (md.length && md[0]==0x10){
+                const buff = this.getManufacturerData(0x2e1)        
+                const decData=this.decrypt(buff)
+                this.emitValuesFrom(decData)
+            }
         }
         catch (error) {
             throw new Error(`Unable to read data from ${ this.getDisplayName()}: ${error}` )
         }
     }
 
-    initGATT(){
+    initGATTConnection(){
         throw new Error( "GATT Connection unimplemented for "+this.getDisplayName())
     }
 

package/sensor_classes/VictronACCharger.js

@@ -30,34 +30,37 @@ class VictronACCharger extends VictronSensor{
 
     async init(){
         await super.init()
+        this.initMetadata()
+    }
+    initMetadata(){
         this.addMetadatum('state','', 'device state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
         this.addMetadatum('error','', 'error code', 
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
  
         this.addMetadatum('batt1','V', 'battery 1 voltage',
-            (buff)=>{return this.NaNif((buff.readUInt16BE(2)>>3), 0x1FFF)/100})
+            (buff)=>{return this.NaNif((buff.readUInt16LE(2)&0x1FFF), 0x1FFF)/100})
 
         this.addMetadatum('curr1','A', 'battery 1 current',
             (buff)=>{return this.NaNif(buff.readUInt16BE(3)&0x7FF,0x7FF)/10})
 
         this.addMetadatum('batt2','V', 'battery 2 voltage',
-            (buff)=>{return this.NaNif((buff.readUInt16BE(5)>>3), 0x1FFF)/100})
+            (buff)=>{return this.NaNif((buff.readUInt16LE(5)&0x1FFF), 0x1FFF)/100})
 
         this.addMetadatum('curr2','A', 'battery 2 current',
             (buff)=>{return this.NaNif(buff.readUInt16BE(7)&0x7FF,0x7FF)/10})
 
         this.addMetadatum('batt3','V', 'battery 3 voltage',
-            (buff)=>{return this.NaNif((buff.readUInt16BE(8)>>3), 0x1FFF)/100})
+            (buff)=>{return this.NaNif((buff.readUInt16LE(8)&0x1FFF), 0x1FFF)/100})
 
         this.addMetadatum('curr3','A', 'battery 3 current',
             (buff)=>{return this.NaNif(buff.readUInt16BE(9)&0x7FF,0x7FF)/10})
     
         this.addMetadatum('temp', 'K', 'battery temperature',
-            (buff)=>{return this.NaNif(buff.readUInt8(11)>>1,0x7F)+233.15}) //-40 plus K conversion
+            (buff)=>{return this.NaNif(buff.readUInt8(11)&0x7F,0x7F)+233.15}) //-40 plus K conversion
 
         this.addMetadatum('acCurr','A', 'AC current',
-            (buff)=>{return this.NaNif((buff.readInt16BE(11))&0x1FFF,0x1FFF)})
+            (buff)=>{return this.NaNif((buff.readUInt16BE(11)&0x1FF),0x1FF)/10})
     }
 }
 module.exports=VictronACCharger

package/sensor_classes/VictronBatteryMonitor.js

@@ -1,15 +1,45 @@
+/**
+  
+ */
+
 const VictronSensor = require("./Victron/VictronSensor.js");
 const VC=require("./Victron/VictronConstants.js")
+const int24 = require('int24')
 class VictronBatteryMonitor extends VictronSensor{
 
 
     static async identify(device){
         return await this.identifyMode(device, 0x02)
     }
+    static _test(data, key){
+        var b = Buffer.from(data.replaceAll(" ",""),"hex")
+        const d = new this()
+
+        if (key) {
+            d.encryptionKey = key
+        
+        }
+        d.currentProperties = {}
+        d.currentProperties.ManufacturerData={}
+        d.currentProperties.ManufacturerData[0x02e1]=b
+        d.initMetadata() 
+        d.getPathMetadata().forEach((datum,tag)=>{
+                d.on(tag,(v)=>console.log(`${tag}=${v}`))
+        })
+        b = d.decrypt(b)
+        console.log(b)
+        d.emitValuesFrom(b)
+        d.removeAllListeners()
+    
+    }
 
     characteristics=[]
     async init(){
         await super.init()
+        this.initMetadata()
+    }
+
+    initMetadata(){
         this.addMetadatum('current', 'A', 'house battery amperage', 
             (buff,offset=0)=>{return buff.readInt32LE(offset)/1000},
             '6597ed8c-4bda-4c1e-af4b-551c4cf74769')
@@ -33,9 +63,13 @@ class VictronBatteryMonitor extends VictronSensor{
 
         this.addMetadatum( 'ttg','s','time to go', 
                 (buff,offset=0)=>{return this.NaNif(buff.readUInt16LE(offset),0xFFFF)*60},
-                '65970ffe-4bda-4c1e-af4b-551c4cf74769')    
-        const modecurrent = this.getAuxModeAndCurrent()
-        this.auxMode= modecurrent.auxMode
+                '65970ffe-4bda-4c1e-af4b-551c4cf74769')
+        if (this.encryptionKey){
+            const decData = this.decrypt(this.getManufacturerData(0x02e1))
+            if (decData)
+                this.auxMode=decData.readInt8(8)&0x3   
+        }
+
         switch(this.auxMode){
             case VC.AuxMode.STARTER_VOLTAGE:
                 this.addMetadatum('starterVoltage','V', 'starter battery voltage', 
@@ -50,14 +84,14 @@ class VictronBatteryMonitor extends VictronSensor{
 
             case VC.AuxMode.TEMPERATURE:
                 this.addMetadatum('temperature','K', 'House battery temperature', 
-                    (buff,offset=0)=>{return buff.readInt16LE(offset)/100},
+                    (buff,offset=0)=>{return (buff.readInt16LE(offset)/1000)+273.15},
                     '6597ed7d-4bda-4c1e-af4b-551c4cf74769')
                 break;
             default:
                 break
         }
     }
-
+    
     emitValuesFrom(decData){
         this.emitData("ttg",decData,0)
         this.emitData("voltage",decData,2);
@@ -65,10 +99,8 @@ class VictronBatteryMonitor extends VictronSensor{
         if (alarm>0){
             this.emit(
                 `ALARM #${alarm} from ${this.getDisplayName()})`, 
-                { message: AlarmReason.get(alarm), state: 'alert'})
+                { message: VC.AlarmReason.get(alarm), state: 'alert'})
         }
-        
-        this.emit("current", (this.getAuxModeAndCurrent(8,decData)).current)
         switch(this.auxMode){
         case VC.AuxMode.STARTER_VOLTAGE:
             this.emitData("starterVoltage",decData,6);
@@ -81,17 +113,19 @@ class VictronBatteryMonitor extends VictronSensor{
             break;
         default:
             break
-        }      
-        this.emit("consumed",decData.readInt16LE(11) / 10 ); //TODO this ain't right
-        var soc = decData.readUInt16LE(13)
-        this.emit("soc", ((soc & 0x3FFF) >> 4) / 1000)
+        }
+        this.emit("current", (this.NaNif(int24.readInt24LE(decData,  8)>>2,0x3FFFFF))/1000)  
+        this.emit("consumed",(this.NaNif(int24.readInt24LE(decData, 11)&0xFFFFF,0xFFFFF)) / 10) ; 
+        this.emit("soc", this.NaNif(((decData.readUInt16LE(13)& 0x3FFF)>>4),0x3FF)/1000)
+        
     }
     
-    initGATT() {
+    initGATTConnection() {
         return new Promise((resolve,reject )=>{
             if (!this.valueIfVariant(this.currentProperties.Paired))
                 reject(`${this.getName()} must be paired with the Signalk server to use GATT protocol`)
             this.device.connect().then(async ()=>{
+                this.debug(`${this.getName()} connected.`)
                 if (!this.gattServer) {
                     this.gattServer = await this.device.gatt()
                     this.gattService= await this.gattServer.getPrimaryService("65970000-4bda-4c1e-af4b-551c4cf74769")
@@ -133,9 +167,7 @@ class VictronBatteryMonitor extends VictronSensor{
         }})
         resolve(this)})
     }
-    propertiesChanged(props){
-        super.propertiesChanged(props)
-    }
+
     hasGATT(){
         return true
     }
@@ -144,14 +176,14 @@ class VictronBatteryMonitor extends VictronSensor{
         return "To use the GATT connection the SignalK server computer and the Smart Shunt must first be paired."
     }
 
-    async disconnect(){
-        super.disconnect()
+    async stopListening(){
+        super.stopListening()
         for (var c of this.characteristics){
             await c.stopNotifications()
         }
         if (await this.device.isConnected()){
-            console.log(`Disconnecting from ${ this.getMacAddress()}`)
             await this.device.disconnect()
+            this.debug(`Disconnected from ${ this.getName()}`)
         }
     }
 }

package/sensor_classes/VictronGXDevice.js

@@ -27,7 +27,7 @@ TBD
     }   
 
     async init() {
-        super.init()
+        await super.init()
         this.addMetadatum('voltage','V', 'channel #1 voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(0),0xFFFF)/100})
         this.addMetadatum('pvPower','W','DC input power in watts', 

package/sensor_classes/VictronSmartLithium.js

@@ -27,6 +27,9 @@ class VictronSmartLithium extends VictronSensor{
 
     async init() {
         await super.init()
+        this.initMetadata()
+    }
+    initMetadata(){
         function _toCellVoltage(val){    
             return val==0x7F?NaN:2.6+(val/100)
         }
@@ -34,29 +37,29 @@ class VictronSmartLithium extends VictronSensor{
                         (buff)=>{return buff.readUInt32BE(0)})
 
         this.addMetadatum('smartLithiumErrors','', 'Smart Lithium Errors Flags',
-            (buff)=>{return buff.readUInt16BE(3)})
+            (buff)=>{return buff.readUInt16BE(4)})
         this.addMetadatum('cell1Voltage','V', 'cell #1 voltage', 
-            (buff)=>{return _toCellVoltage((buff.readUInt8(5))>>1)})
+            (buff)=>{return _toCellVoltage((buff.readUInt8(6))>>1)})
         this.addMetadatum('cell2Voltage','V', 'cell #2 voltage', 
-            (buff)=>{return _toCellVoltage((buff.subarray(5,7).readUInt16BE())&0x01fe>>2)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(6))&0x01Fe)>>2)})
         this.addMetadatum('cell3Voltage','V', 'cell #3 voltage', 
-            (buff)=>{return _toCellVoltage(((buff.subarray(6,8).readUInt16BE())&0x03fe)>>3)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(7))&0x03Fe)>>3)})
         this.addMetadatum('cell4Voltage','V', 'cell #4 voltage', 
-            (buff)=>{return _toCellVoltage(((buff.subarray(7,9).readUInt16BE())&0x07fe)>>4)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(8))&0x07fe)>>4)})
         this.addMetadatum('cell5Voltage','V', 'cell #5 voltage', 
-            (buff)=>{return _toCellVoltage(((buff.subarray(8,10).readUInt16BE())&0x0ffe)>>5)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(9))&0x0ffe)>>5)})
         this.addMetadatum('cell6Voltage','V', 'cell #6 voltage', 
-            (buff)=>{return _toCellVoltage(((buff.subarray(9,11).readUInt16BE())&0x1ffe)>>6)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(10))&0x1ffe)>>6)})
         this.addMetadatum('cell7Voltage','V', 'cell #7 voltage', 
-            (buff)=>{return _toCellVoltage(((buff.subarray(10,12).readUInt16BE())&0x3ffe)>>7)})
+            (buff)=>{return _toCellVoltage(((buff.readUInt16BE(11))&0x3ffe)>>7)})
         this.addMetadatum('cell8Voltage','V', 'cell #8 voltage', 
-            (buff)=>{return _toCellVoltage((buff.readUInt8(11))&0x7f)})
+            (buff)=>{return _toCellVoltage((buff.readUInt8(12))&0x7e)})
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
-            (buff)=>{return this.NaNif((buff.readUInt16BE(14)>>4),0xFFF)/100})
+            (buff)=>{return this.NaNif((buff.readUInt16LE(13)&0xFFF),0xFFF)/100})
         this.addMetadatum('balancerStatus','', 'balancer status', //TODO
-            (buff)=>{return this.NaNif((buff.readUInt16BE(14)&0xf),0xF)})
+            (buff)=>{return this.NaNif((buff.readUInt8(14)&0xf),0xF)})
         this.addMetadatum('batteryTemp','K', 'battery temperature', 
-            (buff)=>{return this.NaNif((buff.readInt8(15)>>1),0x7F)+233.15})          
+            (buff)=>{return this.NaNif((buff.readUInt8(15)&0x7F),0x7F)+233.15})          
     }
 }
 module.exports=VictronSmartLithium

package/sensor_classes/VictronSolarCharger.js

@@ -8,22 +8,23 @@ class VictronSolarCharger extends VictronSensor{
 
     async init() {
         await super.init()
-
-        this.addMetadatum('chargeState','', 'charge state', 
-            (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
-        this.addMetadatum('chargerError','', 'charger error',
-            (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
-        this.addMetadatum('voltage','V', 'charger battery voltage', 
-            (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
-        this.addMetadatum('current','A','charger battery current', 
-            (buff)=>{return this.NaNif(buff.readInt16LE(4),0x7FFF)/10})
-        this.addMetadatum('yield','Wh', 'yield today in Watt-hours', 
-            (buff)=>{return this.NaNif(buff.readUInt16LE(6),0xFFFF)*10})
-        this.addMetadatum('solarPower','W', 'solar power', 
-            (buff)=>{return this.NaNif(buff.readUInt16LE(8),0xFFFF)})    
-        this.addMetadatum('externalDeviceLoad','A', 'external device load', 
-            (buff)=>{return this.NaNif(buff.readUInt16BE(10)>>7,0x1FF)})    
-        }
-
+        this.initMetadata()
+    }
+    initMetadata() { 
+    this.addMetadatum('chargeState','', 'charge state', 
+        (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
+    this.addMetadatum('chargerError','', 'charger error',
+        (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
+    this.addMetadatum('voltage','V', 'charger battery voltage', 
+        (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
+    this.addMetadatum('current','A','charger battery current', 
+        (buff)=>{return this.NaNif(buff.readInt16LE(4),0x7FFF)/10})
+    this.addMetadatum('yield','Wh', 'yield today in Watt-hours', 
+        (buff)=>{return this.NaNif(buff.readUInt16LE(6),0xFFFF)*10})
+    this.addMetadatum('solarPower','W', 'solar power', 
+        (buff)=>{return this.NaNif(buff.readUInt16LE(8),0xFFFF)})    
+    this.addMetadatum('externalDeviceLoad','A', 'external device load', 
+        (buff)=>{return this.NaNif(buff.readUInt16BE(10)>>7,0x1FF)})    
+    }
 }
 module.exports=VictronSolarCharger 

package/sensor_classes/XiaomiMiBeacon.js

@@ -105,7 +105,7 @@ class XiaomiMiBeacon extends BTSensor{
     getGATTDescription() {
         return this.GATTwarning
     }
-    initGATT(){
+    initGATTConnection(){
         if (!this?.gattWarningDelivered) {
             this.debug(this.GATTwarning.toUpperCase())
             this.gattWarningDelivered=true
@@ -212,15 +212,15 @@ class XiaomiMiBeacon extends BTSensor{
         return this?.name??`${dt.name} ${dt.model}`
     }
 
-    async disconnectGattCharacteristic(){
+    async disconnectGATTCharacteristic(){
         if (this.gattCharacteristic  && await this.gattCharacteristic.isNotifying()) {
             await this.gattCharacteristic.stopNotifications()
             this.gattCharacteristic=null
         }
     }
-    async disconnect(){
-        super.disconnect()
-        await this.disconnectGattCharacteristic()
+    async stopListening(){
+        super.stopListening()
+        await this.disconnectGATTCharacteristic()
        
         if (await this.device.isConnected()){
                await this.device.disconnect()