homebridge-lib 5.7.1 → 5.7.2

package/lib/EveHomeKitTypes.js

@@ -188,7 +188,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       unit: 'kWh',
       minValue: 0,
       maxValue: 1000000,
-      minStep: 0.1,
+      minStep: 0.01,
       perms: [this.Perms.READ, this.Perms.NOTIFY]
     }, 'Total Consumption')
 

package/lib/MyHomeKitTypes.js

@@ -168,6 +168,8 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       * <br>Used by: homebridge-hue for Hue Entertainment groups.
       * @property {Class} SubEnabled - Enabled/disable Sub.
       * <br>Used by: homebridge-zp in Speaker service.
+      * @property {Class} SubLevel - Level for the Sub.
+      * <br>Used by: homebridge-zp in Speaker service.
       * @property {Class} Sunrise - Date/time of today's sun rise.
       * <br>Used by: homebridge-hue, homebridge-ws.
       * @property {Class} Sunset - Date/time of today's sun set.
@@ -749,6 +751,14 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       adminOnlyAccess: [this.Access.WRITE]
     }, 'Expose Schedules')
 
+    this.createCharacteristicClass('SubLevel', uuid('07D'), {
+      format: this.Formats.INT,
+      minValue: -15,
+      maxValue: 15,
+      minStep: 1,
+      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+    }, 'Sub Level')
+
     // Characteristic for Unique ID, used by homebridge-hue.
     // Source: as exposed by the Philips Hue bridge.  This characteristic is
     // used by the Hue app to select the accessories when syncing Hue bridge

package/lib/ServiceDelegate/History/Consumption.js

@@ -96,11 +96,11 @@ class Consumption extends History {
     if (this._consumption != null && this._time != null) {
       const delta = this._consumptionDelegate.value - this._consumption // kWh
       const period = now - this._time // s
-      const power = Math.round(1000 * 3600 * delta / period) // W
+      const power = 1000 * 3600 * delta / period // W
       if (this._powerDelegate != null) {
-        this._powerDelegate.value = power
+        this._powerDelegate.value = Math.round(power) // W
       }
-      this._entry.power = power
+      this._entry.power = Math.round(power * 10) // 0.1 W * 10 min
       super._addEntry(now)
     }
     this._consumption = this._consumptionDelegate.value
@@ -115,7 +115,7 @@ class Consumption extends History {
         '|0c %s %s 01 %s',
         numToHex(swap32(this._h.currentEntry), 8),
         numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.power * 10), 4)
+        numToHex(swap16(entry.power), 4)
       )
     }
     if (entry.power == null) {
@@ -130,7 +130,7 @@ class Consumption extends History {
       '|0d %s %s 03 %s %s',
       numToHex(swap32(this._h.currentEntry), 8),
       numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.power * 10), 4),
+      numToHex(swap16(entry.power), 4),
       numToHex(entry.on, 2)
     )
   }

package/lib/ServiceDelegate/History/Contact.js

@@ -79,8 +79,7 @@ class Contact extends History {
       key: 'resetTotal',
       Characteristic: this.Characteristics.eve.ResetTotal,
       value: params.resetTotal
-    })
-    this._characteristicDelegates.resetTotal.on('didSet', (value) => {
+    }).on('didSet', (value) => {
       timesOpenedDelegate.value = 0
     })
   }

package/lib/ServiceDelegate/History/Power.js

@@ -77,8 +77,8 @@ class Power extends History {
       const now = Math.round(new Date().valueOf() / 1000)
       if (this._time != null) {
         const delta = this._power * (now - this._time) // Ws
-        this._runningConsumption += Math.round(delta / 600.0) // W * 10 min
-        this._totalConsumption += Math.round(delta / 3600000.0) // kWh
+        this._runningConsumption += Math.round(delta / 60.0) // 0.1W * 10 min
+        this._totalConsumption += delta / 36000.0 // 0.01 kWh
       }
       this._power = value
       this._time = now
@@ -87,8 +87,7 @@ class Power extends History {
       key: 'resetTotal',
       Characteristic: this.Characteristics.eve.ResetTotal,
       value: params.resetTotal
-    })
-    this._characteristicDelegates.resetTotal.on('didSet', (value) => {
+    }).on('didSet', (value) => {
       this._runningConsumption = 0
       this._totalConsumption = 0
       this._consumptionDelegate.value = this._totalConsumption
@@ -106,14 +105,14 @@ class Power extends History {
   }
 
   _addEntry () {
-    // Sensor delivers currentConsumption, compute totalConsumption
     const now = Math.round(new Date().valueOf() / 1000)
+    // Sensor delivers currentConsumption, compute totalConsumption
     if (this._time != null) {
       const delta = this._power * (now - this._time) // Ws
-      this._runningConsumption += Math.round(delta / 600.0) // W * 10 min
-      this._totalConsumption += Math.round(delta / 3600000.0) // kWh
-      this._consumptionDelegate.value = this._totalConsumption
-      this._entry.power = this._runningConsumption
+      this._runningConsumption += delta / 60.0 // 0.1 W * 10 min
+      this._totalConsumption += delta / 36000.0 // 0.01 kWh
+      this._consumptionDelegate.value = Math.round(this._totalConsumption) / 100.0 // kWh
+      this._entry.power = Math.round(this._runningConsumption) // 0.1 W * 10 min
       super._addEntry(now)
     } else if (this._entry.on != null) {
       super._addEntry(now)
@@ -131,7 +130,7 @@ class Power extends History {
         '|0c %s %s 01 %s',
         numToHex(swap32(this._h.currentEntry), 8),
         numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.power * 10), 4)
+        numToHex(swap16(entry.power), 4)
       )
     }
     if (entry.power == null) {
@@ -146,7 +145,7 @@ class Power extends History {
       '|0d %s %s 03 %s %s',
       numToHex(swap32(this._h.currentEntry), 8),
       numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.power * 10), 4),
+      numToHex(swap16(entry.power), 4),
       numToHex(entry.on, 2)
     )
   }

package/lib/ServiceDelegate/History/Thermo.js

@@ -72,12 +72,15 @@ class Thermo extends ServiceDelegate.History {
       setTemp: targetTemperatureDelegate.value,
       valvePosition: valvePositionDelegate.value
     }
-    temperatureDelegate
-      .on('didSet', (value) => { this._entry.currentTemp = value })
-    targetTemperatureDelegate
-      .on('didSet', (value) => { this._entry.setTemp = value })
-    valvePositionDelegate
-      .on('didSet', (value) => { this._entry.valvePosition = value })
+    temperatureDelegate.on('didSet', (value) => {
+      this._entry.currentTemp = value
+    })
+    targetTemperatureDelegate.on('didSet', (value) => {
+      this._entry.setTemp = value
+    })
+    valvePositionDelegate.on('didSet', (value) => {
+      this._entry.valvePosition = value
+    })
   }
 
   // I think 1201 and 1d01 are for current mode and target more, but it doesn't

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.7.1",
+  "version": "5.7.2",
   "keywords": [
     "homekit",
     "homebridge"