homebridge-lib 5.1.18 → 5.1.22-0

package/lib/MyHomeKitTypes.js

@@ -105,6 +105,8 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       * @property {Class} LogLevel - Level of logging.
       * @property {Class} Loudness - Audio loudness.
       * <br>Used by: homebridge-zp in Speaker service.
+      * @property {Class} LowBatteryThreshold - Threshold value for setting
+      * Status Low Battery.
       * @property {Class} MotorSpeed - Speed at which to move the blinds.
       * <br>Used by: homebridge-soma in Window Covering service.
       * @property {Class} MorningMode - Move the blinds slowly, making less
@@ -679,6 +681,23 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
     })
 
+    this.createCharacteristicClass('LowBatteryThreshold', uuid('075'), {
+      format: this.Formats.UINT8,
+      unit: this.Units.PERCENTAGE,
+      minValue: 0,
+      maxValue: 95,
+      minStep: 5,
+      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+    }, 'Low Battery Threshold')
+
+    this.createCharacteristicClass('PositionChange', uuid('076'), {
+      format: this.Formats.INT,
+      minValue: -1,
+      maxValue: 1,
+      minStep: 1, // Force Down|Up control in Eve
+      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+    }, 'Position Change')
+
     // 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.js

@@ -429,6 +429,8 @@ class AccessoryInformation extends ServiceDelegate {
   * `batteryLevel`     | `Characteristics.hap.BatteryLevel`     | Y
   * `chargingState`    | `Characteristics.hap.ChargingState`    | Y
   * `statusLowBattery` | `Characteristics.hap.StatusLowBattery` | Y
+  * `lowBatteryThreshold`| `Characteristics.my.LowBatteryThreshold` | Y
+  *
   * @extends ServiceDelegate
   * @memberof ServiceDelegate
   */
@@ -436,14 +438,16 @@ class Battery extends ServiceDelegate {
   /** Create a new instance of an _Battery_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * corresponding HomeKit accessory.
-    * @param {!object} params - The parameters for the
+    * @param {object} params - The parameters for the
     * _AccessoryInformation_ HomeKit service.
-    * @param {!string} params.batteryLevel - Initial value for
-    * `Characteristics.hap.BatteryLevel` (default: 100%).
-    * @param {!string} params.chargingState - Initial value for
-    * `Characteristics.hap.ChargingState` (default: NOT_CHARGEABLE).
-    * @param {!string} params.statusLowBattery - Initial value for
-    * `Characteristics.hap.StatusLowBattery` (default: BATTERY_LEVEL_NORMAL).
+    * @param {integer} [params.batteryLevel=100] - Initial value for
+    * `Characteristics.hap.BatteryLevel`.
+    * @param {integer} [params.chargingState=NOT_CHARGEABLE] - Initial value for
+    * `Characteristics.hap.ChargingState`.
+    * @param {integer} [params.statusLowBattery=BATTERY_LEVEL_NORMAL] - Initial
+    * value for `Characteristics.hap.StatusLowBattery`.
+    * @param {integer} [params.lowBatteryThreshold=20] - Initial value for
+    * low battery threshold.
     */
   constructor (accessoryDelegate, params = {}) {
     params.name = accessoryDelegate.name + ' Battery'
@@ -454,6 +458,8 @@ class Battery extends ServiceDelegate {
       Characteristic: this.Characteristics.hap.BatteryLevel,
       unit: '%',
       value: params.batteryLevel != null ? params.batteryLevel : 100
+    }).on('didSet', (value) => {
+      this.updateStatusLowBattery()
     })
     this.addCharacteristicDelegate({
       key: 'chargingState',
@@ -469,6 +475,21 @@ class Battery extends ServiceDelegate {
         ? params.statusLowBattery
         : this.Characteristics.hap.StatusLowBattery.BATTERY_LEVEL_NORMAL
     })
+    this.addCharacteristicDelegate({
+      key: 'lowBatteryThreshold',
+      Characteristic: this.Characteristics.my.LowBatteryThreshold,
+      unit: '%',
+      value: params.lowBatteryThreshold != null ? params.lowBatteryThreshold : 20
+    }).on('didSet', (value) => {
+      this.updateStatusLowBattery()
+    })
+  }
+
+  updateStatusLowBattery () {
+    this.values.statusLowBattery =
+      this.values.batteryLevel <= this.values.lowBatteryThreshold
+        ? this.Characteristics.hap.StatusLowBattery.BATTERY_LEVEL_LOW
+        : this.Characteristics.hap.StatusLowBattery.BATTERY_LEVEL_NORMAL
   }
 }
 

package/lib/SystemInfo.js

@@ -113,25 +113,16 @@ class SystemInfo extends events.EventEmitter {
     */
   static parseRpiCpuInfo (cpuInfo) {
     const id = /Serial\s*: ([0-9a-f]{16})/.exec(cpuInfo)[1].toUpperCase()
-    const revision = parseInt(/Revision\s*: ([0-9a-f]{4,})/.exec(cpuInfo)[1], 16)
-    const rpi = SystemInfo.parseRpiRevision(revision & 0x00FFFFFF)
-    return Object.assign({ id: id }, rpi)
-  }
-
-  /** Parse the revision of a Raspberry Pi.
-    *
-    * @see https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-revision-codes
-    * @param {int} revision - The Raspberry Pi revision.
-    * @return {object} - The parsed revision.
-    */
-  static parseRpiRevision (revision) {
+    const revision = parseInt(
+      /Revision\s*: ([0-9a-f]{4,})/.exec(cpuInfo)[1], 16
+    ) & 0x00FFFFFF
     let gpioMask, manufacturer, memory, model, modelRevision, processor
     if ((revision & 0x00800000) !== 0) { // New revision scheme.
-      manufacturer = rpiInfo.manufacturers[(revision & 0x000f0000) >> 16]
+      manufacturer = rpiInfo.manufacturers[(revision & 0x000F0000) >> 16]
       memory = rpiInfo.memorySizes[(revision & 0x00700000) >> 20]
-      model = rpiInfo.models[(revision & 0x00000ff0) >> 4]
-      modelRevision = '1.' + ((revision & 0x0000000f) >> 0).toString()
-      processor = rpiInfo.processors[(revision & 0x0000f000) >> 12]
+      model = rpiInfo.models[(revision & 0x00000FF0) >> 4]
+      modelRevision = '1.' + ((revision & 0x0000000F) >> 0).toString()
+      processor = rpiInfo.processors[(revision & 0x0000F000) >> 12]
     } else if (rpiInfo.oldRevisions[revision] != null) { // Old incremental revisions.
       manufacturer = rpiInfo.oldRevisions[revision].manufacturer
       memory = rpiInfo.oldRevisions[revision].memory
@@ -155,6 +146,8 @@ class SystemInfo extends events.EventEmitter {
     return {
       gpioMask: gpioMask,
       gpioMaskSerial: (1 << 15) | (1 << 14),
+      id: id,
+      isRpi: true,
       manufacturer: manufacturer,
       memory: memory,
       model: model,
@@ -216,22 +209,7 @@ class SystemInfo extends events.EventEmitter {
     */
   async getRpiInfo () {
     const cpuInfo = await this.readTextFile('/proc/cpuinfo')
-    const rpi = SystemInfo.parseRpiCpuInfo(cpuInfo)
-    return {
-      gpioMask: rpi.gpioMask,
-      gpioMaskSerial: rpi.gpioMaskSerial,
-      id: rpi.id,
-      isRpi: true,
-      manufacturer: rpi.manufacturer,
-      memory: rpi.memory,
-      model: rpi.model,
-      modelRevision: rpi.modelRevision,
-      nCores: os.cpus().length,
-      powerLed: rpi.powerLed,
-      prettyName: rpi.prettyName,
-      processor: rpi.processor,
-      revision: rpi.revision
-    }
+    return SystemInfo.parseRpiCpuInfo(cpuInfo)
   }
 
   /** Extract OS info from /etc/os-release.

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.1.18",
+  "version": "5.1.22-0",
   "keywords": [
     "homekit",
     "homebridge"
@@ -22,7 +22,7 @@
   },
   "engines": {
     "homebridge": "^1.3.8",
-    "node": "^16.13.0"
+    "node": "^16.13.1"
   },
   "dependencies": {
     "bonjour-hap": "^3.6.3",