homebridge-lib 6.5.1 → 6.6.0

package/lib/ServiceDelegate/History.js

@@ -223,10 +223,10 @@ class AverageConsumptionValue extends HistoryValue {
   prepareEntry (entry) { entry[this.id] = this._delegate.value * 10 }
 }
 
-class SwitchOnValue extends HistoryValue {
+class OnValue extends HistoryValue {
   get tag () { return 0x0E }
   get length () { return 1 }
-  get id () { return 'w' }
+  get id () { return 'o' }
   prepareEntry (entry) { entry[this.id] = this._delegate.value ? 1 : 0 }
   writeEntry (entry, buffer, offset) { buffer.writeInt8(entry[this.id], offset) }
 
@@ -237,7 +237,7 @@ class SwitchOnValue extends HistoryValue {
       const entry = { time: now }
       entry[this.id] = this._delegate.value ? 1 : 0
       parent.addEntry(entry)
-      parent.lastSwitchOnDelegate.value = parent.lastActivationValue(now)
+      parent.lastOnDelegate.value = parent.lastActivationValue(now)
     })
   }
 }
@@ -275,25 +275,6 @@ class MotionValue extends HistoryValue {
   }
 }
 
-class OnValue extends HistoryValue {
-  get tag () { return 0x1E }
-  get length () { return 1 }
-  get id () { return 'o' }
-  prepareEntry (entry) { entry[this.id] = this._delegate.value ? 1 : 0 }
-  writeEntry (entry, buffer, offset) { buffer.writeInt8(entry[this.id], offset) }
-
-  constructor (parent, delegate) {
-    super(parent, delegate)
-    delegate.on('didSet', (value) => {
-      const now = History.now()
-      const entry = { time: now }
-      entry[this.id] = this._delegate.value ? 1 : 0
-      parent.addEntry(entry)
-      parent.lastOnDelegate.value = parent.lastActivationValue(now)
-    })
-  }
-}
-
 class VocDensityValue extends HistoryValue {
   get tag () { return 0x22 }
   get id () { return 'q' }
@@ -309,6 +290,7 @@ class ButtonValue extends HistoryValue {
 class LightLevelValue extends HistoryValue {
   get tag () { return 0x30 }
   get id () { return 'l' }
+  prepareEntry (entry) { entry[this.id] = Math.max(1, this._delegate.value) }
 }
 
 // Types of delegates for characteristics for history data points.
@@ -321,11 +303,10 @@ const historyValueTypes = {
   totalConsumption: TotalConsumptionValue,
   consumption: ConsumptionValue,
   averageConsumption: AverageConsumptionValue,
-  switchOn: SwitchOnValue,
+  on: OnValue,
   valvePosition: ValvePositionValue,
   targetTemperature: TargetTemperatureValue,
   motion: MotionValue,
-  on: OnValue,
   vocDensity: VocDensityValue,
   button: ButtonValue,
   lightLevel: LightLevelValue
@@ -338,7 +319,6 @@ const historyDerivedTypes = {
   lastMotion: 'motion',
   lastOn: 'on',
   lastLightOn: 'lightOn',
-  lastSwitchOn: 'switchOn',
   computedConsumption: 'totalConsumption',
   computedTotalConsumption: 'consumption'
 }
@@ -402,10 +382,10 @@ class History extends ServiceDelegate {
     * for a `hap.Thermostat` service.
     * @param {?CharacteristicDelegate} params.onDelegate - The
     * `Characteristics.hap.On` characteristic delegate
-    * for a `hap.Outlet` service.
+    * for a `hap.Outlet` or a `hap.Switch` service.
     * @param {?CharacteristicDelegate} params.lastOnDelegate - The
     * `Characteristics.eve.LastActivation` characteristic delegate
-    * for a `hap.Outlet` service.
+    * for a `hap.Outlet` or a `hap.Switch` service.
     * @param {?CharacteristicDelegate} params.consumptionDelegate - The
     * `Characteristics.eve.Consumption` characteristic delegate
     * for a `hap.Outlet` or `eve.Consumption` service
@@ -432,12 +412,6 @@ class History extends ServiceDelegate {
     * @param {?CharacteristicDelegate} params.lastLightOnDelegate - A
     * `Characteristics.eve.LastActivation` characteristic delegate
     * for a `hap.Lightbulb` service.
-    * @param {?CharacteristicDelegate} params.switchOnDelegate - The
-    * `Characteristics.hap.On` characteristic delegate
-    * for a `hap.Switch` service.
-    * @param {?CharacteristicDelegate} params.lastSwitchOnDelegate - A
-    * `Characteristics.eve.LastActivation` characteristic delegate
-    * for a `hap.Switch` service.
     * @param {integer} [params.memorySize=4032] - The memory size, in number of
     * history entries.  The default is 4 weeks of 1 entry per 10 minutes.
     * @param {?boolean} params.config - Expose config.

package/package.json

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