homebridge-lib 6.0.2 → 6.1.0

package/lib/ServiceDelegate/History/Motion.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/Motion.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
-//
-// The logic for handling Eve history was copied from Simone Tisa's
-// fakagato-history repository, copyright © 2017 simont77.
-// See https://github.com/simont77/fakegato-history.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap16, swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for an Eve Motion _History_ service delegate.
   *
@@ -33,6 +26,10 @@ const { swap16, swap32, numToHex } = History
   * This delegate creates the history from the associated
   * `Characteristics.hap.MotionDetected` characteristic.  It updates the
   * value of the associated `Characteristics.eve.LastActivation` characteristic.
+  * Optionally, this delegate also mainatins history for
+  * `Characteristics.hap.CurrentAmbientLightLevel`,
+  * `Characteristics.hap.CurrentTemperature`, and
+  * `Characteristics.hap.CurrentRelativeHumidity`.
   * @extends ServiceDelegate.History
   * @memberof ServiceDelegate.History
   */
@@ -57,7 +54,12 @@ class Motion extends History {
     * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
     * For PIR sensors (like the Hue motion sensor) that report temperature in
-    * addition to motion.
+    * addition to motion and light level.
+    * @param {?CharacteristicDelegate} params.humidityDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentRelativeHumidity`
+    * characteristic.
+    * For PIR sensors (like the OWON PIR313 sensor) that report humidity in
+    * addition to motion, light level, and temperature.
     */
   constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
@@ -67,88 +69,73 @@ class Motion extends History {
     if (!(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
-    if (
-      params.lightLevelDelegate != null &&
-      !(params.lightLevelDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
-      throw new TypeError('params.lightLevelDelegate: not a CharacteristicDelegate')
-    }
-    if (
-      params.temperatureDelegate != null &&
-      !(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
-      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
-    }
-    this._entry = { time: 0, status: params.motionDelegate.value }
+    this.entry = { m: params.motionDelegate.value ? 1 : 0 }
     params.motionDelegate.on('didSet', (value) => {
-      const now = Math.round(new Date().valueOf() / 1000)
-      params.lastActivationDelegate.value = now - this._h.initialTime
-      this._entry.status = value
-      if (this._entry.temp != null) {
-        const lightlevel = this._entry.lightlevel
-        const temp = this._entry.temp
-        this._entry.lightlevel = null
-        this._entry.temp = null
-        this._addEntry(now)
-        this._entry.lightlevel = lightlevel
-        this._entry.temp = temp
-      } else {
-        this._addEntry(now)
-      }
+      const now = History.now()
+      params.lastActivationDelegate.value = this.lastActivationValue(now)
+      this.entry.m = value ? 1 : 0
+      this.addEntry({ time: now, m: this.entry.m })
     })
     if (params.lightLevelDelegate != null) {
-      this._entry.lightlevel = params.lightLevelDelegate.value
+      if (!(params.lightLevelDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+        throw new TypeError('params.lightLevelDelegate: not a CharacteristicDelegate')
+      }
+      this.entry.l = params.lightLevelDelegate.value
       params.lightLevelDelegate.on('didSet', (value) => {
-        this._entry.lightlevel = value
-      })
-    }
-    if (params.temperatureDelegate != null) {
-      this._entry.temp = params.temperatureDelegate.value
-      params.temperatureDelegate.on('didSet', (value) => {
-        this._entry.temp = value
+        this.entry.l = value
       })
+      if (params.temperatureDelegate != null) {
+        if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+          throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
+        }
+        this.entry.t = params.temperatureDelegate.value
+        params.temperatureDelegate.on('didSet', (value) => {
+          this.entry.t = value
+        })
+        if (params.humidityDelegate != null) {
+          if (!(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+            throw new TypeError('params.humidityDelegate: not a CharacteristicDelegate')
+          }
+          this.entry.h = params.humidityDelegate.value
+          params.humidityDelegate.on('didSet', (value) => {
+            this.entry.h = value
+          })
+        }
+      }
     }
   }
 
-  get _fingerPrint () {
-    return '03 1C01 3002 0102'
+  get fingerPrint () {
+    return '04 1C01 3002 0102 0202'
   }
 
-  _entryStream (entry) {
-    if (entry.temp == null) {
-      if (entry.lightlevel == null) {
-        return util.format(
-          '|0b %s %s 01 %s',
-          numToHex(swap32(this._h.currentEntry), 8),
-          numToHex(swap32(entry.time - this._h.initialTime), 8),
-          numToHex(entry.status, 2)
-        )
-      }
-      return util.format(
-        '|0d %s %s 03 %s %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(entry.status, 2),
-        numToHex(swap16(entry.lightlevel), 4)
-      )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(6)
+    let o = 0
+    if (entry.l == null) {
+      buffer.writeUInt8(0x01, o); o += 1
+      buffer.writeUInt8(entry.m, o); o += 1
+      return buffer.slice(0, o)
+    }
+    if (entry.t == null) {
+      buffer.writeUInt8(0x03, o); o += 1
+      buffer.writeUInt8(entry.m, o); o += 1
+      buffer.writeUInt16LE(entry.l, o); o += 2
+      return buffer.slice(0, o)
     }
-    if (entry.lightlevel == null) {
-      return util.format(
-        '|0d %s %s 05 %s %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(entry.status, 2),
-        numToHex(swap16(entry.temp * 100), 4)
-      )
+    if (entry.h == null) {
+      buffer.writeUInt8(0x07, o); o += 1
+      buffer.writeUInt8(entry.m, o); o += 1
+      buffer.writeUInt16LE(entry.l, o); o += 2
+      buffer.writeUInt16LE(entry.t * 100, o); o += 2
+      return buffer.slice(0, o)
     }
-    return util.format(
-      '|0f %s %s 07 %s %s %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(entry.status, 2),
-      numToHex(swap16(entry.lightlevel), 4),
-      numToHex(swap16(entry.temp * 100), 4)
-    )
+    buffer.writeUInt8(0x0F, o); o += 1
+    buffer.writeUInt8(entry.m, o); o += 1
+    buffer.writeUInt16LE(entry.l, o); o += 2
+    buffer.writeUInt16LE(entry.t * 100, o); o += 2
+    buffer.writeUInt16LE(entry.h * 100, o); o += 2
+    return buffer.slice(0, o)
   }
 }
 

package/lib/ServiceDelegate/History/On.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/On.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
-//
-// The logic for handling Eve history was copied from Simone Tisa's
-// fakagato-history repository, copyright © 2017 simont77.
-// See https://github.com/simont77/fakegato-history.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for a Raspberry Pi _History_ service delegate.
   *
@@ -61,41 +54,42 @@ class On extends History {
     ) {
       throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
-    if (
-      params.temperatureDelegate != null &&
-      !(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
-      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
-    }
-    this._entry = {
-      time: 0,
-      on: params.onDelegate.value ? 1 : 0
-    }
+
+    this.entry = { o: params.onDelegate.value ? 1 : 0 }
     params.onDelegate.on('didSet', (value) => {
-      const now = Math.round(new Date().valueOf() / 1000)
+      const now = History.now()
       if (params.lastActivationDelegate != null) {
-        params.lastActivationDelegate.value = now - this._h.initialTime
+        params.lastActivationDelegate.value = this.lastActivationValue(now)
       }
-      this._entry.on = value ? 1 : 0
-      this._addEntry(now)
+      this.entry.o = value ? 1 : 0
+      this.addEntry({ time: now, o: this.entry.o })
     })
+
     if (params.temperatureDelegate != null) {
-      this._entry.temp = params.temperatureDelegate.value
+      if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+        throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
+      }
+      this.entry.t = params.temperatureDelegate.value
       params.temperatureDelegate.on('didSet', (value) => {
-        this._entry.temp = value
+        this.entry.t = value
       })
     }
   }
 
-  get _fingerPrint () { return '01 0E01' }
+  get fingerPrint () { return '01 0E01 0102' }
 
-  _entryStream (entry) {
-    return util.format(
-      '|0b %s %s 01 %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(entry.on, 2)
-    )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(2)
+    let o = 0
+    if (entry.t == null) {
+      buffer.writeUInt8(0x01, o); o += 1
+      buffer.writeUInt8(entry.o, o); o += 1
+      return buffer.slice(0, o)
+    }
+    buffer.writeUInt8(0x03, o); o += 1
+    buffer.writeUInt8(entry.o, o); o += 1
+    buffer.writeUInt16LE(entry.t * 100, o); o += 2
+    return buffer.slice(0, o)
   }
 }
 

package/lib/ServiceDelegate/History/Power.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/Power.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
-//
-// The logic for handling Eve history was copied from Simone Tisa's
-// fakagato-history repository, copyright © 2017 simont77.
-// See https://github.com/simont77/fakegato-history.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap16, swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for an Eve Energy _History_ service delegate.
   *
@@ -49,8 +42,11 @@ class Power extends History {
     * @param {!CharacteristicDelegate} params.consumptionDelegate - A reference
     * to the delegate of the associated `Characteristics.eve.TotalConsumption`
     * characteristic.
-    * @param {!CharacteristicDelegate} params.onDelegate - A reference to the
+    * @param {?CharacteristicDelegate} params.onDelegate - A reference to the
     * delegate of the associated `Characteristics.hap.On` characteristic.
+    * @param {?CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
     */
   constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
@@ -64,15 +60,24 @@ class Power extends History {
       params.onDelegate != null &&
       !(params.onDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.onDelegate: not a CharacteristicDelegate')
+    }
+    if (
+      params.lastActivationDelegate != null &&
+      !(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)
+    ) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
     this._powerDelegate = params.powerDelegate
     this._consumptionDelegate = params.consumptionDelegate
-    this._entry = { time: 0, power: 0 }
+
+    this.entry = { p: 0 }
     this._runningConsumption = 0 // 10-min-interval running value
     this._totalConsumption = params.consumptionDelegate.value // life-time value
+    this._power = params.powerDelegate.value // current power
+    this._time = History.now // start time of current power
     params.powerDelegate.on('didSet', (value) => {
-      const now = Math.round(new Date().valueOf() / 1000)
+      const now = History.now
       if (this._time != null) {
         const delta = this._power * (now - this._time) // Ws
         this._runningConsumption += Math.round(delta / 60.0) // 0.1W * 10 min
@@ -81,6 +86,7 @@ class Power extends History {
       this._power = value
       this._time = now
     })
+
     this.addCharacteristicDelegate({
       key: 'resetTotal',
       Characteristic: this.Characteristics.eve.ResetTotal,
@@ -90,66 +96,54 @@ class Power extends History {
       this._totalConsumption = 0
       this._consumptionDelegate.value = this._totalConsumption
     })
+
     if (params.onDelegate != null) {
-      this._entry.on = params.onDelegate.value ? 1 : 0
+      this.entry.o = params.onDelegate.value ? 1 : 0
       params.onDelegate.on('didSet', (value) => {
-        const now = Math.round(new Date().valueOf() / 1000)
+        const now = History.now
         if (params.lastActivationDelegate != null) {
-          params.lastActivationDelegate.value = now - this._h.initialTime
+          params.lastActivationDelegate.value = this.lastActivationValue(now)
         }
-        this._entry.on = value ? 1 : 0
-        const power = this._entry.power
-        this._entry.power = null
-        super._addEntry(now)
-        this._entry.power = power
+        this.entry.o = value ? 1 : 0
+        super.addEntry({ time: now, o: this.entry.o })
       })
     }
   }
 
-  _addEntry () {
-    const now = Math.round(new Date().valueOf() / 1000)
+  addEntry (entry) {
     // Sensor delivers currentConsumption, compute totalConsumption
     if (this._time != null) {
-      const delta = this._power * (now - this._time) // Ws
+      const delta = this._power * (entry.time - this._time) // Ws
       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)
+      entry.p = Math.round(this._runningConsumption) // 0.1 W * 10 min
     }
+    super.addEntry(entry)
     this._power = this._powerDelegate.value
-    this._time = now
+    this._time = entry.time
     this._runningConsumption = 0
   }
 
-  get _fingerPrint () { return '02 0702 0E01' }
+  get fingerPrint () { return '02 0702 0E01' }
 
-  _entryStream (entry) {
-    if (entry.on == null) {
-      return util.format(
-        '|0c %s %s 01 %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.power), 4)
-      )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(4)
+    let o = 0
+    if (entry.o == null) {
+      buffer.writeUInt8(0x01, o); o += 1
+      buffer.writeUInt16LE(entry.p, o); o += 2
+      return buffer.slice(0, o)
     }
-    if (entry.power == null) {
-      return util.format(
-        '|0b %s %s 02 %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(entry.on, 2)
-      )
+    if (entry.p == null) {
+      buffer.writeUInt8(0x02, o); o += 1
+      buffer.writeUInt8(entry.o, o); o += 1
+      return buffer.slice(0, o)
     }
-    return util.format(
-      '|0d %s %s 03 %s %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.power), 4),
-      numToHex(entry.on, 2)
-    )
+    buffer.writeUInt8(0x03, o); o += 1
+    buffer.writeUInt16LE(entry.p, o); o += 2
+    buffer.writeUInt8(entry.o, o); o += 1
+    return buffer.slice(0, o)
   }
 }
 

package/lib/ServiceDelegate/History/Room.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/Room.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
-//
-// The logic for handling Eve history was copied from Simone Tisa's
-// fakagato-history repository, copyright © 2017 simont77.
-// See https://github.com/simont77/fakegato-history.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap16, swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for an Eve Room _History_ service delegate.
   *
@@ -36,8 +29,8 @@ const { swap16, swap32, numToHex } = History
   * @extends ServiceDelegate.History
   * @memberof ServiceDelegate.History
   */
-class Room extends ServiceDelegate.History {
-  /** Create a new instance of an Eve Weather _History_ service delegate.
+class Room extends History {
+  /** Create a new instance of an Eve Room _History_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
@@ -45,10 +38,10 @@ class Room extends ServiceDelegate.History {
     * @param {!CharacteristicDelegate} params.temperatureDelegate - A reference
     * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
-    * @param {?CharacteristicDelegate} params.humidityDelegate - A reference to
+    * @param {!CharacteristicDelegate} params.humidityDelegate - A reference to
     * the delegate of the associated
     * `Characteristics.hap.CurrentRelativeHumidity` characteristic.
-    * @param {?CharacteristicDelegate} params.vocDensityDelegate - A reference
+    * @param {!CharacteristicDelegate} params.vocDensityDelegate - A reference
     * to the delegate of the associated `Characteristics.eve.AirPressure`
     * characteristic.
     */
@@ -57,55 +50,40 @@ class Room extends ServiceDelegate.History {
     if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
-    if (
-      params.humidityDelegate != null &&
-      !(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
+    if (!(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.humidityDelegate: not a CharacteristicDelegate')
     }
-    if (
-      params.vocDensityDelegate != null &&
-      !(params.vocDensityDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
+    if (!(params.vocDensityDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.vocDensityDelegate: not a CharacteristicDelegate')
     }
-    this._entry = {
-      time: 0,
-      temp: params.temperatureDelegate.value,
-      humidity: 0,
-      voc: 0
+    this.entry = {
+      t: params.temperatureDelegate.value,
+      h: params.humidityDelegate.value,
+      v: params.vocDensityDelegate.value
     }
     params.temperatureDelegate.on('didSet', (value) => {
-      this._entry.temp = value
+      this.entry.t = value
+    })
+    params.humidityDelegate.on('didSet', (value) => {
+      this.entry.h = value
+    })
+    params.vocDensityDelegate.on('didSet', (value) => {
+      this.entry.v = value
     })
-    if (params.humidityDelegate != null) {
-      this._entry.humidity = params.humidityDelegate.value
-      params.humidityDelegate.on('didSet', (value) => {
-        this._entry.humidity = value
-      })
-      if (params.vocDensityDelegate != null) {
-        this._entry.voc = params.vocDensityDelegate.value
-        params.vocDensityDelegate.on('didSet', (value) => {
-          this._entry.voc = value
-        })
-      }
-    }
   }
 
-  get _fingerPrint () {
-    // return '07 0102 0202 2202 2901 2501 2302 2801'
+  get fingerPrint () {
     return '03 0102 0202 2202'
   }
 
-  _entryStream (entry) {
-    return util.format(
-      '|10 %s %s 07 %s %s %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.temp * 100), 4),
-      numToHex(swap16(entry.humidity * 100), 4),
-      numToHex(swap16(entry.voc), 4)
-    )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(7)
+    let o = 0
+    buffer.writeUInt8(0x07, o); o += 1
+    buffer.writeUInt16LE(entry.t * 100, o); o += 2
+    buffer.writeUInt16LE(entry.h * 100, o); o += 2
+    buffer.writeUInt16LE(entry.v, o); o += 2
+    return buffer.slice(0, o)
   }
 }
 

package/lib/ServiceDelegate/History/Thermo.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/Thermo.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
-//
-// The logic for handling Eve history was copied from Simone Tisa's
-// fakagato-history repository, copyright © 2017 simont77.
-// See https://github.com/simont77/fakegato-history.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap16, swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for an Eve Thermo _History_ service delegate.
   *
@@ -36,7 +29,7 @@ const { swap16, swap32, numToHex } = History
   * @extends ServiceDelegate.History
   * @memberof ServiceDelegate.History
   */
-class Thermo extends ServiceDelegate.History {
+class Thermo extends History {
   /** Create a new instance of an Eve Thermo _History_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * corresponding HomeKit accessory.
@@ -63,39 +56,32 @@ class Thermo extends ServiceDelegate.History {
     if (!(params.valvePositionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.valvePositionDelegate: not a CharacteristicDelegate')
     }
-    this._entry = {
-      time: 0,
-      currentTemp: params.temperatureDelegate.value,
-      setTemp: params.targetTemperatureDelegate.value,
-      valvePosition: params.valvePositionDelegate.value
+    this.entry = {
+      t: params.temperatureDelegate.value,
+      s: params.targetTemperatureDelegate.value,
+      v: params.valvePositionDelegate.value
     }
     params.temperatureDelegate.on('didSet', (value) => {
-      this._entry.currentTemp = value
+      this.entry.t = value
     })
     params.targetTemperatureDelegate.on('didSet', (value) => {
-      this._entry.setTemp = value
+      this.entry.s = value
     })
     params.valvePositionDelegate.on('didSet', (value) => {
-      this._entry.valvePosition = value
+      this.entry.v = value
     })
   }
 
-  // I think 1201 and 1d01 are for current mode and target more, but it doesn't
-  // look like Eve displays any history for these.
-  // As of v3.8.1, Eve no longer shows the valve position history.
-  // get _fingerPrint () { return '05 0102 1102 1001 1201 1d01' }
-  get _fingerPrint () { return '03 0102 1102 1001' }
+  get fingerPrint () { return '03 0102 1102 1001' }
 
-  _entryStream (entry) {
-    return util.format(
-      // '|11 %s %s 1f %s %s %s 00 00',
-      '|0f %s %s 07 %s %s %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.currentTemp * 100), 4),
-      numToHex(swap16(entry.setTemp * 100), 4),
-      numToHex(entry.valvePosition, 2)
-    )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(6)
+    let o = 0
+    buffer.writeUInt8(0x07, o); o += 1
+    buffer.writeUInt16LE(entry.t * 100, o); o += 2
+    buffer.writeUInt16LE(entry.s * 100, o); o += 2
+    buffer.writeUInt8(entry.v, o); o += 1
+    return buffer.slice(0, o)
   }
 }