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

package/BTSensor.js

@@ -101,6 +101,7 @@ function preparePath(obj, str) {
 
 class BTSensor extends EventEmitter {
     //static metadata=new Map()
+ 
     static DEFAULTS = require('./plugin_defaults.json');
     
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.0.5",
+  "version": "1.2.0-beta.0.0.6",
   "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, Aranet4 environment sensors, SwitchBot temp and humidity sensors, KilovaultHLXPlus smart batteries, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/MopekaTankSensor.js

@@ -276,7 +276,7 @@ class MopekaTankSensor extends BTSensor{
         this.addParameter("medium",
             {
                 title:"type of liquid in tank",
-                enum: Object.keys(Media)   
+                enum: Object.keys(Media)
             }
         )
         this.addParameter("tankHeight",
@@ -286,34 +286,43 @@ class MopekaTankSensor extends BTSensor{
                 unit:"mm"
             }
         )
+        this.addDefaultParam("id")
 
-        this.addMetadatum("battVolt","V","sensor battery in volts", 
-            ((buffer)=>{ 
+        this.addDefaultPath("battVolt","sensors.batteryVoltage") 
+            .read=((buffer)=>{ 
                 this.battVolt = (buffer.readUInt8(1)/32) 
                 return this.battVolt
             }).bind(this)
-        )
-        this.addMetadatum("battStrength","ratio","sensor battery strength", 
-            (buffer)=>{ return Math.max(0, Math.min(1, (((this.battVolt) - 2.2) / 0.65))) }
-        )
+        
+        this.addDefaultPath("battStrength", "sensors.batteryStrength") 
+            .read=(buffer)=>{ return Math.max(0, Math.min(1, (((this.battVolt) - 2.2) / 0.65))) }
+        
         this.addMetadatum("temp","K","temperature", 
             ((buffer)=>{ 
                 this.temp = parseFloat(((buffer.readUInt8(2)&0x7F)+233.15).toFixed(2))
                 return this.temp
-            }).bind(this)
+            })
         )
+        .default="tanks.{id}.temperature"
         this.addMetadatum("tankLevel","ratio","tank level", 
             (buffer)=>{ return (this._tankLevel(((buffer.readUInt16LE(3))&0x3FFF)))/this.getTankHeight()}
         )
+        .default="tanks.{id}.currentLevel"
+
         this.addMetadatum("readingQuality","","quality of read", 
             (buffer)=>{ return buffer.readUInt8(4)>>6}
         )
+        .default="sensors.{macAndName}.readingQuality"
+
         this.addMetadatum("accX","Mg","acceleration on X-axis", 
             (buffer)=>{ return buffer.readUInt8(8)}
         )
+        .default="sensors.{macAndName}.accelerationXAxis"
+
         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
             (buffer)=>{ return buffer.readUInt8(9)}
         )        
+        .default="sensors.{macAndName}.accelerationYAxis"
     }
 
     propertiesChanged(props){
@@ -326,8 +335,8 @@ class MopekaTankSensor extends BTSensor{
         if (this.name)
             return this.name
 
-        const _name = MopekaDevices.get(this?.modelID??0x0).name
-        return _name?_name:MopekaDevices.get(0x0).name
+        const _name = MopekaDevice.get(this?.modelID??0x0).name
+        return _name?_name:MopekaDevice.get(0x0).name
         
     }
 }

package/sensor_classes/UltrasonicWindMeter.js

@@ -27,16 +27,20 @@ class UltrasonicWindMeter extends BTSensor{
         )
 
     }
-    async init(){
-        await super.init()
-        this.addMetadatum("batt","ratio","Battery strength",
-            (buffer)=>{return (buffer.readUInt8())/100})
+     initSchema(){
+        super.initSchema()
+        this.addDefaultPath("batt",'sensors.batteryStrength')
+            .read=(buffer)=>{return (buffer.readUInt8())/100}
+
         this.addMetadatum("awa","rad","Apparent Wind Angle",
             (buffer)=>{return ((buffer.readInt16LE())/100)*(Math.PI/180)}
         )
+        .default='environment.wind.angleApparent'
+
         this.addMetadatum("aws","m/s","Apparent Wind Speed",
         (buffer)=>{return (buffer.readInt16LE()/100)*.514444} //convert knots to m/s
         )
+        .default='environment.wind.speedApparent'
     }
 
     initGATTConnection(){ 

package/sensor_classes/VictronACCharger.js

@@ -31,28 +31,39 @@ class VictronACCharger extends VictronSensor{
 
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("id")
 
         this.addMetadatum('state','', 'device state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
-
+            .default= "electrical.chargers.{id}.state"
         this.addMetadatum('chargerError','', 'charger error code', 
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
- 
+            .default= "electrical.chargers.{id}.error"
+
         this.addMetadatum('batt1','V', 'battery 1 voltage')
+        .default= "electrical.chargers.{id}.battery1.voltage"
 
         this.addMetadatum('curr1','A', 'battery 1 current')
+        .default= "electrical.chargers.{id}.battery1.current"
 
         this.addMetadatum('batt2','V', 'battery 2 voltage')
+        .default= "electrical.chargers.{id}.battery2.voltage"
 
         this.addMetadatum('curr2','A', 'battery 2 current')
+        .default= "electrical.chargers.{id}.battery2.current"
 
         this.addMetadatum('batt3','V', 'battery 3 voltage')
+        .default= "electrical.chargers.{id}.battery3.voltage"
 
         this.addMetadatum('curr3','A', 'battery 3 current')
-    
-        this.addMetadatum('temp', 'K', 'battery temperature')
+        .default= "electrical.chargers.{id}.battery3.current"
+
+        this.addMetadatum('temp', 'K', 'charger temperature')
+        .default= "electrical.chargers.{id}.temperature"
 
         this.addMetadatum('acCurr','A', 'AC current')
+        .default= "electrical.chargers.{id}.ac.current"
+
     }
     emitValuesFrom(buffer){
         super.emitValuesFrom(buffer)

package/sensor_classes/VictronInverterRS.js

@@ -11,22 +11,33 @@ class VictronInverterRS extends VictronSensor{
     
 
      initSchema() {
-         super.initSchema()
-        
+        super.initSchema()
+        this.addDefaultParam("id")
         this.addMetadatum('deviceState','', 'inverter device state', 
-                (buff)=>{return VC.OperationMode.get(buff.readIntU8(0))})
+            (buff)=>{return VC.OperationMode.get(buff.readIntU8(0))})
+            .default='electrical.inverters.{id}.state'    
+
         const md = this.addMetadatum('chargerError','', 'charger error',
-                (buff)=>{return VC.ChargerError(buff.readIntU8(1))})
-        md.notify=true
+            (buff)=>{return VC.ChargerError(buff.readIntU8(1))})
+            .default='electrical.inverters.{id}.error'
+            md.notify=true
 
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
+            .default='electrical.inverters.{id}.battery.voltage'
+        
         this.addMetadatum('pvPower','W', 'PV power', 
             (buff)=>{return this.NaNif(buff.readUInt16LE(4), 0xffff)})
+            .default='electrical.inverters.{id}.power'
+        
         this.addMetadatum('yieldToday','W', 'yield yoday in watts', 
             (buff)=>{return this.NaNif(buff.readUInt16LE(6), 0xffff)*10})
+            .default='electrical.inverters.{id}.yieldToday'
+ 
         this.addMetadatum('acOutPower','W', 'AC out power in watts', 
-            (buff)=>{this.NaNif(buff.readInt16LE(8), 0x7fff)})                
+            (buff)=>{this.NaNif(buff.readInt16LE(8), 0x7fff)}) 
+            .default='electrical.inverters.{id}.ac.power'
+              
     }
 
     emitValuesFrom(decData){

package/sensor_classes/VictronLynxSmartBMS.js

@@ -22,24 +22,28 @@ class VictronLynxSmartBMS extends VictronSensor{
         return await this.identifyMode(device, 0x0A)
     }   
 
- 
     initSchema(){
         super.initSchema()
         this.addMetadatum('error','', 'error code', 
             (buff)=>{return buff.readUInt8(0)})
  
-        this.addMetadatum('ttg','s', 'time to go (in seconds)',
-            (buff)=>{return this.NaNif(buff.readUInt16LE(1),0xFFFF)*60})
-        this.addMetadatum('voltage','V', 'channel 1 voltage',
-            (buff)=>{return this.NaNif(buff.readInt16LE(3),0x7FFF)/100})
-        this.addMetadatum('current','A','channel 1 current', 
-            (buff)=>{return this.NaNif(buff.readInt16LE(5),0x7FFF)/10})
+        this.addDefaultPath('ttg','electrical.batteries.capacity.timeRemaining')
+            .read=(buff)=>{return this.NaNif(buff.readUInt16LE(1),0xFFFF)*60}
+        this.addDefaultPath('voltage','electrical.batteries.voltage')
+            .read=(buff)=>{return this.NaNif(buff.readInt16LE(3),0x7FFF)/100}
+        this.addDefaultPath('current','electrical.batteries.current') 
+            .read=(buff)=>{return this.NaNif(buff.readInt16LE(5),0x7FFF)/10}
+        
         this.addMetadatum('ioStatus','','IO Status', //TODO
             (buff)=>{return buff.readUInt16LE(7)})
+
         this.addMetadatum('warningsAndAlarms','','warnings and alarms')
-        this.addMetadatum('soc','','state of charge')
+
+        this.addDefaultPath('soc','electrical.batteries.capacity.stateOfCharge')
         this.addMetadatum('consumedAh','Ah','amp-hours consumed')
-        this.addMetadatum('temp', 'K', 'battery temperature')
+        .default="electrical.batteries.{batteryID}.capacity.ampHoursConsumed"
+        
+        this.addDefaultPath('temp', 'electrical.batteries.temperature')
     }
     emitValuesFrom(buffer){
         super.emitValuesFrom(buffer)

package/sensor_classes/VictronOrionXS.js

@@ -10,20 +10,32 @@ class VictronOrionXS extends VictronSensor{
     }   
      initSchema() {
         super.initSchema()
+        this.addDefaultParam("id")
         this.addMetadatum('deviceState','', 'device state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
+            .default="electrical.chargers.{id}.state"
+
         this.addMetadatum('chargerError','', 'charger error',
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(1))})
+            .default="electrical.chargers.{id}.error"
+
         this.addMetadatum('outputVoltage','V', 'output voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FF)/100})
+            .default="electrical.chargers.{id}.output.voltage"
+            
+        
         this.addMetadatum('current','A','output current', 
             (buff)=>{return this.NaNif(buff.readUInt16LE(4),0xFFFF)/10})
+            .default="electrical.chargers.{id}.output.current"
         this.addMetadatum('inputVoltage','V', 'input voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(6),0x07FF)/100})
+            .default="electrical.chargers.{id}.input.voltage"
         this.addMetadatum('inputCurrent','A','input current', 
             (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(buff.readUInt32BE(10))})    
+            (buff)=>{return VC.OffReasons(buff.readUInt32BE(10))})
+            .default="electrical.chargers.{id}.offReason"    
         }
 
 }