bt-sensors-plugin-sk 1.3.0 → 1.3.2-1

package/sensor_classes/Victron/VictronSensor.js

@@ -11,7 +11,7 @@ const VictronIdentifier = require('./VictronIdentifier.js');
     constructor(device,config,gattConfig){
         super(device,config,gattConfig)
         
-        if (device.modelID)
+        if (device&&device.modelID)
             this.modelID=device.modelID        
     }
 
@@ -52,6 +52,31 @@ const VictronIdentifier = require('./VictronIdentifier.js');
         } 
         return null
     }
+
+    offReasonText(value){
+        let reasons=[];
+        VC.OffReasons.forEach((v,k)=>{
+            if (k&value)
+                reasons.push(v);
+        })
+        return reasons.join("|");
+    }
+
+    alarmReasonText(value){
+        let reasons=[];
+        VC.AlarmReason.forEach((v,k)=>{
+            if (k&value)
+                reasons.push(v);
+        })
+        return reasons.join("|");
+    }
+    emitAlarm(tag="alarm", alarm){
+        this.emit(
+             tag,
+            { message:this.alarmReasonText(alarm), 
+              alarm: `0x${alarm.toString(16).padStart(8,"0")}`,
+              alarmstate: 'alert'})
+    }
    async init(){
         await super.init()
         this.addParameter(
@@ -63,7 +88,7 @@ const VictronIdentifier = require('./VictronIdentifier.js');
         )
     }
     alarmReason(alarmValue){
-        return this.constructor.AlarmReason[alarmValue]
+        return VC.AlarmReason.get(alarmValue)
     }
     getModelName(){
         const mID = this.getModelID()

package/sensor_classes/VictronBatteryMonitor.js

@@ -26,7 +26,7 @@ class VictronBatteryMonitor extends VictronSensor{
         d.debug.bind(d)
         d.initSchema()
         Object.keys(d.getPaths()).forEach((tag)=>{
-                d.on(tag,(v)=>console.log(`${tag}=${v}`))
+                d.on(tag,(v)=>console.log(`${tag}=${JSON.stringify(v)}`))
         })
         if (key)
             b = d.decrypt(b)
@@ -80,7 +80,7 @@ class VictronBatteryMonitor extends VictronSensor{
 
         this.auxMode=VC.AuxMode.STARTER_VOLTAGE
 
-        if (!this.auxMode){
+        if (this.auxMode==undefined){
             const md=await this.constructor.getDataPacket(this.device, this.getManufacturerData(this.constructor.ManufacturerID))
             try {
                 if (this.encryptionKey){
@@ -120,17 +120,15 @@ class VictronBatteryMonitor extends VictronSensor{
         }
                 
     }
-    
+  
     emitValuesFrom(decData){
         
         this.emitData("ttg",decData,0)
         this.emitData("voltage",decData,2);
         const alarm = this.getPath("alarm").read(decData,4)
-        if (alarm>0){
-            this.emit(
-                `ALARM #${alarm} from ${this.getDisplayName()})`, 
-                { message: VC.AlarmReason.get(alarm), state: 'alert'})
-        }
+        if (alarm>0)
+            this.emitAlarm("alarm",alarm)
+        
         switch(this.auxMode){
         case VC.AuxMode.STARTER_VOLTAGE:
             this.emitData("starterVoltage",decData,6);

package/sensor_classes/VictronDCDCConverter.js

@@ -25,7 +25,7 @@ class VictronDCDCConverter extends VictronSensor{
         .default="electrical.chargers.{id}.output.voltage"
 
         this.addMetadatum('offReason','', 'reason unit is off',
-                (buff)=>{return VC.OffReasons.get(buff.readUInt32LE(6))})
+                (buff)=>{return this.offReasonText(buff.readUInt32LE(6))})
         .default="electrical.chargers.{id}.offReason"
 
                 

package/sensor_classes/VictronDCEnergyMeter.js

@@ -55,6 +55,7 @@ class VictronDCEnergyMeter extends VictronSensor{
         this.addMetadatum('alarm','', 'alarm', 
             (buff)=>{return buff.readUInt16LE(4)})
            .default="electrical.meters.{id}.alarm"
+        this.getPath("alarm").notify=true
         this.addMetadatum('current','A', 'current')
         .default="electrical.meters.{id}.current"       
  
@@ -65,9 +66,7 @@ class VictronDCEnergyMeter extends VictronSensor{
         this.emitData("voltage",decData,2);
         const alarm = this.getPath("alarm").read(decData,4)
         if (alarm>0){
-            this.emit(
-                `ALARM #${alarm} from ${this.getDisplayName()})`, 
-                { message: AlarmReason(alarm), state: 'alert'})
+            this.emitAlarm("alarm",alarm)
         }
         switch(this.auxMode){
             case VC.AuxMode.STARTER_VOLTAGE:

package/sensor_classes/VictronInverter.js

@@ -17,6 +17,7 @@ class VictronInverter extends VictronSensor{
         const md = this.addMetadatum('alarmReason','', 'reason for alarm',
             (buff)=>{return buff.readIntU16LE(1)})
         .default="electrical.inverters.{id}.alarm"
+        md.notify=true
 
         this.addDefaultPath('dcVoltage','electrical.inverters.dc.voltage') 
             .read=(buff)=>{return this.NaNif(buff.readInt16LE(3),0x7FFF)/100}
@@ -40,9 +41,7 @@ class VictronInverter extends VictronSensor{
             this.NaNif(br.read_unsigned_int(11),0x7FF)/10)
         const alarm = this.getPath("alarmReason").read(decData)
         if (alarm>0){
-            this.emit(
-                `ALARM #${alarm} from ${this.getDisplayName()})`, 
-                { message: VC.AlarmReason.get(alarm), state: 'alert'})
+            this.emitAlarm("alarmReason",alarm)
         }
     }
     

package/sensor_classes/VictronLynxSmartBMS.js

@@ -37,7 +37,7 @@ class VictronLynxSmartBMS extends VictronSensor{
             (buff)=>{return buff.readUInt16LE(7)})
         .default="electrical.batteries.{batteryID}.IOStatus"
 
-        this.addMetadatum('warningsAndAlarms','','warnings and alarms')
+        this.addMetadatum('warningsAndAlarms','','warnings and alarms (undocumented)')
 
         this.addDefaultPath('soc','electrical.batteries.capacity.stateOfCharge')
         

package/sensor_classes/VictronOrionXS.js

@@ -32,9 +32,11 @@ class VictronOrionXS extends VictronSensor{
             (buff)=>{return this.NaNif(buff.readUInt16LE(8),0xFFFF)/10})
             .default="electrical.chargers.{id}.input.current"
         this.addMetadatum('deviceOffReason','', 'device off reason', 
-            (buff)=>{return VC.OffReasons.get(buff.readUInt32BE(10))})
+            (buff)=>{return this.offReasonText(buff.readUInt32LE(10))})
             .default="electrical.chargers.{id}.offReason"    
         }
 
+        
+
 }
 module.exports=VictronOrionXS

package/sensor_classes/VictronSmartBatteryProtect.js

@@ -32,7 +32,8 @@ class VictronSmartBatteryProtect extends VictronSensor{
         this.addMetadatum('chargerError','', 'charger error',
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(3))})
         this.addMetadatum('alarmReason','', 'alarm reason', 
-            (buff)=>{return VC.AlarmReason.get(buff.readUInt16LE(4))})
+            (buff)=>{return buff.readUInt16LE(4)})
+        this.getPath("alarmReason").notify=true
         this.addMetadatum('warningReason','', 'warning reason', //TODO
             (buff)=>{return (buff.readUInt16LE(5))})
         this.addMetadatum('channel1Voltage','V', 'channel one voltage', 
@@ -40,8 +41,14 @@ class VictronSmartBatteryProtect extends VictronSensor{
         this.addMetadatum('outputVoltage','V', 'output voltage', 
             (buff)=>{return this.NaNif(buff.readUInt16LE(9),0xFFFF)/100})
         this.addMetadatum('offReason','', 'off reason', 
-            (buff)=>{return VC.OffReasons.get(buff.readUInt16LE(11))}) //TODO
+            (buff)=>{return this.offReasonText(buff.readUInt32LE(11))}) 
         }
+          emitValuesFrom(decData){
+            super.emitValuesFrom(decData)
+            const alarm = this.getPath("alarmReason").read(decData)
+            if (alarm>0)
+                this.emitAlarm("alarmReason",alarm)
+          }
 
 }
 module.exports=VictronSmartBatteryProtect 

package/testGATT.js

@@ -0,0 +1,24 @@
+ const {createBluetooth} = require('@naugehyde/node-ble');
+
+ const {bluetooth, destroy} = createBluetooth();
+ var cls=require("./sensor_classes/XiaomiMiBeacon.js");
+
+ const adapter = await bluetooth.getAdapter("hci0");
+ await adapter.startDiscovery();
+ var device = await adapter.waitDevice("A4:C1:38:3E:7E:94",60000);
+
+var continueTesting=true;
+var trial=1
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+while(continueTesting) {
+        console.log("trial: "+trial++);
+        await device.connect();
+        console.log("\tconnected");
+    
+        await device.disconnect();
+        console.log("\tdisconnected");
+        await sleep(2000)
+    
+}