bt-sensors-plugin-sk 1.1.0-beta.2.1.4.4 → 1.1.0-beta.2.1.4.5

package/index.js

@@ -1,9 +1,11 @@
 const fs = require('fs')
 const util = require('util')
 const path = require('path')
+const packageInfo = require("./package.json")
+
 const {createBluetooth} = require('node-ble')
 const {bluetooth, destroy} = createBluetooth()
-const packageInfo = require("./package.json")
+
 const BTSensor = require('./BTSensor.js')
 const BLACKLISTED = require('./sensor_classes/BlackListedDevice.js')
 
@@ -152,8 +154,8 @@ module.exports =  function (app) {
 		classMap = utilities_sk.loadClasses(path.join(__dirname, 'sensor_classes'))
 	}
 
-	app.debug(`Loading plugin ${packageInfo.version}`)
-	
+	app.debug(`Loading plugin ${packageInfo.version}`)	
+
 	plugin.schema = {			
 		type: "object",
 		description: "NOTE: \n 1) Plugin must be enabled to configure your sensors. \n"+
@@ -414,7 +416,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 Beta 2.4.1.2 started');
+			app.debug(`Loading plugin ${packageInfo.version} started` )
 			
 		}
 		starts++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.1.4.4",
+  "version": "1.1.0-beta.2.1.4.5",
   "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": {

package/sensor_classes/MopekaTankSensor.js

@@ -258,22 +258,20 @@ class MopekaTankSensor extends BTSensor{
         const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
         this.modelID = md[0]
         this.initMetadata()
+
     } 
 
     getMedium(){
         return Media[this?.medium??'PROPANE']
     }
-    getTankHeight(){
-        return this?.tankHeight??304.8 //Assume a foot
-    }
 
     _tankLevel( rawLevel ){
         const coefs= this.getMedium().coefficients
-        return rawLevel * (coefs[0] + (coefs[1] * (this.temp-233.15)) + (coefs[2] * ((this.temp-233.15)^2)))
+        return rawLevel * (coefs[0] + (coefs[1] * (this.temp-273.15)) + (coefs[2] * ((this.temp-273.15)^2)))
     }
     
     initMetadata(){
-        var md = this.addMetadatum("medium","","type of liquid in tank")
+        const md = this.addMetadatum("medium","","type of liquid in tank")
         md.isParam=true
         md.enum=Object.keys(Media)
 
@@ -295,8 +293,8 @@ class MopekaTankSensor extends BTSensor{
                 return this.temp
             }).bind(this)
         )
-        this.addMetadatum("tankLevel","ratio","tank level", 
-            (buffer)=>{ return (this._tankLevel(((buffer.readUInt16LE(3))&0x3FFF)))/this.getTankHeight()}
+        this.addMetadatum("tankLevel","m","tank level", 
+            (buffer)=>{ return this._tankLevel(((buffer.readUInt16LE(3))&0x3FFF))}
         )
         this.addMetadatum("readingQuality","","quality of read", 
             (buffer)=>{ return buffer.readUInt8(4)>>6}
@@ -314,7 +312,6 @@ class MopekaTankSensor extends BTSensor{
         if (props.ManufacturerData)
             this.emitValuesFrom( this.getManufacturerData(this.constructor.manufacturerID) )
     }
-
     getName(){
         if (this.name)
             return this.name

package/sensor_classes/VictronACCharger.js

@@ -67,7 +67,7 @@ class VictronACCharger extends VictronSensor{
         this.emit("batt3",  this.NaNif(br.read_unsigned_int(13),0x1FFF)/100)
         this.emit("curr3", this.NaNif(br.read_unsigned_int(11),0x7FF)/10)
         this.emit("temp", this.NaNif(br.read_unsigned_int(7),0x7F)+233.15)
-        this.emit("acCurr", this.NaNif(br.read_unsigned_int(9),0x1FF)/10)
+        this.emit("acCurr", this.NaNif(br.read_unsigned_int(9),0x1FF)/100)
     }
 }
 module.exports=VictronACCharger

package/sensor_classes/Renogy/RenogySensor.js

@@ -1,107 +0,0 @@
-const BTSensor = require("../../BTSensor.js");
-const VC = require('./RenogyConstants.js');
-function sleep(x) {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(x);
-      }, x);
-    });
-  }
-  class RenogySensor extends BTSensor{
-
-    constructor(device,config,gattConfig){
-        super(device,config,gattConfig)
-        this.encryptionKey = config?.encryptionKey
-    }
-    
-    static async identifyMode(device, mode){
-            
-        var md = await this.getDeviceProp(device,'ManufacturerData')
-        if (md==undefined || !Object.hasOwn(md,0x2e1)) 
-            return null
-        else {
-            
-            if (md[0x2e1].value[0]==0x10) {
-                if (md[0x2e1].value[4]==mode)
-                    return this
-                else 
-                    return null
-            }
-
-            var hasDataPacket=false
-            device.helper._prepare()
-            device.helper.on("PropertiesChanged",
-                 (props)=> {
-                    if (Object.hasOwn(props,'ManufacturerData')){
-                        md = props['ManufacturerData'].value
-                        hasDataPacket=md[0x2e1].value[0]==0x10
-                    }
-            })        
-            while (!hasDataPacket) {
-                await sleep(500)
-            }
-            device.helper.removeListeners()
-            if (md[0x2e1].value[4]==mode)
-                return this
-            else
-                return null
-        } 
-    }
-
-    async init(){
-        await super.init()
-    }
-    alarmReason(alarmValue){
-        return this.constructor.AlarmReason[alarmValue]
-    }
-    getModelName(){
-        return VC?.MODEL_ID_MAP[this.model_id]??this.constructor.name+" (Model ID:"+this.model_id+")"
-    }
-
-    decrypt(data){
-        if (!this.encryptionKey)
-            throw Error("Unable to decrypt: no encryption key set")
-
-        const encMethod = 'aes-128-ctr';
-        const iv = data.readUInt16LE(5); 
-        const key = Buffer.from(this.encryptionKey,'hex')
-        const ivBuffer = Buffer.alloc(16); // 128 bits = 16 bytes
-        
-        ivBuffer.writeUInt16LE(iv)
-        
-        var encData = Buffer.from([...data.slice(8)])
-        
-        const decipher = crypto.createDecipheriv(encMethod, key, ivBuffer)
-        
-        const decData=decipher.update(encData)
-
-        return Buffer.from(decData)
-        
-    }
-    getName(){
-        return `Victron ${this.getModelName()}`
-    }
-    propertiesChanged(props){
-        super.propertiesChanged(props)
-        if (this.usingGATT()) return
-        
-        try{
-            const md = this.getManufacturerData(0x2e1)
-            if (md && md.length && md[0]==0x10){
-                const decData=this.decrypt(md)
-                this.emitValuesFrom(decData)
-            }
-        }
-        catch (error) {
-            throw new Error(`Unable to read data from ${ this.getDisplayName()}: ${error}` )
-        }
-    }
-
-    initGATTConnection(){
-        throw new Error( "GATT Connection unimplemented for "+this.getDisplayName())
-    }
-
-   
-
-}
-module.exports=RenogySensor