bt-sensors-plugin-sk 1.2.2 → 1.2.4-1

package/BTSensor.js

@@ -107,6 +107,7 @@ class BTSensor extends EventEmitter {
         unknown: { name: "unknown", description: "Unknown sensor domain "},
         environmental: { name: "environmental", description: "Sensors that measure environmental conditions - air temperature, humidity etc."},
         electrical: { name: "electrical", description: "Electrical sensor - chargers, batteries, inverters etc."},
+        propulsion: { name: "propulsion", description: "Sensors that measure engine state"},
         tanks: { name: "tanks", description: "Sensors that measure level in tanks (gas, propane, water etc.) "}
     }
     static Domain = this.SensorDomains.unknown   
@@ -465,13 +466,41 @@ class BTSensor extends EventEmitter {
         throw new Error("::initGATTNotifications() should be implemented by the BTSensor subclass")
     }
 
-    deviceConnect() {
+    deviceConnect(reconnect=false) {
 
      
         return connectQueue.enqueue( async ()=>{
             this.debug(`Connecting... ${this.getName()}`)
-            await this.device.connect()
+            await this.device.helper.callMethod('Connect')
+
             this.debug(`Connected to ${this.getName()}`)
+            if (!reconnect) {
+                this.device.helper.on('PropertiesChanged',  (propertiesChanged) => {
+                    if ('Connected' in propertiesChanged) {
+                        const { value } = propertiesChanged.Connected
+                        if (value) {
+                            this.device.emit('connect', { connected: true })
+                        } else {
+                            this.device.emit('disconnect', { connected: false })
+                        }
+                    }
+                })
+                this.device.on("disconnect", ()=>{
+                        if (this.isActive()) {
+                        this.debug(`Device disconnected. Attempting to reconnect to ${this.getName()}`)  
+                            try {        
+                            this.deviceConnect(true).then(()=>{
+                                this.debug(`Device reconnected -- ${this.getName()}`)  
+                            })
+                            }
+                            catch (e) {
+                                this.setPluginError( `Error while reconnecting to ${this.getName()}: ${e.message}`)
+                                this.debug( `Error while reconnecting to ${this.getName()}: ${e.message}`)
+                                this.debug(e)
+                            }
+                        }
+                    })     
+                }
 
             try {
 

package/README.md

@@ -1,13 +1,25 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
-# Version 1.2.2
+# Version 1.2.4-1
 
-## WHAT'S NEW SINCE VERSION 1.2.1
+## WHAT'S NEW  
+
+- **NEW SENSOR** [Bank Manager](https://marinedcac.com/pages/bankmanager) (tested) 
+- **NEW SENSOR** [Mercury Smartcraft](https://www.mercurymarine.com/us/en/gauges-and-controls/displays/smartcraft-connect) (untested)
+- Fixed Govee 5075 parsing
+- Added defaults for Renogy Rover Client
+- Automatic reconnect for GATT connected devices
+
+### Version 1.2.3
+
+Bug fixes Remoran Wave.3, JunctekBMS, and ShenzhenLiOn
+
+### Version 1.2.2
 
 - Junctek BMS and Remoran Wave 3 support (Note: both are not currently field tested)
 
 - Fixes to ShenzhenLiOn BMS, Victron Orion XS, Victron DC DC Converter, Victron Smart Lithium Classes
 
-## WHAT'S NEW SINCE VERSION 1.1.x
+### Version 1.2.1
 
 - Dynamic configuration screen. The Device list automatically updates when new devices are found by the BT scanner. (No more annoying screen refresh necessary!). 
 
@@ -53,7 +65,7 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
 |[Lancol](www.Lancol.com)| [Micro 10C 12V Car Battery Monitor](https://www.lancol.com/product/12v-bluetooth-4-0-battery-tester-micro-10-c/)|
 |[Junctek](https://www.junteks.com)|[Junctek BMS](https://www.junteks.com/pages/product/index) |
 |[Remoran](https://remoran.eu)| [Remoran Wave.3](https://remoran.eu/wave.html)|
-
+|[AC DC Systems](https://marinedcac.com) | [Bank Manager] hybrid (Pb and Li) charger(https://marinedcac.com/pages/bankmanager)|
 
 ### Environmental 
 | Manufacturer |  Devices | 
@@ -76,6 +88,13 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
 | [Gobius](https://gobiusc.com/) | Gobius-C Tank level sensor|
 | [Mopeka](https://www.mopeka.com) | [Mopeka Pro Chek](https://mopeka.com/product-category/recreational-sensors-rv-bbq-etc/) ultrasonic tank level sensor  |
 
+### Propulsion
+| Manufacturer |  Devices | 
+|--------------|----------|
+| [Mercury](https://www.mercurymarine.com)| [Mercury Smartcraft](https://www.mercurymarine.com/us/en/gauges-and-controls/displays/smartcraft-connect) connect engine sensor|
+
+
+
 
 ## WHO IT'S FOR
 
@@ -132,16 +151,27 @@ Finally, restart SK. Plugin should appear in your server plugins list.<br>
 
 ## KNOWN ISSUES
 
+### Connected Devices on Raspberry Pi platform (4/4b/5/CM400/CM500)
+
+Onboard Raspberry Pi WiFi can cause interference with the onboard Bluetooth resulting in lost connections to GATT connected devices (Renogy, JBD, etc. )
+
+One simple solution is to install a USB BT adapter like the [Tp-link UB500-Plus](https://www.tp-link.com/us/home-networking/usb-adapter/ub500-plus/) 
+
+### USB 3.0 and HDMI interference
+
+Poorly shielded USB 3.0 and HDMI (5ghz) can interfere with BT transmission (2.4ghz).
+
 ### Configuration Panel
 
 - Safari 18.1 on OsX produces errors on load that kill the configuration screen. No known cause. Upgrade to most recent Safari or use Chrome.
 - Unsaved sensor configuration changes are lost after selecting a different sensor. Be sure to Save changes for now.
-- Renogy Rover Client, Victron GX, Victron Smart Battery Protect, and Victron VE Bus sensor classes have no default paths currently. Users will need to manually input.
+- Victron GX, Victron Smart Battery Protect, and Victron VE Bus sensor classes have no default paths currently. Users will need to manually input.
 
 ### Runtime
 
 - IMPORTANT Set `Scan for new devices interval` to `0` after configuration is complete. The plugin will run but in Bluetooth-rich environments, or if you have a long range BT 5.3 device, the system Bluetooth stack may fail after 4 hours or so.
 - There's no way that I know of to remove a SK Path without restarting the server. So if any active paths are changed by the plugin, you'll still see them hanging around in the data browser growing stale until you restart the server.
+- RPi 3/4/5/CM400s when running an Access Point on the on board Wifi can cause a problem connecting to devices through the onboard BT. The only known fix is to disable the onboard Bluetooth and use a USB BT adapter. Alternatively, you can use a USB WiFi adapter. NOTE: This only applies to _connected_ devices like Renogy devices, LiTime batteries etc. 
 
 ## CONFIGURATION
 

package/index.js

@@ -409,8 +409,10 @@ module.exports =   function (app) {
 			try{
 				const c = await getClassFor(device,config)
 				c.debug=app.debug
+				
 				const sensor = new c(device, config?.params, config?.gattParams)
 				sensor.debug=app.debug
+				sensor.setPluginError=app.setPluginError
 				sensor.app=app
 				sensor._adapter=adapter //HACK!
 				await sensor.init()				
@@ -420,7 +422,8 @@ module.exports =   function (app) {
 				const msg = `Unable to instantiate ${await BTSensor.getDeviceProp(device,"Address")}: ${error.message} `
 				app.debug(msg)
 				app.debug(error)
-				app.setPluginError(msg)
+				if (config.active) 
+					app.setPluginError(msg)
 				return null
 			}
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.2",
-  "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk for a list of supported classes",
+  "version": "1.2.4-1",
+  "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk#supported-sensors for a list of supported sensors",
   "main": "index.js",
   "dependencies": {
     "@rjsf/bootstrap-4": "^5.24.11",

package/sensor_classes/BankManager.js

@@ -0,0 +1,96 @@
+const BTSensor = require("../BTSensor");
+
+class BankManager extends BTSensor{
+
+    static Domain = BTSensor.SensorDomains.electrical
+    static async  identify(device){
+
+        const name = await this.getDeviceProp(device,"Name")
+        const regex = /^BankManager*[0-9]{2}/
+ 
+        if (name && name.match(regex))  
+            return this
+        else
+            return null
+        
+    }
+    initSchema(){
+        super.initSchema()
+
+        this.addDefaultParam("id")
+            .default="bankManager"
+
+        this.addMetadatum('liVoltage','V','Lithium Voltage')
+            .default="electrical.batteries.{id}.voltage.lithium"
+        this.addMetadatum('pbVoltage','V','Lead Voltage')
+            .default="electrical.batteries.{id}.voltage.lead"
+        this.addMetadatum('current','A','total current')
+            .default="electrical.batteries.{id}.current"
+        this.addMetadatum('soc','ratio','state of charge')
+            .default="electrical.batteries.{id}.soc"
+        this.addMetadatum('connectionStatus','','Connection Status')
+            .default="electrical.batteries.{id}.connectionStatus"
+
+    }
+
+    getManufacturer(){
+        return "Bank Manager"
+    }
+    hasGATT(){
+        return false
+    }
+    usingGATT(){
+        return true
+    }
+    emitDataFrom(buffer){
+        let data=buffer.toString().split(",")
+        this.emit("liVoltage", parseFloat(data[1]))
+        this.emit("pbVoltage", parseFloat(data[2]))
+        this.emit("current", parseFloat(data[3])) 
+        this.emit("soc", parseFloat(data[4])/100) 
+        this.emit("connectionStatus", parseInt(data[5])) 
+
+    }
+    emitGATT(){
+    
+    }
+
+
+    initGATTConnection(){ 
+        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
+            if (!this.gattServer) { 
+                this.gattServer = await this.device.gatt() 
+                this.service = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
+                this.characteristic = await this.service.getCharacteristic("0000ffe1-0000-1000-8000-00805f9b34fb")
+             } 
+            resolve(this)
+             }) .catch((e)=>{ reject(e.message) }) }) 
+    }
+
+    initGATTNotifications() { 
+        Promise.resolve(this.characteristic.startNotifications().then(()=>{   
+            let data = null 
+            this.characteristic.on('valuechanged', buffer => {
+                if (buffer.length>0 && buffer[0]==0x23) {
+                    data = Buffer.from(buffer)
+                } else if (data && buffer.indexOf(0x0d0a)!==-1) {
+                    data=Buffer.concat([data,buffer.subarray(0,buffer.indexOf(0x0d0a)-1)], data.length+buffer.indexOf(0x0d0a)-1)
+                    this.emitDataFrom(data)
+                    data=null
+                }
+            })
+        }))
+       
+    }
+  
+    async stopListening(){
+        super.stopListening()
+        if (this.characteristic  && await this.characteristic.isNotifying()) {
+            await this.characteristic.stopNotifications()
+        }
+        if (await this.device.isConnected()){
+            await this.device.disconnect()
+        }
+    }                  
+}
+module.exports=BankManager

package/sensor_classes/GobiusCTankMeter.js

@@ -338,19 +338,7 @@ class GobiusCTankMeter extends BTSensor{
                 this.service = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
                 this.characteristic = await this.service.getCharacteristic("0000ffe9-0000-1000-8000-00805f9b34fb")
             }
-                this.device.on("disconnect", ()=>{
-                        if (this.isActive()) {
-                        this.debug(`Device disconnected. Attempting to reconnect to ${this.getName()}`)  
-                                try {        
-                                this.deviceConnect().then(()=>{
-                                        this.debug(`Device reconnected -- ${this.getName()}`)  
-                                })
-                                }
-                                catch (e) {
-                                        this.debug(`Error while reconnecting to ${this.getName()}`)
-                                }
-                        }
-                })     
+        
   
             resolve(this)
             }).catch((e)=>{ reject(e.message) }) }) 

package/sensor_classes/Govee/GoveeSensor.js

@@ -0,0 +1,47 @@
+const BTSensor = require("../../BTSensor");
+
+class GoveeSensor extends  BTSensor {
+    static Domain = this.SensorDomains.environmental
+    static ManufacturerUUID = '0000ec88-0000-1000-8000-00805f9b34fb'
+    static async  identify(device){
+        
+        const regex = /^Govee_H5075_[a-f,A-F,0-9]{4}$/
+        const name = await this.getDeviceProp(device,"Name")
+        const uuids = await this.getDeviceProp(device,'UUIDs')
+ 
+        if (name && name.match(this.getIDRegex()) && 
+            uuids && uuids.length > 0 && 
+            uuids[0] == this.ManufacturerUUID)
+            return this
+        else
+            return null
+        
+    }
+
+    getManufacturer(){
+        return "Govee"
+    }
+    getPackedTempAndHumidity(buffer, beg )
+    {
+        const negative=buffer[beg]&0x80
+        return {
+            packedValue: ((buffer.readIntBE(beg,3))&0xFFFFFF) ^ (negative?0x800000:0x000000),
+            tempIsNegative: negative
+        }
+    }
+    emitTemperatureAndHumidity(packedValue, tempIsNegative ){
+        this.emit("temp", 273.15+((((Math.trunc(packedValue/1000))/10))*(tempIsNegative?-1:1)))
+        this.emit("humidity", (packedValue % 1000) / 1000)
+
+    }
+    async propertiesChanged(props){
+        super.propertiesChanged(props)    
+        if (!props.hasOwnProperty("ManufacturerData")) return
+
+        const buffer = this.getManufacturerData(0xec88)
+        if (buffer) {
+            this.emitValuesFrom(buffer)
+        }      
+   }                         
+}
+module.exports=GoveeSensor

package/sensor_classes/GoveeH5074.js

@@ -0,0 +1,23 @@
+const GoveeSensor = require("./Govee/GoveeSensor");
+
+class GoveeH5074 extends  GoveeSensor {
+    static getIDRegex() {
+        return /^Govee_H5074_[a-f,A-F,0-9]{4}$/
+    }
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+
+        this.addDefaultPath("temp","environment.temperature")
+            .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
+        
+        this.addDefaultPath("humidity", "environment.humidity")
+            .read = (buffer)=>{return buffer.readUInt16LE(3)/10000}   
+
+        this.addDefaultPath("battery","sensors.batteryStrength")   
+            .read = (buffer)=>{return buffer.readUInt8(5)/100}
+    }
+
+        
+}
+module.exports=GoveeH5074

package/sensor_classes/GoveeH5075.js

@@ -0,0 +1,37 @@
+const GoveeSensor = require("./Govee/GoveeSensor");
+
+class GoveeH5075 extends  GoveeSensor {
+    static getIDRegex(){
+        return /^Govee_H5075_[a-f,A-F,0-9]{4}$/
+    }
+    static test(){
+        const sensor = new GoveeH5075()
+        sensor.getName=()=>{return "Govee H5075 fake"}
+        sensor.initSchema()
+        sensor.on("temp", (t)=>{console.log(`temp => ${t}`)})
+        sensor.on("humidity", (t)=>{console.log(`humidity => ${t}`)})
+        sensor.on("battery", (t)=>{console.log(`battery => ${t}`)})
+        sensor.emitValuesFrom(Buffer.from([0x00, 0x81, 0xc2 ,0x89 ,0x64 ,0x00]))
+        sensor.emitValuesFrom(Buffer.from([0x00,0x03,0xbb,0x94,0x64,0x00]))
+
+    }
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+
+        this.addDefaultPath("temp","environment.temperature")
+        this.addDefaultPath("humidity", "environment.humidity")
+        this.addDefaultPath("battery","sensors.batteryStrength")   
+    }
+
+    emitValuesFrom(buffer){
+        if (buffer.length<6) {
+            this.debug(`Invalid buffer received. Cannot parse buffer ${buffer} for ${this.getMacAndName()}`)
+            return
+        }
+        const val = this.getPackedTempAndHumidity(buffer,1)
+        this.emitTemperatureAndHumidity(val.packedValue, val.tempIsNegative)
+        this.emit("battery", buffer[4]/100)
+    }                         
+}
+module.exports=GoveeH5075

package/sensor_classes/GoveeH510x.js

@@ -1,37 +1,19 @@
-const BTSensor = require("../BTSensor");
-function decodeTempHumid(tempHumidBytes) {
-    // Convert the bytes to a 24-bit integer
-    const baseNum = (tempHumidBytes[0] << 16) + (tempHumidBytes[1] << 8) + tempHumidBytes[2];
-  
-    // Check if the temperature is negative
-    const isNegative = (baseNum & 0x800000) !== 0;
-  
-    // Extract the temperature and humidity values
-    const tempAsInt = baseNum & 0x7FFFFF;
-    const tempAsFloat = (tempAsInt / 1000) / 10.0;
-    const humid = (tempAsInt % 1000) / 10.0;
-  
-    // Apply the negative sign if necessary
-    if (isNegative) {
-      return {t:-tempAsFloat, h: humid};
-    } else {
-      return {t: tempAsFloat, h: humid};
+const GoveeSensor = require("./Govee/GoveeSensor");
+
+class GoveeH510x extends GoveeSensor{
+    static getIDRegex(){
+        return /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
     }
-  }
-class GoveeH510x extends BTSensor{
-    static Domain = this.SensorDomains.environmental
-    static async  identify(device){
-        const regex = /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
-        const name = await this.getDeviceProp(device,"Name")
-        const uuids = await this.getDeviceProp(device,'UUIDs')
 
-        if (name && name.match(regex) && 
-            uuids && uuids.length > 0 && 
-            uuids[0] == '0000ec88-0000-1000-8000-00805f9b34fb')
-            return this
-        else
-            return null
-        
+     static test(){
+        const sensor = new GoveeH510x()
+        sensor.getName=()=>{return "Govee H510x fake"}
+        sensor.initSchema()
+        sensor.on("temp", (t)=>{console.log(`temp => ${t}`)})
+        sensor.on("humidity", (t)=>{console.log(`humidity => ${t}`)})
+        sensor.on("battery", (t)=>{console.log(`battery => ${t}`)})
+        sensor.emitValuesFrom(Buffer.from([0x01,0x01,0x03,0x6d,0xcc,0x5c]))
+
     }
 
     initSchema(){
@@ -44,23 +26,16 @@ class GoveeH510x extends BTSensor{
     }
 
     emitValuesFrom(buffer){
-        const th = decodeTempHumid(buffer.subarray(2,5))
-        this.emit("temp", parseFloat((273.15+th.t).toFixed(2))) ;
-        this.emit("humidity", th.h/100 )
-        this.emit('battery', buffer[5]/100)
-    }
+        if (buffer.length<6) {
+            this.debug(`Invalid buffer received. Cannot parse buffer ${buffer} for ${this.getMacAndName()}`)
+            return
+        }
+        const val = this.getPackedTempAndHumidity(buffer,2)
+        this.emitTemperatureAndHumidity(val.packedValue, val.tempIsNegative)
+        this.emit("battery", buffer[5]/100)
 
-    getManufacturer(){
-        return "Govee"
     }
-    async propertiesChanged(props){
-        super.propertiesChanged(props)    
-        if (!props.hasOwnProperty("ManufacturerData")) return
 
-        const buffer = this.getManufacturerData(0x0001)
-        if (buffer) {
-            this.emitValuesFrom(buffer)
-        }      
-   }                         
+                     
 }
 module.exports=GoveeH510x

package/sensor_classes/JBDBMS.js

@@ -52,10 +52,10 @@ class JBDBMS extends BTSensor {
         (buffer)=>{return buffer.readInt16BE(6) / 100} 
       
       this.addDefaultPath('remainingCapacity','electrical.batteries.capacity.remaining')
-        .read=(buffer)=>{return buffer.readUInt16BE(8) / 100} 
+        .read=(buffer)=>{return (buffer.readUInt16BE(8) / 100)*3600} 
       
       this.addDefaultPath('capacity','electrical.batteries.capacity.actual')
-        .read=(buffer)=>{return buffer.readUInt16BE(10) / 100} 
+        .read=(buffer)=>{return (buffer.readUInt16BE(10) / 100)*3600} 
      
       this.addDefaultPath('cycles','electrical.batteries.cycles' )
         .read=(buffer)=>{return buffer.readUInt16BE(12)} 
@@ -139,7 +139,7 @@ class JBDBMS extends BTSensor {
         let datasize = -1
         const timer = setTimeout(() => {
           clearTimeout(timer)
-          reject(new Error(`Response timed out from JBDBMS device ${this.getName()}. `));
+          reject(new Error(`Response timed out (+30s) from JBDBMS device ${this.getName()}. `));
         }, 30000);
 
         const valChanged = async (buffer) => {
@@ -147,13 +147,12 @@ class JBDBMS extends BTSensor {
             if (buffer[0]!==0xDD || buffer.length < 5 || buffer[1] !== command)
                 reject(`Invalid buffer from ${this.getName()}, not processing.`)
             else 
-                datasize=buffer[2]
+                datasize=buffer[3]
           }
           buffer.copy(result,offset)
-          if (buffer[buffer.length-1]==0x77 && offset+buffer.length-6==datasize){
+          if (buffer[buffer.length-1]==0x77 && offset+buffer.length-7==datasize){
             
             result = Uint8Array.prototype.slice.call(result, 0, offset+buffer.length)
-            this.debug(result)
             this.rxChar.removeAllListeners()
             clearTimeout(timer)
             if (!checkSum(result)) 
@@ -196,6 +195,8 @@ async getAndEmitCellVoltages(){
 }
 
 initGATTInterval(){
+   
+  this.emitGATT()
   this.initGATTNotifications()
 }
 

package/sensor_classes/Junctek.js

@@ -69,10 +69,10 @@ class JunctekBMS extends BTSensor{
                 const v = parseInt(bytesToBase10String(value))
                 switch (byte){
                 case 0xC0:{
-                    emitData("voltage",v/100)
+                    emit("voltage",v/100)
                 }
                 case 0xC1:{
-                    emitData("current",(v/100)*chargeDirection)
+                    emit("current",(v/100)*chargeDirection)
                 }
 
                 case 0xD1:{
@@ -81,29 +81,29 @@ class JunctekBMS extends BTSensor{
                 }
 
                 case 0xD2:{
-                    emitData("remainingAh",v/1000)
+                    emit("remainingAh",v/1000)
                 }
 
                 case 0xD3:{
-                    emitData("discharge",v/100000)
+                    emit("discharge",v/100000)
                 }
                 case 0xD4:{
-                    emitData("charge",v/100000)
+                    emit("charge",v/100000)
                 }
                 case 0xD6:{
-                    emitData("timeRemaining",v*60)
+                    emit("timeRemaining",v*60)
                 }
                 case 0xD7:{
-                    emitData("impedance",v/100)
+                    emit("impedance",v/100)
                 }
                 case 0xD8:{
-                    emitData("power",(v/100)*chargeDirection)
+                    emit("power",(v/100)*chargeDirection)
                 }
                 case 0xD9:{
-                    emitData("temperature",v + 173.15) //assume C not F
+                    emit("temperature",v + 173.15) //assume C not F
                 }
                 case 0xB1:{
-                    emitData("capacityActual",v /10 )
+                    emit("capacityActual",v /10 )
                 }
             }
             }

package/sensor_classes/MercurySmartcraft.js

@@ -0,0 +1,126 @@
+/*
+Service UUID	Characteristic UUID	Type	Param	Convertion	Unit	SignalK Path	Comment
+00000000-0000-1000-8000-ec55f9f5b963 (Unknown)	00000001-0000-1000-8000-ec55f9f5b963	write / indicate	SDP	-	-	-	Enable or disable data stream. To enable write 0x0D 0x01; To disable write 0x0D 0x00.
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000101-0000-1000-8000-ec55f9f5b963	read	?	-	-	?	Returns: Value: 1.1.0 (raw: 312e312e30)
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000102-0000-1000-8000-ec55f9f5b963	write / notify	ENGINE_RPM_UUID	value / 60	Hz	propulsion.p0.revolutions	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000103-0000-1000-8000-ec55f9f5b963	write / notify	COOLANT_TEMPERATURE_UUID	value + 273.15	Kelvin	propulsion.p0.temperature	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000104-0000-1000-8000-ec55f9f5b963	write / notify	BATTERY_VOLTAGE_UUID	value / 1000	Volts	propulsion.p0.alternatorVoltage	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000105-0000-1000-8000-ec55f9f5b963	write / notify	UNK_105_UUID	?	?	?	Need longer data to figure out what is it. Value around 17384.
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000106-0000-1000-8000-ec55f9f5b963	write / notify	ENGINE_RUNTIME_UUID	value * 60	Seconds	propulsion.p0.runTime	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000107-0000-1000-8000-ec55f9f5b963	write / notify	CURRENT_FUEL_FLOW_UUID	value / 100000	m3 / hour	propulsion.p0.fuel.rate	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000108-0000-1000-8000-ec55f9f5b963	write / notify	FUEL_TANK_PCT_UUID	value / 100	%	propulsion.p0.fuel.tank	Maybe there is a more appropriate name for the Signalk path
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000109-0000-1000-8000-ec55f9f5b963	write / notify	UNK_109_UUID	?	?	?	Need longer data to figure out what is it. Raw data varied from 102701 to 102700.
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	0000010a-0000-1000-8000-ec55f9f5b963	write / notify	OIL_PRESSURE_UUID	value / 100	kPascal	propulsion.p0.oilPressure	
+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	0000010b-0000-1000-8000-ec55f9f5b963	write / notify	UNK_10B_UUID	?	?	?	Always zero. To investigate with more data.
+*/
+const BTSensor = require("../BTSensor");
+class MercurySmartcraft extends BTSensor{
+    static Domain = BTSensor.SensorDomains.propulsion
+	
+    static async identify(device){
+        
+        const name = await this.getDeviceProp(device,"Name")
+        const address = await this.getDeviceProp(device,"Address")
+        if (name == `VVM_${address.replace(":","")}`)
+            return this 
+        else
+            return null
+    }
+
+    
+
+    hasGATT(){
+        return false
+    }
+    usingGATT(){
+        return true
+    }
+    emitGATT(){
+    }
+    initSchema(){
+        const bo = 0
+
+        super.initSchema()
+        this.addParameter(
+            "id",
+            {
+                "title": "Engine ID",
+                "examples": ["port","starboard","p0","p1"]
+            }
+        )
+        _schema.properties.params.required=["id"]
+
+        this.addMetadatum("rpm","Hz","engine revolutions per sec", 
+            (buffer)=>{return buffer.readUInt16LE(bo)/60}
+        ).default='propulsion.{id}.revolutions'
+
+        this.addMetadatum("coolant","K","temperature of engine coolant in K", 
+            (buffer)=>{return buffer.readUInt16LE(bo)+273.15}
+        ).default='propulsion.{id}.coolantTemperature'
+
+        this.addMetadatum("alternatorVoltage","V","voltage of alternator", 
+            (buffer)=>{return buffer.readUInt16LE(bo)/1000}
+        ).default='propulsion.{id}.alternatorVoltage'
+
+        this.addMetadatum("runtime","s","Total running time for engine (Engine Hours in seconds)", 
+            (buffer)=>{return buffer.readUInt16LE(bo)*60}
+        ).default='propulsion.{id}.runTime'
+
+        this.addMetadatum("rate","m3/s","Fuel rate  of consumption (cubic meters per second)", 
+            (buffer)=>{return buffer.readUInt16LE(bo)/10000}
+        ).default='propulsion.{id}.fuel.rate'
+            
+        this.addMetadatum("pressure","Pa","Fuel pressure", 
+            (buffer)=>{return buffer.readUInt16LE(bo)/100}
+        ).default='propulsion.{id}.pressure'
+
+        this.addMetadatum("level","ratio","Level of fluid in tank 0-100%", 
+            (buffer)=>{return buffer.readUInt16LE(bo)/100}
+        ).default='tanks.petrol.currentLevel'
+    }
+
+    initGATTConnection(){ 
+        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
+            if (!this.gattServer) { 
+                this.gattServer = await this.device.gatt() 
+                this.sdpService = await this.gattServer.getPrimaryService("00000000-0000-1000-8000-ec55f9f5b963") 
+                this.sdpCharacteristic = await this.sdpService.getCharacteristic("00000001-0000-1000-8000-ec55f9f5b963") 
+                this.dataService = await this.gattServer.getPrimaryService("00000100-0000-1000-8000-ec55f9f5b963") 
+                this.dataCharacteristics = {
+                    rpm: await this.dataService.getCharacteristic("00000102-0000-1000-8000-ec55f9f5b963"),
+                    coolant: await this.dataService.getCharacteristic("00000103-0000-1000-8000-ec55f9f5b963"),
+                    alternatorVoltage: await this.dataService.getCharacteristic("00000104-0000-1000-8000-ec55f9f5b963"),
+                    runtime: await this.dataService.getCharacteristic("00000106-0000-1000-8000-ec55f9f5b963"),
+                    rate: await this.dataService.getCharacteristic("00000107-0000-1000-8000-ec55f9f5b963"),
+                    level: await this.dataService.getCharacteristic("00000108-0000-1000-8000-ec55f9f5b963"),
+                    pressure: await this.dataService.getCharacteristic("0000010a-0000-1000-8000-ec55f9f5b963")
+                }
+            } 
+                resolve(this)
+             }) .catch((e)=>{ reject(e.message) }) }) 
+    }
+    async initGATTNotifications() { 
+        await this.sdpCharacteristic.writeDataWithoutResponse(Buffer.from([0x0D,0x01]))
+        for (const c in this.dataCharacteristics){
+            Promise.resolve(this.dataCharacteristics[c].startNotifications().then(()=>{    
+                this.dataCharacteristics[c].on('valuechanged', buffer => {
+                    this.emitData(c,buffer)
+                })
+            }))
+        }
+    }
+  
+    async stopListening(){
+        super.stopListening()
+        for (const c in this.dataCharacteristics){
+            if (this.dataCharacteristics[c] && await this.dataCharacteristics[char].isNotifying()) {
+                await this.dataCharacteristics[c].stopNotifications()
+            }
+        }
+
+        if (await this.device.isConnected()){
+            await this.device.disconnect()
+        }
+    }
+}
+module.exports=MercurySmartcraft

package/sensor_classes/RemoranWave3.js

@@ -33,10 +33,10 @@ const states= ["Charging Needed", "Charging", "Floating", "Idle"]
 const BTSensor = require("../BTSensor");
  class RemoranWave3 extends BTSensor{
     static Domain = BTSensor.SensorDomains.electrical
-    serviceUUID = "81D08DF0-C0F8-422A-9D9D-E4379BB1EA3B"
-    info1CharUUID = "62C91222-FAFE-4F6E-95F0-AFC02BD19F2E"
+    serviceUUID = "81d08df0-c0f8-422a-9d9d-e4379bb1ea3b"
+    info1CharUUID = "62c91222-fafe-4f6e-95f0-afc02bd19f2e"
     info2CharUUID = "f5d12d34-4390-486c-b906-24ea8906af71"
-    eventUuid =  "f12a8e25-59f7-42f2-b7ae-ba96fb25c13c"
+    eventUUID =  "f12a8e25-59f7-42f2-b7ae-ba96fb25c13c"
 
      static async identify(device){
          
@@ -57,53 +57,61 @@ const BTSensor = require("../BTSensor");
             app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 20 bytes or more.`)
             return
         }
-        emitData("versionNumber", buffer.readUInt8(0))
+        this.emit("versionNumber", buffer.readUInt8(0))
         const errors = buffer.readUInt8(2)
         const errorState = []
         for (var i = 0; i < 8; ++i) {
             var c = 1 << i;
-            r & c && errorState.push(errors[i])
+            errors & c && errorState.push(errors[i])
         }
-        emitData("errors", errorState)
-        emitData("state",  states[buffer.readUInt8(3)])
-        emitData("rpm", buffer.readUInt32LE(4))
-        emitData( "voltage" , buffer.readFloatLE(8))
-        emitData("current",  buffer.readFloatLE(12))
-        emitData( "power", buffer.readFloatLE(16))
+        this.emit("errors", errorState)
+        this.emit("state",  states[buffer.readUInt8(3)])
+        this.emit("rpm", buffer.readUInt32LE(4))
+        this.emit( "voltage" , buffer.readFloatLE(8))
+        this.emit("current",  buffer.readFloatLE(12))
+        this.emit( "power", buffer.readFloatLE(16))
                 
         if (buffer.length > 23) {
-            emitData( "temp", buffer.readFloatLE(20).toFixed(1))
-            emitData( "uptime", buffer.readUInt32(24))
+            this.emit( "temp", ((buffer.readFloatLE(20))+273.15))
+            this.emit( "uptime", buffer.readUInt32LE(24))
             if (versionNumber>1 && buffer.size > 31) {
-                emitData("energy", buffer.readFloatLE(32).toFixed(1))
+                this.emit("energy", buffer.readFloatLE(32))
             }
         }
     
     }
     emitInfo2Data(buffer){
+
         if (buffer.size < 12) {
             app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 12 bytes or more.`)
             return
          }
-        emitData("versionNumber", buffer.getUint8(0))
-        emitData("temp",  buffer.readFloat32LE(4))
-        emitData("uptime", buffer.readUInt32(8))
-        emitData("lastBootTime", arduinoDateDecode(buffer.getUInt32LE(12)))
-        emitData("energy",   buffer.readFloat32LE(16))
+        this.emit("versionNumber", buffer.readUInt8(0))
+        this.emit("temp",  ((buffer.readFloatLE(4))+273.15))
+        this.emit("uptime", buffer.readUInt32LE(8))
+        this.emit("lastBootTime", arduinoDateDecode(buffer.readUInt32LE(12)))
+        this.emit("energy",   buffer.readFloatLE(16))
     }
     emitEventData(buffer){
-        if (buffer.size < 14) {
+        if (buffer.length < 14) {
+            this.debug(buffer)
             app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 14 bytes or more.`)
             return
          }
-        this.emitData("event", 
+        const eventType = buffer.readUInt16LE(8)
+        var eventDesc = eventType.toString()
+        if (Object.hasOwn(eventTypes,eventType))
+            eventDesc = eventTypes[eventType]
+
+
+        this.emit("event", 
             {
                 firstDate: arduinoDateDecode(buffer.readUInt32LE(0)),
                 lastDate: arduinoDateDecode(buffer.readUInt32LE(4)),
-                eventType: buffer.readUInt16LE(8),
+                eventType: eventType,
                 count: buffer.readUInt16LE(10),
                 index: buffer.readUInt16LE(12),
-                eventDesc: eventTypes[i]
+                eventDesc: eventDesc
             }
         )
     }
@@ -174,10 +182,10 @@ const BTSensor = require("../BTSensor");
                  this.gattServer = await this.device.gatt() 
                  this.service = await this.gattServer.getPrimaryService(this.serviceUUID) 
                  this.info1Characteristic = await this.service.getCharacteristic(this.info1CharUUID)
-                 this.info2Characteristic = await this.service.getPrimaryService(this.info2CharUUID) 
+                 this.info2Characteristic = await this.service.getCharacteristic(this.info2CharUUID) 
                  this.eventCharacteristic = await this.service.getCharacteristic(this.eventUUID)
                  resolve(this)
-            }}) .catch((e)=>{ reject(e.message) }) }) 
+            }}) .catch((e)=>{ this.debug(e); reject(e.message) }) }) 
      }
      
      initGATTNotifications() { 
@@ -205,9 +213,9 @@ const BTSensor = require("../BTSensor");
     }
      async stopListening(){
         super.stopListening()
-        await stopNotifations(this.info1Characteristic)
-        await stopNotifations(this.info2Characteristic)
-        await stopNotifations(this.eventCharacteristic)
+        await this.stopNotifications(this?.info1Characteristic)
+        await this.stopNotifications(this?.info2Characteristic)
+        await this.stopNotifications(this?.eventCharacteristic)
         if (await this.device.isConnected()){
             await this.device.disconnect()
         }

package/sensor_classes/Renogy/RenogyConstants.js

@@ -13,7 +13,8 @@ CHARGING_STATE:
     3: 'Equalizing',
     4: 'Boost',
     5: 'Floating',
-    6: 'Current limiting'
+    6: 'Current limiting',
+    8: 'Not charging'
 },
 
 LOAD_STATE: {

package/sensor_classes/Renogy/RenogySensor.js

@@ -42,13 +42,7 @@ class RenogySensor extends BTSensor{
 
     async initSchema(){
         await super.initSchema()
-        this.addParameter(
-            "refreshInterval",
-            {
-                title: 'refresh interval',
-                type: 'number'
-            }
-        )
+       
         this.addParameter(
             "deviceID",
             {
@@ -57,9 +51,6 @@ class RenogySensor extends BTSensor{
         ) 
     }
 
-    emitGATT(){
-    }
-
     getModelName(){
         return this?.modelID??`${this.constructor.name} Unknown model` 
     }
@@ -86,7 +77,6 @@ class RenogySensor extends BTSensor{
     }
 
     initGATTInterval(){
-        this.emitGATT()
         this.intervalID = setInterval(()=>{
             this.emitGATT()
         }, 1000*(this?.pollFreq??60) )

package/sensor_classes/RenogyRoverClient.js

@@ -6,53 +6,113 @@ const RenogySensor = require("./Renogy/RenogySensor.js");
 const RC=require("./Renogy/RenogyConstants.js")
 
 class RenogyRoverClient extends RenogySensor {
-
+/*
+          "batteryType": "electrical.charger.battery.type",
+          "batteryPercentage": "electrical.charger.battery.charge",
+          "batteryVoltage": "electrical.charger.battery.voltage",
+          "batteryCurrent": "electrical.charger.battery.current",
+          "controllerTemperature": "electrical.charger.temperature",
+          "batteryTemperature": "electrical.charger.battery.temperature",
+          "loadVoltage": "electrical.charger.load.voltage",
+          "loadCurrent": "electrical.charger.load.current",
+          "loadPower": "electrical.charger.load.power",
+          "pvVoltage": "electrical.charger.solar.voltage",
+          "pvCurrent": "electrical.charger.solar.current",
+          "pvPower": "electrical.charger.solar.power",
+          "maxChargingPowerToday": "electrical.charger.today.max",
+          "maxDischargingPowerToday": "electrical.charger.discharging.maximum",
+          "chargingAmpHoursToday": "electrical.charger.charged.today",
+          "powerGenerationToday": "electrical.charger.power.today",
+          "powerGenerationTotal": "electrical.charger.power.total",
+          "loadStatus": "electrical.charger.load.status",
+          "chargingStatus": "electrical.charger.status"
+*/
 
     initSchema(){
         //Buffer(73) [1, 3, 68, 32, 32, 82, 78, 71, 45, 67, 84, 82, 76, 45, 87, 78, 68, 51, 48, 7, 140, 0, 132, 0, 126, 0, 120, 0, 111, 0, 106, 100, 50, 0, 5, 0, 120, 0, 120, 0, 28, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 5, 0, 5, 2, 148, 0, 5, 206, 143, 34, 228, buffer: ArrayBuffer(8192), byteLength: 73, byteOffset: 6144, length: 73, Symbol(Symbol.toStringTag): 'Uint8Array']
         super.initSchema()
         this.addMetadatum('batteryType', '', "battery type")
+            .default="electrical.chargers.{id}.battery.type"
         this.addMetadatum('batteryPercentage', 'ratio', "battery percentage",
              (buffer)=>{return buffer.readUInt16BE(3) })
+            .default="electrical.chargers.{id}.battery.soc"
+
         this.addMetadatum('batteryVoltage', 'V', "battery voltage",
             (buffer)=>{return buffer.readUInt16BE((5))/10})
+        .default="electrical.chargers.{id}.battery.voltage"
+
         this.addMetadatum('batteryCurrent', 'A', 'battery current',
             (buffer)=>{return buffer.readUInt16BE((7))/100})
+        .default="electrical.chargers.{id}.battery.current"
+
         this.addMetadatum('controllerTemperature', 'K', 'controller temperature',
             (buffer)=>{return buffer.readInt8((9))+273.15})
+        .default="electrical.chargers.{id}.controller.temperature"
+
         this.addMetadatum('batteryTemperature', 'K', 'battery temperature',
             (buffer)=>{return buffer.readInt8((10))+273.15})
+        .default="electrical.chargers.{id}.battery.temperature"
+
         this.addMetadatum('loadVoltage', 'V', 'load voltage',
             (buffer)=>{return buffer.readUInt16BE((11))/10})
+        .default="electrical.chargers.{id}.load.voltage"
+
         this.addMetadatum('loadCurrent',  'A', 'load current',
             (buffer)=>{return buffer.readUInt16BE((13))/100})
+        .default="electrical.chargers.{id}.load.current"
         this.addMetadatum('loadPower', 'W', 'load power',
             (buffer)=>{return buffer.readUInt16BE((15))})
+        .default="electrical.chargers.{id}.load.power"
         this.addMetadatum('pvVoltage', 'V', 'pv voltage',
             (buffer)=>{return buffer.readUInt16BE((17))/10})
+        .default="electrical.chargers.{id}.solar.voltage"
         this.addMetadatum('pvCurrent', 'A', 'pv current',
             (buffer)=>{return buffer.readUInt16BE((19))/100})
+        .default="electrical.chargers.{id}.solar.current"
         this.addMetadatum('pvPower', 'W', 'pv power',
             (buffer)=>{return buffer.readUInt16BE(21)})
+        .default="electrical.chargers.{id}.solar.power"
         this.addMetadatum('maxChargingPowerToday', 'W', 'max charging power today',
             (buffer)=>{return buffer.readUInt16BE(33)})
+        .default="electrical.chargers.{id}.charge.max.today"
         this.addMetadatum('maxDischargingPowerToday', 'W', 'max discharging power today',
             (buffer)=>{return buffer.readUInt16BE(35)})
+        .default="electrical.chargers.{id}.discharge.max.today"
         this.addMetadatum('chargingAmpHoursToday', 'Ah', 'charging amp hours today',
             (buffer)=>{return buffer.readUInt16BE(37)})
+        .default="electrical.chargers.{id}.charge.ampHours.today"
+
         this.addMetadatum('dischargingAmpHoursToday', 'Ah', 'discharging amp hours today',
             (buffer)=>{return buffer.readUInt16BE(39)})
+        .default="electrical.chargers.{id}.discharge.ampHours.today"
+
         this.addMetadatum('powerGenerationToday', 'W', 'power generation today',
             (buffer)=>{return buffer.readUInt16BE(41)})
+        .default="electrical.chargers.{id}.power.generated.today"
+
         this.addMetadatum('powerConsumptionToday', 'W', 'power consumption today',
             (buffer)=>{return buffer.readUInt16BE(43)})
+        .default="electrical.chargers.{id}.power.consumed.today"
+
         this.addMetadatum('powerGenerationTotal', 'W', 'power generation total',
             (buffer)=>{return buffer.readUInt32BE(59)})
+         .default="electrical.chargers.{id}.power.generated.total"
+
         this.addMetadatum('loadStatus', '',  'load status',
             (buffer)=>{return RC.LOAD_STATE[buffer.readUInt8(67)>>7]})
+         .default="electrical.chargers.{id}.load.status"
 
         this.addMetadatum('chargingStatus', '', 'charging status',
-            (buffer)=>{return RC.CHARGING_STATE[buffer.readUInt8(68)]})
+            (buffer)=>{
+                const cs = buffer.readUInt8(68)
+                if (Object.hasOwn(RC.CHARGING_STATE,cs))
+                    return RC.CHARGING_STATE[cs]
+                else
+                    return null
+            })
+
+         .default="electrical.chargers.{id}.charge.status"
+
     }
     
     retrieveDeviceID(){

package/sensor_classes/ShenzhenLiOnBMS.js

@@ -160,7 +160,9 @@ class ShenzhenLiONBMS extends BTSensor{
     async initGATTInterval(){
         await this.initGATTNotifications() 
     }
-
+    emitGATT(){
+        
+    }
     async initGATTNotifications() { 
         await this.rxCharacteristic.startNotifications()    
         this.rxCharacteristic.on('valuechanged', buffer => {

package/sensor_classes/GoveeH50xx.js

@@ -1,47 +0,0 @@
-const BTSensor = require("../BTSensor");
-
-class GoveeH50xx extends  BTSensor {
-    static Domain = this.SensorDomains.environmental
-    static async  identify(device){
-        const regex = /^Govee_H50[0-9]{2}_[a-f,A-F,0-9]{4}$/
-        //this.getManufacturer()
-        const name = await this.getDeviceProp(device,"Name")
-        const uuids = await this.getDeviceProp(device,'UUIDs')
- 
-        if (name && name.match(regex) && 
-            uuids && uuids.length > 0 && 
-            uuids[0] == '0000ec88-0000-1000-8000-00805f9b34fb')
-            return this
-        else
-            return null
-        t
-    }
-
-    initSchema(){
-        super.initSchema()
-        this.addDefaultParam("zone")
-
-        this.addDefaultPath("temp","environment.temperature")
-            .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
-        
-        this.addDefaultPath("humidity", "environment.humidity")
-            .read = (buffer)=>{return buffer.readUInt16LE(3)/10000}   
-
-        this.addDefaultPath("battery","sensors.batteryStrength")   
-            .read = (buffer)=>{return buffer.readUInt8(5)/100}
-    }
-
-    getManufacturer(){
-        return "Govee"
-    }
-    async propertiesChanged(props){
-        super.propertiesChanged(props)    
-        if (!props.hasOwnProperty("ManufacturerData")) return
-
-        const buffer = this.getManufacturerData(0xec88)
-        if (buffer) {
-            this.emitValuesFrom(buffer)
-        }      
-   }                         
-}
-module.exports=GoveeH50xx