bt-sensors-plugin-sk 1.1.0-beta.2.1.4 → 1.1.0-beta.2.1.4.2

package/index.js

@@ -414,7 +414,7 @@ module.exports =  function (app) {
 			if (plugin.schema.properties.peripherals.items.dependencies)
 				plugin.schema.properties.peripherals.items.dependencies.mac_address.oneOf=[]
 		} else {
-			app.debug('Plugin build 2024.10.08 started');
+			app.debug('Plugin build Beta 2.4.1.2 started');
 			
 		}
 		starts++

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.1.4",
-  "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic, Mopeka tank reader ",
+  "version": "1.1.0-beta.2.1.4.2",
+  "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic, Mopeka tank reader and preliminary support for Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {
     "dbus-next": "^0.10.2",

package/sensor_classes/GoveeTH.js

@@ -0,0 +1,66 @@
+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};
+    }
+  }
+class GoveeTH extends BTSensor{
+
+    static async  identify(device){
+        const regex = /^GVH5[0-9]{3}_[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
+        
+    }
+
+    async init(){
+        await super.init()
+    }
+    initMetadata(){
+        this.addMetadatum('temp','K', 'temperature')
+        this.addMetadatum('battery','ratio', 'battery strength')
+        this.addMetadatum('humidity','ratio', 'humidity')
+    }
+
+    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)
+    }
+
+    getManufacturer(){
+        return "Govee"
+    }
+    async propertiesChanged(props){
+        super.propertiesChanged(props)    
+        if (props.ManufacturerData) {
+            const buffer = this.getManufacturerData(0x0001)
+            if (buffer) {
+               this.emitValuesFrom(buffer)
+            }      
+        }
+   }                         
+}
+module.exports=GoveeTH

package/sensor_classes/MopekaTankSensor.js

@@ -267,7 +267,7 @@ class MopekaTankSensor extends BTSensor{
 
     _tankLevel( rawLevel ){
         const coefs= this.getMedium().coefficients
-        return rawLevel * (coefs[0] + (coefs[1] * this.temp) + (coefs[2] * (this.temp^2)))
+        return rawLevel * (coefs[0] + (coefs[1] * (this.temp-273.15)) + (coefs[2] * ((this.temp-273.15)^2)))
     }
     
     initMetadata(){
@@ -275,6 +275,9 @@ class MopekaTankSensor extends BTSensor{
         md.isParam=true
         md.enum=Object.keys(Media)
 
+        md = this.addMetadatum("tankHeight","mm","height of tank (in mm)")
+        md.isParam=true
+        
         this.addMetadatum("battVolt","V","sensor battery in volts", 
             ((buffer)=>{ 
                 this.battVolt = (buffer.readUInt8(1)/32) 
@@ -291,7 +294,7 @@ class MopekaTankSensor extends BTSensor{
             }).bind(this)
         )
         this.addMetadatum("tankLevel","m","tank level", 
-            (buffer)=>{ return this._tankLevel(((buffer.readUInt16LE(3))&0x3FFF)*10)/1000}
+            (buffer)=>{ return this._tankLevel(((buffer.readUInt16LE(3))&0x3FFF))}
         )
         this.addMetadatum("readingQuality","","quality of read", 
             (buffer)=>{ return buffer.readUInt8(4)>>6}

package/sensor_classes/VictronSolarCharger.js

@@ -24,7 +24,7 @@ class VictronSolarCharger extends VictronSensor{
     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)})    
+        (buff)=>{return this.NaNif(buff.readUInt16LE(10)&0x1FF,0x1FF)/10})    
     }
 }
 module.exports=VictronSolarCharger