bt-sensors-plugin-sk 1.2.0-beta.0.0.3 → 1.2.0-beta.0.0.5

package/sensor_classes/VictronSolarCharger.js

@@ -6,25 +6,38 @@ class VictronSolarCharger extends VictronSensor{
         return await this.identifyMode(device, 0x01)
     }   
 
-    async init() {
-        await super.init()
-        this.initMetadata()
-    }
-    initMetadata() { 
-    this.addMetadatum('chargeState','', 'charge state', 
+    initSchema() {
+        super.initSchema()
+        this.addDefaultParam("id")
+    
+        this.addMetadatum('chargeState','', 'charge state', 
         (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
-    this.addMetadatum('chargerError','', 'charger error',
-        (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
-    this.addMetadatum('voltage','V', 'charger battery voltage', 
-        (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
-    this.addMetadatum('current','A','charger battery current', 
-        (buff)=>{return this.NaNif(buff.readInt16LE(4),0x7FFF)/10})
-    this.addMetadatum('yield','Wh', 'yield today in Watt-hours', 
-        (buff)=>{return this.NaNif(buff.readUInt16LE(6),0xFFFF)*10})
-    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.readUInt16LE(10)&0x1FF,0x1FF)/10})    
+        .default="electrical.solar.{id}.state"
+    
+        this.addMetadatum('chargerError','', 'charger error',
+            (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
+            .default="electrical.solar.{id}.error"
+
+        this.addMetadatum('voltage','V', 'charger battery voltage', 
+            (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
+            .default="electrical.solar.{id}.dc.voltage"
+
+        this.addMetadatum('current','A','charger battery current', 
+            (buff)=>{return this.NaNif(buff.readInt16LE(4),0x7FFF)/10})
+            .default="electrical.solar.{id}.dc.current"
+
+        this.addMetadatum('yield','Wh', 'yield today in Watt-hours', 
+            (buff)=>{return this.NaNif(buff.readUInt16LE(6),0xFFFF)*10})
+            .default="electrical.solar.{id}.yieldToday"
+
+        this.addMetadatum('solarPower','W', 'solar power', 
+            (buff)=>{return this.NaNif(buff.readUInt16LE(8),0xFFFF)})   
+            .default="electrical.solar.{id}.panelPower" 
+       
+        this.addMetadatum('externalDeviceLoad','A', 'external device load', 
+            (buff)=>{return this.NaNif(buff.readUInt16LE(10)&0x1FF,0x1FF)/10})
+            .default="electrical.solar.{id}.loadCurrent" 
+  
     }
 }
 module.exports=VictronSolarCharger 

package/sensor_classes/VictronVEBus.js

@@ -9,11 +9,8 @@ class VictronVEBus extends VictronSensor{
         return await this.identifyMode(device, 0x0C)
     }   
 
-    async init() {
-        await super.init()
-        this.initMetadata()
-    }
-    initMetadata(){
+    initSchema(){
+        super.initSchema()
         this.addMetadatum('chargeState','', 'charge state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
             

package/sensor_classes/XiaomiMiBeacon.js

@@ -90,8 +90,6 @@ class XiaomiMiBeacon extends BTSensor{
                 return null
         }
     }
-
-    GATTwarning = "WARNING: Xiaomi GATT connections are known to be unreliable on Debian distributions with Bluez 5.55 and up (earlier BlueZ versions are untested). Using GATT on the Xiaomi may put the system Bluetooth stack into an inconsistent state disrupting and disabling other plugin Bluetooth connections. If by some chance you're successful using GATT with the Xiaomi, let the plugin developer know your configuration. Refer to the plugin documentation for getting the Xiamoi bindKey for non-GATT connections and more information on Xiaomi GATT issues."
     
     emitValues(buffer){
         this.emitData("temp", buffer, 0)
@@ -102,13 +100,10 @@ class XiaomiMiBeacon extends BTSensor{
         return "Xiaomi Inc."
     }
     getGATTDescription() {
-        return this.GATTwarning
+        return ""
     }
+
     initGATTConnection(){
-        if (!this?.gattWarningDelivered) {
-            this.debug(this.GATTwarning.toUpperCase())
-            this.gattWarningDelivered=true
-        }
         return new Promise((resolve,reject )=>{
             this.deviceConnect().then(async ()=>{
                 if (!this.gattServer) {
@@ -202,30 +197,34 @@ class XiaomiMiBeacon extends BTSensor{
     }
     
     async init(){
+
         await super.init()
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
         const frameControl = data[0] + (data[1] << 8)
         this.deviceID = data[2] + (data[3] << 8)
         this.isEncrypted = (frameControl >> 3) & 1
         this.encryptionVersion = frameControl >> 12 
+    }   
+    initSchema(){
+        super.initSchema()
         this.addParameter(
             "encryptionKey",
             {
                 title: "encryptionKey (AKA bindKey) for decryption"
             }
         )
-        this.addMetadatum('temp','K', 'temperature',
-            (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)})
+        this.addDefaultPath('temp','environment.temperature')
+        .read=(buff,offset)=>{return ((buff.readInt16LE(offset))/10) + 273.15}
 
-
-    }   
+        this.addDefaultPath('humidity','environment.humidity')
+        .read=(buff,offset)=>{return buff.readInt16LE(offset)/1000}        
+            
+        this.addDefaultPath("batteryStrength", "sensors.batteryStrength")
+        .read= (buff,offset)=>{return ((buff.readUInt8(offset))/100)}
+       
+        this.addDefaultPath("voltage", "sensors.batteryVoltage")
+        .read=(buff,offset)=>{return ((buff.readUInt16LE(offset))/1000)}
+    }
 
     getName(){
         const dt = DEVICE_TYPES.get(this.deviceID)

package/testqueue.js

@@ -0,0 +1,64 @@
+
+
+import {createBluetooth} from 'node-ble'
+
+import {AutoQueue} from "./Queue.js"
+import  {Variant}  from 'dbus-next'
+
+const {bluetooth, destroy} = createBluetooth()
+const connectQueue = new AutoQueue()
+const adapter = await bluetooth.getAdapter("hci0")
+await adapter.startDiscovery()
+
+function deviceConnect(mac) {
+
+        /* CAUTION: HACK AHEAD 
+
+        Bluez for some cockamamie reason (It's 2025 for chrissake. 
+        BLUETOOTH ISN'T JUST FOR DESKTOPS ANYMORE, BLUEZ DEVS!)
+        SUSPENDS scanning while connected to a device.
+
+        The next line of code gives the scanner a kick in the arse, 
+        starting it up again so, I dunno, another device might be able 
+        to connect and sensor classes could maybe get beacon updates.
+
+        You know, the little things.
+      */
+    adapter.waitDevice(mac,(30000)).then((device) =>{
+
+        return connectQueue.enqueue( async ()=>{
+            console.log("Connecting to "+mac)
+            try {await device.connect()} catch {(e)=>console.log(e)}
+            try {
+                console.log("Connected to "+mac)
+                console.log("Stopping discovery for "+mac)
+            
+                await adapter.helper.callMethod('StopDiscovery')
+                console.log("Discovery stopped for "+mac)
+                await adapter.helper.callMethod('SetDiscoveryFilter', {
+                    Transport: new Variant('s', "le")
+                })
+                console.log("Starting discovery for "+mac)
+                await adapter.helper.callMethod('StartDiscovery')   
+                console.log("Discovery started for "+mac)
+                
+            } catch (e){
+                //probably ignorable error. probably.
+                console.log(e)
+            }
+        })
+    })
+    /* END HACK*/
+}
+ setInterval( ()=>{
+    deviceConnect("D1:06:00:C6:16:4A")
+ }, 5000)
+ setInterval( ()=>{
+  
+ for (const mac of (["D1:06:01:46:49:39","A4:C1:38:3E:7E:94"])){
+    try { deviceConnect(mac) } catch { (e)=>console.log(e) }
+ }
+}, 10000)
+
+
+