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

package/README.md

@@ -1,4 +1,11 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
+## WHAT'S NEW  
+
+# Version 1.2.4-3
+
+- Mercury Smartcraft fixes (working now!)
+- Govee 510x regression errors fixed
+
 # Version 1.2.4-2
 
 - RenogyRoverClient fix to Battery SOC calculation
@@ -6,9 +13,7 @@
 - SwitchBotTH and Meter Plus ::identify errors fixed
 - MercurySmartcraft::identify method fix
 
-## WHAT'S NEW  
-
-# 1.2.4-1
+# Version 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)

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.4-2",
+  "version": "1.2.4-3",
   "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": {
+  "dependencies": { 
     "@rjsf/bootstrap-4": "^5.24.11",
     "@rjsf/core": "^5.24.11",
     "@rjsf/utils": "^5.24.11",

package/sensor_classes/Govee/GoveeSensor.js

@@ -18,6 +18,7 @@ class GoveeSensor extends  BTSensor {
         
     }
 
+    static DATA_ID=0xec88
     getManufacturer(){
         return "Govee"
     }
@@ -38,7 +39,7 @@ class GoveeSensor extends  BTSensor {
         super.propertiesChanged(props)    
         if (!props.hasOwnProperty("ManufacturerData")) return
 
-        const buffer = this.getManufacturerData(0xec88)
+        const buffer = this.getManufacturerData(this.constructor.DATA_ID)
         if (buffer) {
             this.emitValuesFrom(buffer)
         }      

package/sensor_classes/GoveeH510x.js

@@ -1,6 +1,7 @@
 const GoveeSensor = require("./Govee/GoveeSensor");
 
 class GoveeH510x extends GoveeSensor{
+    
     static getIDRegex(){
         return /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
     }
@@ -15,7 +16,7 @@ class GoveeH510x extends GoveeSensor{
         sensor.emitValuesFrom(Buffer.from([0x01,0x01,0x03,0x6d,0xcc,0x5c]))
 
     }
-
+    static DATA_ID = 0x0001
     initSchema(){
         super.initSchema()
         this.addDefaultParam("zone")

package/sensor_classes/Junctek.js

@@ -41,7 +41,7 @@ class JunctekBMS extends BTSensor{
         this.addDefaultPath("cycles",'electrical.batteries.cycles')
 
         this.addDefaultPath("soc",'electrical.batteries.capacity.stateOfCharge')
-        this.addDefaultPath("remainingAh",'electrical.batteries.capacity.remaining')
+        this.addDefaultPath("remaining",'electrical.batteries.capacity.remaining')
         this.addDefaultPath("timeRemaining",'electrical.batteries.capacity.timeRemaining')
         this.addDefaultPath("discharge",'electrical.batteries.capacity.dischargeSinceFull')
         this.addDefaultPath("charge",'electrical.batteries.capacity.charge')
@@ -53,7 +53,7 @@ class JunctekBMS extends BTSensor{
 
     emitFrom(buffer){
         var value=[], chargeDirection = 1
-
+        this.debug(buffer)
         for (let byte of buffer){
             if (byte==0xBB) {
                 value=[]
@@ -63,50 +63,53 @@ class JunctekBMS extends BTSensor{
                 continue
             }
             
-            value.push[byte]
-
-            if (parseInt(byte.toString(16))==NaN){ //not a base-10 number. seriously. that's how Junctek does this.
+            if (isNaN(parseInt(byte.toString(16)))){ //not a base-10 number. seriously. that's how Junctek does this.
                 const v = parseInt(bytesToBase10String(value))
+                value=[]
                 switch (byte){
-                case 0xC0:{
-                    emit("voltage",v/100)
-                }
-                case 0xC1:{
-                    emit("current",(v/100)*chargeDirection)
-                }
-
-                case 0xD1:{
+                case 0xC0:
+                    this.emit("voltage",v/100)
+                    break
+                
+                case 0xC1:
+                    this.emit("current",(v/100)*chargeDirection)
+                    break
+
+                case 0xD1:
                     if (byte==0)
                         chargeDirection=-1
-                }
-
-                case 0xD2:{
-                    emit("remainingAh",v/1000)
-                }
-
-                case 0xD3:{
-                    emit("discharge",v/100000)
-                }
-                case 0xD4:{
-                    emit("charge",v/100000)
-                }
-                case 0xD6:{
-                    emit("timeRemaining",v*60)
-                }
-                case 0xD7:{
-                    emit("impedance",v/100)
-                }
-                case 0xD8:{
-                    emit("power",(v/100)*chargeDirection)
-                }
-                case 0xD9:{
-                    emit("temperature",v + 173.15) //assume C not F
-                }
-                case 0xB1:{
-                    emit("capacityActual",v /10 )
-                }
+                    break
+
+                case 0xD2:
+                    this.emit("remaining",v*3.6)
+                    break
+
+                case 0xD3:
+                    this.emit("discharge",v/100000)
+                    break
+                case 0xD4:
+                    this.emit("charge",v/100000)
+                    break
+                case 0xD6:
+                    this.emit("timeRemaining",v*60)
+                    break
+                case 0xD7:
+                    this.emit("impedance",v/100)
+                    break
+                case 0xD8:
+                    this.emit("power",(v/100)*chargeDirection)
+                    break
+                case 0xD9:
+                    this.emit("temperature",v + 273.15) //assume C not F
+                    break
+                case 0xB1:
+                    this.emit("capacityActual",v /10 )
+                    break
             }
             }
+            else{
+                value.push(byte)
+            }
         }
     }
     emitGATT(){
@@ -120,8 +123,9 @@ class JunctekBMS extends BTSensor{
             if (!this.gattServer) { 
                 this.gattServer = await this.device.gatt() 
                 this.battService = await this.gattServer.getPrimaryService("0000fff0-0000-1000-8000-00805f9b34fb") 
-                this.battCharacteristic = await this.battService.getCharacteristic("0000ffe1-0000-1000-8000-00805f9b34fb")
-                }
+                this.battCharacteristic = await this.battService.getCharacteristic("0000fff1-0000-1000-8000-00805f9b34fb")
+
+            }
                 resolve(this)
              }) .catch((e)=>{ reject(e.message) }) }) 
     }

package/sensor_classes/MercurySmartcraft.js

@@ -38,7 +38,7 @@ class MercurySmartcraft extends BTSensor{
     emitGATT(){
     }
     initSchema(){
-        const bo = 0
+        const bo = 2
 
         super.initSchema()
         this.addParameter(
@@ -48,7 +48,7 @@ class MercurySmartcraft extends BTSensor{
                 "examples": ["port","starboard","p0","p1"]
             }
         )
-        _schema.properties.params.required=["id"]
+        this._schema.properties.params.required=["id"]
 
         this.addMetadatum("rpm","Hz","engine revolutions per sec", 
             (buffer)=>{return buffer.readUInt16LE(bo)/60}
@@ -67,15 +67,15 @@ class MercurySmartcraft extends BTSensor{
         ).default='propulsion.{id}.runTime'
 
         this.addMetadatum("rate","m3/s","Fuel rate  of consumption (cubic meters per second)", 
-            (buffer)=>{return buffer.readUInt16LE(bo)/10000}
+            (buffer)=>{return buffer.readUInt16LE(bo)/100000/3600}
         ).default='propulsion.{id}.fuel.rate'
             
         this.addMetadatum("pressure","Pa","Fuel pressure", 
-            (buffer)=>{return buffer.readUInt16LE(bo)/100}
+            (buffer)=>{return buffer.readUInt16LE(bo)*10}
         ).default='propulsion.{id}.pressure'
 
         this.addMetadatum("level","ratio","Level of fluid in tank 0-100%", 
-            (buffer)=>{return buffer.readUInt16LE(bo)/100}
+            (buffer)=>{return buffer.readUInt16LE(bo)/10000}
         ).default='tanks.petrol.currentLevel'
     }
 
@@ -100,7 +100,7 @@ class MercurySmartcraft extends BTSensor{
              }) .catch((e)=>{ reject(e.message) }) }) 
     }
     async initGATTNotifications() { 
-        await this.sdpCharacteristic.writeDataWithoutResponse(Buffer.from([0x0D,0x01]))
+        await this.sdpCharacteristic.writeValue(Buffer.from([0x0D,0x01]))
         for (const c in this.dataCharacteristics){
             Promise.resolve(this.dataCharacteristics[c].startNotifications().then(()=>{    
                 this.dataCharacteristics[c].on('valuechanged', buffer => {
@@ -113,7 +113,7 @@ class MercurySmartcraft extends BTSensor{
     async stopListening(){
         super.stopListening()
         for (const c in this.dataCharacteristics){
-            if (this.dataCharacteristics[c] && await this.dataCharacteristics[char].isNotifying()) {
+            if (this.dataCharacteristics[c] && await this.dataCharacteristics[c].isNotifying()) {
                 await this.dataCharacteristics[c].stopNotifications()
             }
         }