bt-sensors-plugin-sk 1.1.0-beta.2.2.1.0 → 1.1.0-beta.2.2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.2.1.0",
+  "version": "1.1.0-beta.2.2.1.2",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic wind meters, Mopeka tank readers, Renogy Battery and Solar Controllers (new), Aranet4 environment sensors, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/ATC.js

@@ -51,6 +51,8 @@ class ATC extends BTSensor{
     }
     propertiesChanged(props){
         super.propertiesChanged(props)    
+        if (!props.hasOwnProperty("ServiceData")) return
+
         const buff = this.getServiceData("0000181a-0000-1000-8000-00805f9b34fb")
         if (!buff)
             throw new Error("Unable to get service data for "+this.getDisplayName())

package/sensor_classes/Aranet2.js

@@ -34,7 +34,9 @@ class Aranet2 extends AranetSensor{
         
     }
     propertiesChanged(props){
-        super.propertiesChanged(props)    
+        super.propertiesChanged(props)
+        if (!props.hasOwnProperty("ManufacturerData")) return
+
         const buff = this.getManufacturerData(0x0702)
         this.emitData("temp", buff)
         this.emitData("humidity", buff)

package/sensor_classes/Aranet4.js

@@ -39,6 +39,8 @@ class Aranet4 extends AranetSensor{
     }
     propertiesChanged(props){
         super.propertiesChanged(props)    
+        if (!props.hasOwnProperty("ManufacturerData")) return
+
         const buff = this.getManufacturerData(0x0702)
         this.emitData("co2", buff)
         this.emitData("temp", buff)

package/sensor_classes/GoveeH50xx.js

@@ -36,12 +36,12 @@ class GoveeH50xx extends  BTSensor {
     }
     async propertiesChanged(props){
         super.propertiesChanged(props)    
-        if (props.ManufacturerData) {
-            const buffer = this.getManufacturerData(0xec88)
-            if (buffer) {
-               this.emitValuesFrom(buffer)
-            }      
-        }
+        if (!props.hasOwnProperty("ManufacturerData")) return
+
+        const buffer = this.getManufacturerData(0xec88)
+        if (buffer) {
+            this.emitValuesFrom(buffer)
+        }      
    }                         
 }
 module.exports=GoveeH50xx

package/sensor_classes/GoveeH510x.js

@@ -56,12 +56,12 @@ class GoveeH510x extends BTSensor{
     }
     async propertiesChanged(props){
         super.propertiesChanged(props)    
-        if (props.ManufacturerData) {
-            const buffer = this.getManufacturerData(0x0001)
-            if (buffer) {
-               this.emitValuesFrom(buffer)
-            }      
-        }
+        if (!props.hasOwnProperty("ManufacturerData")) return
+
+        const buffer = this.getManufacturerData(0x0001)
+        if (buffer) {
+            this.emitValuesFrom(buffer)
+        }      
    }                         
 }
 module.exports=GoveeH510x

package/sensor_classes/Inkbird.js

@@ -27,6 +27,7 @@ class Inkbird extends BTSensor{
     }
     async propertiesChanged(props){
         super.propertiesChanged(props)    
+        
         if (props.ManufacturerData) {
             const keys = Object.keys(this.currentProperties.ManufacturerData) 
             const key = keys[keys.length-1]

package/sensor_classes/SwitchBotTH.js

@@ -0,0 +1,81 @@
+const BTSensor = require("../BTSensor");
+
+class SwitchBotTH extends  BTSensor {
+    static async test(){
+
+        const p = {[this.ID.toString()]: [0xd8, 0x35, 0x34, 0x38, 0x4f, 0x70, 0x07, 0x02, 0x04, 0x96, 0x2c, 0x00]}
+        this.getDeviceProp=async ()=>{
+            return p
+        }
+        const c = await this.identify()
+        const sb = new c()
+        sb.initMetadata()
+        sb.currentProperties={}
+        sb.on("temp", (t)=>console.log(t))
+        sb.on("humidity", (h)=>console.log(h))
+        sb.on("battery", (b)=>console.log(b))
+
+        sb.propertiesChanged( {ManufacturerData: p})
+        
+        sb.propertiesChanged( {ServiceData: {[this.batteryService]:[0x77,0x00,0x64]}})
+
+    
+    }
+    static ID = 0x0969
+    static batteryService = "0000fd3d-0000-1000-8000-00805f9b34fb"
+    static async  identify(device){
+        const md = await this.getDeviceProp(device,'ManufacturerData')
+        if (!md) return null 
+        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)
+                return this
+        } 
+        return null
+        
+    }
+
+    async init(){
+        await super.init()
+        this.initMetadata()
+    }
+    initMetadata(){
+        this.addMetadatum('temp','K', 'temperature', 
+            (buffer)=>{
+                return (27315+(((buffer[8] & 0x0F)/10 + (buffer[9] & 0x7F)) * (((buffer[9] & 0x80)>0)?100:-100)))/100
+            })
+        this.addMetadatum('humidity','ratio', 'humidity', 
+        
+            (buffer)=>{return (buffer[10] & 0x7F)/100    
+        })
+        
+        this.addMetadatum("battery", "ratio", "battery strength",
+            (buffer)=>{return buffer[2]/100}
+         )
+    }
+
+    getManufacturer(){
+        return "Wonder Labs"
+    }
+    getName() {
+        "SwitchBotTH"
+    }
+    async propertiesChanged(props){
+        super.propertiesChanged(props)    
+        if (props.ManufacturerData) {
+            const buffer = this.getManufacturerData(this.constructor.ID)
+            if (buffer) {
+                this.emitData("temp", buffer)
+                this.emitData("humidity", buffer)
+            }      
+        }
+        if (props.ServiceData) {
+            const buffer = this.getServiceData(this.constructor.batteryService)
+            if (buffer){
+                this.emitData("battery", buffer)
+            }
+        }
+   }                         
+}
+module.exports=SwitchBotTH

package/sensor_classes/UltrasonicWindMeter.js

@@ -19,24 +19,23 @@ class UltrasonicWindMeter extends BTSensor{
         )
         this.awsCharacteristic.readValue()
         .then((buffer)=>
-            this.emit("aws", buffer)
-            
+            this.emitData("aws", buffer)  
         )
         this.awaCharacteristic.readValue()
         .then((buffer)=>
-            this.emit("awa", buffer)   
+            this.emitData("awa", buffer)   
         )
 
     }
     async init(){
         await super.init()
-        this.addMetadatum("batt","","Battery strength",
-            (buffer)=>{return buffer.readUInt8()})
-        this.addMetadatum("awa","","Apparent Wind Angle",
-            (buffer)=>{return buffer.readInt16LE()}
+        this.addMetadatum("batt","ratio","Battery strength",
+            (buffer)=>{return (buffer.readUInt8())/100})
+        this.addMetadatum("awa","rad","Apparent Wind Angle",
+            (buffer)=>{return (buffer.readInt16LE())/10000}
         )
-        this.addMetadatum("aws","","Apparent Wind Speed",
-        (buffer)=>{return buffer.readInt16LE()}
+        this.addMetadatum("aws","m/s","Apparent Wind Speed",
+        (buffer)=>{return (buffer.readInt16LE()/100)*.514444} //convert knots to m/s
         )
     }
 
@@ -85,7 +84,7 @@ class UltrasonicWindMeter extends BTSensor{
             this.awsCharacteristic=null
         }
         if (await this.device.isConnected()){
-               await this.device.disconnect()
+            await this.device.disconnect()
         }
     }
 }

package/sensor_classes/Victron/VictronSensor.js

@@ -88,7 +88,7 @@ function sleep(x) {
     propertiesChanged(props){
         super.propertiesChanged(props)
         if (this.usingGATT()) return
-        
+        if (!props.hasOwnProperty("ManufacturerData")) return
         try{
             const md = this.getManufacturerData(0x2e1)
             if (md && md.length && md[0]==0x10){

package/sensor_classes/XiaomiMiBeacon.js

@@ -1,7 +1,7 @@
-const { throws } = require("assert");
 const BTSensor = require("../BTSensor");
 
 const crypto = require('crypto');
+const util = require('util');
 const { isGeneratorFunction } = require("util/types");
 
 const DEVICE_TYPES = new Map([
@@ -96,7 +96,7 @@ class XiaomiMiBeacon extends BTSensor{
     
     emitValues(buffer){
         this.emitData("temp", buffer, 0)
-        this.emitData("humidity", buffer,2)
+        this.emit("humidity", buffer.readUInt8(2)/100)
         this.emitData("voltage",buffer,3);
     }
     getManufacturer(){
@@ -164,6 +164,8 @@ class XiaomiMiBeacon extends BTSensor{
     propertiesChanged(props){
         super.propertiesChanged(props)
         if (this.usingGATT()) return
+        if (!props.hasOwnProperty("ServiceData")) return
+        
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
         var dec
         if (!this.encryptionKey){
@@ -180,14 +182,22 @@ class XiaomiMiBeacon extends BTSensor{
             throw new Error(`${this.getNameAndAddress()} received empty decrypted packet. Check that the bind/encryption key in config is correct.`)
 
         switch(dec[0]){
+        case 0x0D:
+            this.emitData("temp",dec,3)  
+            this.emitData("humidity",dec,5)      
+            break    
+
+        case 0x0A:
+            this.emitData("batteryStrength",dec,3)
+            break
         case 0x04:    
-            this.emit("temp",(dec.readInt16LE(3)/10)+273.15)  
+            this.emitData("temp",dec,3)  
             break        
         case 0x06:
-            this.emit("humidity",(dec.readInt16LE(3)/1000))          
+            this.emitData("humidity",dec,3)          
             break
         default:
-            throw new Error(`${this.getNameAndAddress()} unable to parse decrypted service data (${dec})`)
+            throw new Error(`${this.getNameAndAddress()} unable to parse decrypted service data (${util.inspect(dec)})`)
             
         }
     }
@@ -197,8 +207,11 @@ class XiaomiMiBeacon extends BTSensor{
         const md = this.addMetadatum("encryptionKey", "", "encryptionKey (AKA bindKey) for decryption")
         md.isParam=true
         this.addMetadatum('temp','K', 'temperature',
-            (buff,offset)=>{return ((buff.readInt16LE(offset))/100) + 273.1})
+            (buff,offset)=>{return ((buff.readInt16LE(offset))/10) + 273.15})
         this.addMetadatum('humidity','ratio', 'humidity',
+            (buff,offset)=>{return buff.readInt16LE(offset)/1000})
+
+        this.addMetadatum('batteryStrength', 'ratio',  'sensor battery strength',
             (buff,offset)=>{return ((buff.readUInt8(offset))/100)})
         this.addMetadatum('voltage', 'V',  'sensor battery voltage',
             (buff,offset)=>{return ((buff.readUInt16LE(offset))/1000)})