bt-sensors-plugin-sk 1.2.0-beta.0.0.1.test → 1.2.0-beta.0.0.10

package/sensor_classes/Aranet4.js

@@ -15,27 +15,33 @@ class Aranet4 extends AranetSensor{
         return null
     }
     
-    async init() {
-        await super.init()
-        this.initMetadata()
-    }
 
-    initMetadata(){
-            this.addMetadatum('co2', 'ppm',  'co2 concentration',
-                (buff)=>{return ((buff.readUInt16LE(8)))})
-            this.addMetadatum('temp','K', 'temperature',
-                (buff)=>{return parseFloat((273.15+(buff.readInt16LE(10))/20).toFixed(2))})
+    initSchema(){
 
-            this.addMetadatum("pressure","hPa","atmospheric pressure", 
-                (buff)=>{return ((buff.readUInt16LE(12)))/10})
 
-            this.addMetadatum('humidity','ratio', 'humidity',
-                (buff)=>{return ((buff.readUInt8(14))/100)})
-            this.addMetadatum('batteryStrength', 'ratio',  'sensor battery strength',
-                (buff)=>{return ((buff.readUInt8(15))/100)})
-            this.addMetadatum('color', '',  'Warning color (G Y R)',
-                (buff)=>{return this.COLOR[buff.readUInt8(16)]})
+        super.initSchema()
+        this.addMetadatum('co2', 'ppm',  'co2 concentration in zone',
+            (buff)=>{return ((buff.readUInt16LE(8)))})
+            .default="environment.{zone}.co2"
+            
+        this.addDefaultPath('temp','environment.temperature')
+        .read=
+            (buff)=>{return parseFloat((273.15+(buff.readInt16LE(10))/20).toFixed(2))}     
             
+        this.addDefaultPath("pressure","environment.pressure") 
+        .read=(buff)=>{return ((buff.readUInt16LE(12)))/10}
+      
+        this.addDefaultPath('relativeHumidity','environment.relativeHumidity')
+        .read=(buff)=>{return ((buff.readUInt8(14))/100)}
+        
+        this.addMetadatum('color', '',  'Warning color (G Y R)',
+            (buff)=>{return this.COLOR[buff.readUInt8(16)]})
+            .default="environment.{zone}.warningColor"
+        
+        this.addDefaultPath("battery","sensors.batteryStrength")   
+            .read=(buff)=>{return ((buff.readUInt8(15))/100)}
+
+                    
     }
     propertiesChanged(props){
         super.propertiesChanged(props)    

package/sensor_classes/GoveeH50xx.js

@@ -17,18 +17,18 @@ class GoveeH50xx extends  BTSensor {
         t
     }
 
-    async init(){
-        await super.init()
-        this.initMetadata()
-    }
-    initMetadata(){
-        this.addMetadatum('temp','K', 'temperature', 
-            (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) 
-        })
-        this.addMetadatum('humidity','ratio', 'humidity', 
-            (buffer)=>{return buffer.readUInt16LE(3)/10000    
-        })
-        this.addMetadatum('battery','ratio', 'battery strength', (buffer)=>{return buffer.readUInt8(5)/100})
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+
+        this.addDefaultPath("temp","environment.temperature")
+            .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
+        
+        this.addDefaultPath("humidity", "environment.humidity")
+            .read = (buffer)=>{return buffer.readUInt16LE(3)/10000}   
+
+        this.addDefaultPath("battery","sensors.batteryStrength")   
+            .read = (buffer)=>{return buffer.readUInt8(5)/100}
     }
 
     getManufacturer(){

package/sensor_classes/GoveeH510x.js

@@ -34,11 +34,10 @@ class GoveeH510x extends BTSensor{
         
     }
 
-    async init(){
-        await super.init()
-        this.initMetadata()
-    }
-    initMetadata(){
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath("temp","environment.temperature")
         this.addDefaultPath("humidity", "environment.humidity")
         this.addDefaultPath("battery","sensors.batteryStrength")        

package/sensor_classes/IBeacon.js

@@ -4,22 +4,26 @@ class IBeacon extends BTSensor {
     static isSystem = true;
 
     static async identify(device) {
-        const md = await this.getDeviceProp(device,'ManufacturerData');
+        /*const md = await this.getDeviceProp(device,'ManufacturerData');
         if (md && Object.hasOwn(md, 0x004c)) {
             if (md[0x004c].value.slice(0,2).join() == [0x02, 0x15].join()) {
             return this
             }
-        }
+        }*/
+       // IBeacon protocol (see above) is incorporated into multiple BT devices
+       // The identify:: method above will misidentify any sensor (Govee for example)
+       // that the scanner finds.
+       // Sensors can still be classified as IBeacons, they'll appear as Unknown devices in 
+       // the config. Users can then select IBeacon from the dropdown to
+       // instantiate the sensor as an IBeacon object.
+       
     return null
     }
 
-    async init() {
-        await super.init();
-        this.initMetadata();
-    }
-
-    initMetadata(){
-        this.addMetadatum('battery','ratio', 'Battery charge state', (buffer)=>{return buffer[6]})
+    initSchema(){
+        super.initSchema()
+        this.addDefaultPath("battery","sensors.batteryStrength")   
+        .read=(buffer)=>{return buffer[6]}
     }
 
     propertiesChanged(props){

package/sensor_classes/Inkbird.js

@@ -13,8 +13,10 @@ class Inkbird extends BTSensor{
         
     }
 
-    async init(){
-        await super.init()
+    initSchema() {
+        super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath('temp','environment.temperature')
         this.addDefaultPath('battery', 'sensors.batteryStrength')
         if (this.getName() == 'sps'){

package/sensor_classes/JBDBMS.js

@@ -28,28 +28,37 @@ class JBDBMS extends BTSensor {
     return await this.txChar.writeValueWithResponse(Buffer.from(this.jbdCommand(command)))
 
 }
-  async init(){
-      await super.init()
-      this.addMetadatum('voltage', 'V', 'Total battery voltage', 
-        (buffer)=>{return buffer.readUInt16BE(4) / 100})
-      this.addMetadatum('current',  'A',  'Current flow',
-        (buffer)=>{return buffer.readInt16BE(6) / 100} )
-      this.addMetadatum('remainingCapacity', 'Ah',  'Remaining battery capacity', 
-        (buffer)=>{return buffer.readUInt16BE(8) / 100} )
-      this.addMetadatum('capacity', 'Ah',  'Battery capacity', 
-        (buffer)=>{return buffer.readUInt16BE(10) / 100} )
-      this.addMetadatum('cycles', '', 'cycles',
-        (buffer)=>{return buffer.readUInt16BE(12)} )
+  async initSchema(){
+      super.initSchema()
+      this.addDefaultParam("batteryID")
+     
+      this.addDefaultPath('voltage','electrical.batteries.voltage')
+        .read=(buffer)=>{return buffer.readUInt16BE(4) / 100}
+
+      this.addDefaultPath('voltage','electrical.batteries.current')
+        .read=(buffer)=>{return buffer.readInt16BE(6) / 100} 
+      
+      this.addDefaultPath('remainingCapacity','electrical.batteries.capacity.remaining')
+        .read=(buffer)=>{return buffer.readUInt16BE(8) / 100} 
+      
+      this.addDefaultPath('capacity','electrical.batteries.capacity.actual')
+        .read=(buffer)=>{return buffer.readUInt16BE(10) / 100} 
+     
+      this.addDefaultPath('cycles','electrical.batteries.cycles' )
+        .read=(buffer)=>{return buffer.readUInt16BE(12)} 
+
       this.addMetadatum('protectionStatus', '', 'Protection Status',
-          (buffer)=>{return buffer.readUInt16BE(20)} )
-        
-      this.addMetadatum('SOC', 'ratio', 'State of Charge',
-        (buffer)=>{return buffer.readUInt8(23)/100} )
+        (buffer)=>{return buffer.readUInt16BE(20)} )
+        .default="electrical.batteries.{batteryID}.protectionStatus"
+         
+      this.addDefaultPath('SOC','electrical.batteries.capacity.stateOfCharge')
+        .read=(buffer)=>{return buffer.readUInt8(23)/100} 
       
       this.addMetadatum('FET', '', 'FET Control',
           (buffer)=>{return buffer.readUInt8(24)} )
+          .default="electrical.batteries.{batteryID}.FETControl"
   
-      await this.device.connect()
+      await this.deviceConnect()
       await this.initCharacteristics()
       const cellsAndTemps = await this.getNumberOfCellsAndTemps()
       this.numberOfCells=cellsAndTemps.cells
@@ -65,23 +74,22 @@ class JBDBMS extends BTSensor {
       for (let i=0; i<this.numberOfCells; i++){
         this.addMetadatum(`cell${i}Voltage`, 'V', `Cell ${i+1} voltage`,
           (buffer)=>{return buffer.readUInt16BE((4+(i*2)))/1000} )
+          .default=`electrical.batteries.{batteryID}.cell${i}.voltage`
         this.addMetadatum(`cell${i}Balance`, 'V', `Cell ${i+1} balance` )
+          .default=`electrical.batteries.{batteryID}.cell${i}.balance`
+        
       }
-
-
-    }
+  }
   hasGATT(){
     return true
   }
-  initCharacteristics(){ 
-    return new Promise((resolve,reject )=>{ this.device.connect().then(async ()=>{ 
+  async initCharacteristics(){ 
       const gattServer = await this.device.gatt()
       const txRxService= await gattServer.getPrimaryService(this.constructor.TX_RX_SERVICE)
       this.rxChar = await txRxService.getCharacteristic(this.constructor.NOTIFY_CHAR_UUID)
       this.txChar = await txRxService.getCharacteristic(this.constructor.WRITE_CHAR_UUID)
       await this.rxChar.startNotifications()
-      resolve(this)
-    }) .catch((e)=>{ reject(e.message) }) }) 
+      return this
   }
 
   async initGATTNotifications(){
@@ -92,7 +100,7 @@ class JBDBMS extends BTSensor {
 
   emitGATT(){
     this.getAndEmitBatteryInfo()
-    setTimeout(()=>{this.getAndEmitCellVoltages()}, 5000)
+    setTimeout(()=>{this.getAndEmitCellVoltages()}, 10000)
   }
 
   async getNumberOfCellsAndTemps(){

package/sensor_classes/KilovaultHLXPlus.js

@@ -60,35 +60,52 @@ class KilovaultHLXPlus extends BTSensor{
         // Nothing to do here.  HLX+ only reports via BLE notify, not BLE read
     }
 
-    async init(){
-        await super.init()
-
-        this.addMetadatum("voltage","V","Battery Voltage",
-            (buffer)=>{return Number(buffer.readInt16LE(0)) / 1000})
-        this.addMetadatum("current","A","Battery Current",
-            (buffer)=>{return buffer.readInt32LE(4) / 1000})
-        this.addMetadatum("energy","AHr","Battery Capacity",
-            (buffer)=>{return buffer.readInt32LE(8) / 1000})
-        this.addMetadatum("cycles","","Number of Charge Cycles",
-            (buffer)=>{return buffer.readInt16LE(12)})
-        this.addMetadatum("soc","ratio","Battery State of Charge",
-            (buffer)=>{return buffer.readInt16LE(14)})
-        this.addMetadatum("temperature","K","Battery Temperature",
-            (buffer)=>{return buffer.readInt16LE(16)/10 })
+    async initSchema(){
+        super.initSchema()
+        this.addDefaultParam("batteryID")
+
+        this.addDefaultPath("voltage","electrical.batteries.voltage")
+            .read=(buffer)=>{return Number(buffer.readInt16LE(0)) / 1000}
+       
+        this.addDefaultPath("current","electrical.batteries.current")
+            .read=(buffer)=>{return buffer.readInt32LE(4) / 1000}
+        
+        this.addDefaultPath("energy", "electrical.batteries.capacity.remaining")
+            .read=(buffer)=>{return buffer.readInt32LE(8) / 1000}
+        
+        this.addDefaultPath("cycles",'electrical.batteries.cycles')
+            .read=(buffer)=>{return buffer.readInt16LE(12)}
+
+        this.addDefaultPath("soc",'electrical.batteries.capacity,stateOfCharge')
+            .read=(buffer)=>{return buffer.readInt16LE(14)}
+        
+        this.addDefaultPath("temperature",'electrical.batteries.temperature')
+            .read=(buffer)=>{return buffer.readInt16LE(16)/10 }
 
         this.addMetadatum("status","","Battery Status",
             (buffer)=>{return buffer.readInt16LE(18) })
+            .default="electrical.batteries.{batteryID}.status"
+
         this.addMetadatum("AFEStatus","","Battery AFE Status",
             (buffer)=>{return buffer.readInt16LE(20) })
+            .default="electrical.batteries.{batteryID}.AFEStatus"
 
         this.addMetadatum("cell1_voltage","V","Cell 1 Voltage",
             (buffer)=>{return buffer.readInt16LE(22) / 1000})
+            .default="electrical.batteries.{batteryID}.cell1.voltage"
+
         this.addMetadatum("cell2_voltage","V","Cell 2 Voltage",
             (buffer)=>{return buffer.readInt16LE(24) / 1000})
+            .default="electrical.batteries.{batteryID}.cell2.voltage"
+
         this.addMetadatum("cell3_voltage","V","Cell 3 Voltage",
             (buffer)=>{return buffer.readInt16LE(26) / 1000})
+            .default="electrical.batteries.{batteryID}.cell3.voltage"
+
         this.addMetadatum("cell4_voltage","V","Cell 4 Voltage",
             (buffer)=>{return buffer.readInt16LE(28) / 1000})
+            .default="electrical.batteries.{batteryID}.cell4.voltage"
+
     }
 
     // Concatentate chunks received by notification into a complete message.
@@ -175,7 +192,7 @@ class KilovaultHLXPlus extends BTSensor{
     }
 
     initGATTConnection(){ 
-        return new Promise((resolve,reject )=>{ this.device.connect().then(async ()=>{ 
+        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
             if (!this.gattServer) { 
                 this.gattServer = await this.device.gatt() 
                 this.battService = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 

package/sensor_classes/LancolVoltageMeter.js

@@ -14,9 +14,10 @@ class LancolVoltageMeter extends BTSensor{
         
     }
 
-    async init(){
-        await super.init()
-        this.addMetadatum('voltage','V', 'battery voltage')
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("batteryID")
+        this.addDefaultPath('voltage',"electrical.batteries.voltage")
     }
 
     getManufacturer(){

package/sensor_classes/MopekaTankSensor.js

@@ -257,7 +257,6 @@ class MopekaTankSensor extends BTSensor{
         await super.init()
         const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
         this.modelID = md[0]
-        this.initMetadata()
     } 
 
     getMedium(){
@@ -272,11 +271,12 @@ class MopekaTankSensor extends BTSensor{
         return rawLevel * (coefs[0] + (coefs[1] * (this.temp-233.15)) + (coefs[2] * ((this.temp-233.15)^2)))
     }
     
-    initMetadata(){
+    initSchema(){
+        super.initSchema()
         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){

package/sensor_classes/Renogy/RenogySensor.js

@@ -57,7 +57,7 @@ class RenogySensor extends BTSensor{
         )
       
 
-        await this.device.connect()
+        await this.deviceConnect()
         const rw = await this.constructor.getReadWriteCharacteristics(this.device)
 
         this.readChar = rw.read    

package/sensor_classes/RenogyBattery.js

@@ -22,25 +22,27 @@ class RenogyBattery extends RenogySensor {
     initMetadata(){
 
         this.addMetadatum('numberOfCells','', 'number of cells')
-        this.addMetadatum('current','A','current',
-             (buffer)=>{return buffer.readInt16BE(3)/100})
+        this.addDefaultPath('current','electrical.batteries.current')
+            .read=(buffer)=>{return buffer.readInt16BE(3)/100}
              
-        this.addMetadatum('voltage','V','voltage',
-            (buffer)=>{return buffer.readUInt16BE(5)/10})
+        this.addDefaultPath('voltage','electrical.batteries.voltage')
+            .read=(buffer)=>{return buffer.readUInt16BE(5)/10}
         
-        this.addMetadatum('remainingCharge', 'Ah', 'remaining charge',  //TODO: units 
-            (buffer)=>{return buffer.readUInt32BE(7)/1000})
-
-        this.addMetadatum('capacity','Ah', 'capacity',
-            (buffer)=>{return buffer.readUInt32BE(11)/1000})
+        this.addDefaultPath('remainingCharge', 'electrical.batteries.capacity.remaining') 
+            .read=(buffer)=>{return buffer.readUInt32BE(7)/1000}
+        
+        this.addDefaultPath('capacity', 'electrical.batteries.capacity.actual') 
+            .read=(buffer)=>{return buffer.readUInt32BE(11)/1000}
 
         for (let i = 0; i++ ; i < this.numberOfCells) {
             this.addMetadatum(`cellVoltage${i}`, 'V', `cell #${i} voltage`,
-                (buffer)=>{ return buffer.readUInt16(5+ i*2) }
-            )
+                (buffer)=>{ return buffer.readUInt16(5+ i*2) })
+            .default=`electrical.batteries.{batteryID}.cell${i}.voltage`
+
             this.addMetadatum(`cellTemp${i}`, 'K', `cell #${i} temperature`,
-                (buffer)=>{ return buffer.readUInt16(5+ i*2)+273.15 }
-            )
+                (buffer)=>{ return buffer.readUInt16(5+ i*2)+273.15 })
+                .default=`electrical.batteries.{batteryID}.cell${i}.temperature`
+
         }
     }
     async initGATTConnection() {

package/sensor_classes/RenogyRoverClient.js

@@ -10,13 +10,12 @@ class RenogyRoverClient extends RenogySensor {
 
     async init(){
         await super.init()
-        this.initMetadata()
         this.modelID=await this.retrieveModelID()
     }
 
-    initMetadata(){
+    initSchema(){
         //Buffer(73) [1, 3, 68, 32, 32, 82, 78, 71, 45, 67, 84, 82, 76, 45, 87, 78, 68, 51, 48, 7, 140, 0, 132, 0, 126, 0, 120, 0, 111, 0, 106, 100, 50, 0, 5, 0, 120, 0, 120, 0, 28, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 5, 0, 5, 2, 148, 0, 5, 206, 143, 34, 228, buffer: ArrayBuffer(8192), byteLength: 73, byteOffset: 6144, length: 73, Symbol(Symbol.toStringTag): 'Uint8Array']
-
+        super.initSchema()
         this.addMetadatum('batteryType', '', "battery type")
         this.addMetadatum('batteryPercentage', 'ratio', "battery percentage",
              (buffer)=>{return buffer.readUInt16BE(3) })

package/sensor_classes/RuuviTag.js

@@ -8,14 +8,17 @@ class RuuviTag extends BTSensor{
             return null
     }    
         
-    async init(){
-        await super.init()
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+
         const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
         this.mode = md[0]
         if (this['_initModeV'+this.mode])
             this['_initModeV'+this.mode]()
         else    
             throw new Error("Unrecognized Ruuvitag data mode "+md[0])
+
     } 
 
 /**
@@ -35,33 +38,39 @@ class RuuviTag extends BTSensor{
 18-23	Any valid mac	48bit MAC address.
  **/
     _initModeV5(){
-        this.addMetadatum("temp","K","temperature in Kelvin", 
-            (buffer)=>{ return parseFloat((273.15+buffer.readInt16BE(1)*.005).toFixed(3))}
-        )
-        this.addMetadatum("humidity","ratio","humidity", 
-            (buffer)=>{ return parseFloat(((buffer.readUInt16BE(3)*.0025)/100).toFixed(2))}
-        )
-        this.addMetadatum("pressure","Pa","atmospheric pressure", 
-            (buffer)=>{ return buffer.readUInt16BE(5)+50000}
-        )
+        this.addDefaultPath("temp","environment.temperature") 
+        .read=(buffer)=>{ return parseFloat((273.15+buffer.readInt16BE(1)*.005).toFixed(3))}
+       
+        this.addDefaultPath("humidity","environment.humidity") 
+        .read=(buffer)=>{ return parseFloat(((buffer.readUInt16BE(3)*.0025)/100).toFixed(2))}
+        
+        this.addDefaultPath("pressure","environment.pressure") 
+        .read=(buffer)=>{ return buffer.readUInt16BE(5)+50000}
+        
         this.addMetadatum("accX","Mg","acceleration on X-axis", 
             (buffer)=>{ return buffer.readInt16BE(7)}
-        )
+        ).default="sensors.{macAndName}.accX"
+        
         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
             (buffer)=>{ return buffer.readInt16BE(9)}
-        )
+        )        .default="sensors.{macAndName}.accY"
+        
         this.addMetadatum("accZ","Mg","acceleration on Z-axis", 
             (buffer)=>{ return buffer.readInt16BE(11)}
-        )
-        this.addMetadatum("battV","V","battery voltage", 
-            (buffer)=>{ return parseFloat((1.6+(buffer.readUInt16BE(13)>>5)/1000).toFixed(2))}
-        )
+        ) .default="sensors.{macAndName}.accZ"
+        
+        this.addDefaultPath("battV","sensors.batteryVoltage")
+        .read=(buffer)=>{ return parseFloat((1.6+(buffer.readUInt16BE(13)>>5)/1000).toFixed(2))}
+        
         this.addMetadatum("mc","","movement counter", 
             (buffer)=>{ return buffer.readUInt16BE(13) && 0x1F}
         )
+        .default="sensors.{macAndName}.movementCounter"
+
         this.addMetadatum("msc","","measurement sequence counter", 
             (buffer)=>{ return buffer.readUInt16BE(15)}
         )
+        .default="sensors.{macAndName}.measurementSequenceCounter"
         
     }
 
@@ -82,18 +91,18 @@ Offset	Allowed values	Description
  **/
 
     _initModeV3(){
-        this.addMetadatum("humidity","ratio","humidity", 
-            (buffer)=>{ return (buffer.readUInt(1)*.5)/100}
-        )
-        this.addMetadatum("temp","K","temperature in Kelvin", 
-            (buffer)=>{ return (buffer.readInt(2)+(buffer.readInt(3)/100))+273.15}
-        )
-        this.addMetadatum("pressure","Pa","atmospheric pressure", 
-            (buffer)=>{ return buffer.readUInt16BE(4)+50000}
-        )
+        this.addDefaultPath("humidity","environment.humidity") 
+        .read=(buffer)=>{ return (buffer.readUInt(1)*.5)/100}
+      
+        this.addDefaultPath("temp", "environment.temperature") 
+        .read=(buffer)=>{ return (buffer.readInt(2)+(buffer.readInt(3)/100))+273.15}
+        
+        this.addDefaultPath("pressure", "environment.pressure") 
+        .read=(buffer)=>{ return buffer.readUInt16BE(4)+50000}
+        
         this.addMetadatum("accX","Mg","acceleration on X-axis", 
             (buffer)=>{ return buffer.readInt16BE(6)}
-        )
+        ).
         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
             (buffer)=>{ return buffer.readInt16BE(8)}
         )

package/sensor_classes/ShellySBHT003C.js

@@ -13,11 +13,6 @@ class ShellySBHT003C extends AbstractBTHomeSensor {
 	 */
 	static SHORTENED_LOCAL_NAME = "SBHT-003C";
 
-	async init() {
-		await super.init();
-		this.initMetadata();
-	}
-
 	/**
 	 * @typedef ButtonPressEvent {string}
 	 */
@@ -78,31 +73,33 @@ class ShellySBHT003C extends AbstractBTHomeSensor {
 		return null;
 	}
 
-	initMetadata() {
-		this.addMetadatum(
+	initSchema() {
+		super.initSchema()
+		this.addDefaultParam("zone")
+
+		this.addDefaultPath(
 			"battery",
-			"ratio",
-			"battery level",
-			ShellySBHT003C.parseBatteryLevel,
-		);
-		this.addMetadatum(
+			"sensors.batteryStrength")
+		.read=ShellySBHT003C.parseBatteryLevel
+
+		this.addDefaultPath(
 			"temp",
-			"K",
-			"temperature",
-			ShellySBHT003C.parseTemperature,
-		);
-		this.addMetadatum(
-			"humidity",
-			"ratio",
+			"environment.temperature"
+		)
+		.read=ShellySBHT003C.parseTemperature
+
+		this.addDefaultPath(
 			"humidity",
-			ShellySBHT003C.parseHumidity,
-		);
+			"environment.humidity")
+		.read=ShellySBHT003C.parseHumidity,
+	
 		this.addMetadatum(
 			"button",
 			"enum",
 			"button",
 			ShellySBHT003C.parseShellySBHT003CButton,
-		);
+		)
+		.default="sensors.{macAndName}.button"
 	}
 }