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

package/README.md

@@ -1,8 +1,15 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
-# Version 1.2.4-1
+# Version 1.2.4-2
+
+- RenogyRoverClient fix to Battery SOC calculation
+- VictronBatteryMonitor set default aux mode to secondary voltage 
+- SwitchBotTH and Meter Plus ::identify errors fixed
+- MercurySmartcraft::identify method fix
 
 ## WHAT'S NEW  
 
+# 1.2.4-1
+
 - **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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.4-1",
+  "version": "1.2.4-2",
   "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": {

package/sensor_classes/MercurySmartcraft.js

@@ -21,7 +21,7 @@ class MercurySmartcraft extends BTSensor{
         
         const name = await this.getDeviceProp(device,"Name")
         const address = await this.getDeviceProp(device,"Address")
-        if (name == `VVM_${address.replace(":","")}`)
+        if (name && address && name == `VVM_${address.replace(":","")}`)
             return this 
         else
             return null

package/sensor_classes/RenogyRoverClient.js

@@ -34,7 +34,7 @@ class RenogyRoverClient extends RenogySensor {
         this.addMetadatum('batteryType', '', "battery type")
             .default="electrical.chargers.{id}.battery.type"
         this.addMetadatum('batteryPercentage', 'ratio', "battery percentage",
-             (buffer)=>{return buffer.readUInt16BE(3) })
+             (buffer)=>{return buffer.readUInt16BE(3)/100 })
             .default="electrical.chargers.{id}.battery.soc"
 
         this.addMetadatum('batteryVoltage', 'V', "battery voltage",

package/sensor_classes/SwitchBotMeterPlus.js

@@ -24,7 +24,7 @@ class SwitchBotMeterPlus extends BTSensor{
         const keys = Object.keys(md)
         if ( (keys && keys.length>0) && (sdKeys && sdKeys.length >0) ){
             const id = keys[keys.length-1]
-            if (parseInt(id)==this.ID && md[id][0]==modelID && sdKeys[0] == this.serviceDataKey)
+            if (parseInt(id)==this.ID && md[id][0]==this.modelID && sdKeys[0] == this.serviceDataKey)
                return this
         }
         return null
@@ -63,7 +63,7 @@ class SwitchBotMeterPlus extends BTSensor{
     }
 
     getName() {
-        return "SwitchBotMeterPlus"
+        return `SwitchBot Meter Plus (${this?.name??"Unnamed"})` 
     }
 
 }

package/sensor_classes/SwitchBotTH.js

@@ -32,7 +32,7 @@ class SwitchBotTH extends  BTSensor {
         const keys = Object.keys(md)
         if (keys && keys.length>0){
             const id = keys[keys.length-1]
-            if (parseInt(id)==this.ID && md[id].length==12 && md[id][0]==modelID)
+            if (parseInt(id)==this.ID && md[id].length==12 && md[id][0]==this.modelID)
                 return this
         } 
         return null
@@ -59,7 +59,7 @@ class SwitchBotTH extends  BTSensor {
         return "Wonder Labs"
     }
     getName() {
-        "SwitchBotTH"
+        return `SwitchBotTH (${this?.name??"Unnamed"})` 
     }
     async propertiesChanged(props){
         super.propertiesChanged(props)    

package/sensor_classes/VictronBatteryMonitor.js

@@ -22,7 +22,9 @@ class VictronBatteryMonitor extends VictronSensor{
         d.currentProperties = {}
         d.currentProperties.ManufacturerData={}
         d.currentProperties.ManufacturerData[0x02e1]=b
-        d.initMetadata() 
+        d.debug = (m)=>{console.log(m)}
+        d.debug.bind(d)
+        d.initSchema()
         Object.keys(d.getPaths()).forEach((tag)=>{
                 d.on(tag,(v)=>console.log(`${tag}=${v}`))
         })
@@ -72,7 +74,7 @@ class VictronBatteryMonitor extends VictronSensor{
         this.addDefaultPath( 'ttg',"electrical.batteries.capacity.timeRemaining") 
             .read=(buff,offset=0)=>{return this.NaNif(buff.readUInt16LE(offset),0xFFFF)*60}
         this.getPath("ttg").gatt='65970ffe-4bda-4c1e-af4b-551c4cf74769'
-        
+        this.auxMode=VC.AuxMode.STARTER_VOLTAGE
         try {
         if (this.encryptionKey){
             const decData = this.decrypt(this.getManufacturerData(0x02e1))