homebridge-deconz 0.1.19 → 0.1.20

package/README.md

@@ -78,10 +78,15 @@ Setting _Expose Lights_ will include the ZHAConsumption and ZHAPower `/sensors`
 Note that HomeKit doesn't like configuration changes.
 Allow ample time after exposing or removing accessories for HomeKit to sync the changed configuration to all Apple devices.
 
-### Command-Line Utility
-Homebridge deCONZ includes the `deconz` command-line utility, to discover,
-monitor, and interact with a deCONZ gateway.
-See the [`deconz` Tutorial](https://github.com/ebaauw/homebridge-deconz/wiki/%60deconz%60-Tutorial) in the Wiki for more info.
+### Command-Line Utilities
+Homebridge deCONZ includes the following command-line utilities:
+- `deconz`, to discover, monitor, and interact with deCONZ gateways.  
+See the [`deconz` Command-Line Utility](https://github.com/ebaauw/homebridge-deconz/wiki/deconz-Command%E2%80%90Line-Utility) in the Wiki for more info.
+- `otau`, to download and analyse over-the-air-update firmware files for Zigbee devices.
+- `ui` to configure a running instance of Homebridge deCONZ.  
+See [`Dynamic Configuration`](https://github.com/ebaauw/homebridge-deconz/wiki/Dynamic-Configuration) in the Wiki for more info.
+
+Each command-line tool takes a `-h` or `--help` argument to provide a brief overview of its functionality and command-line arguments.
 
 ### Troubleshooting
 - As mentioned above, Homebridge deCONZ is still under development.  Sometimes, cached accessories from an older version might confuse a newer version, causing all sorts of weird errors.  In this case, best un-expose the offending accessory, wait for HomeKit to remove it, and re-expose the accessory.  Note that this will cause HomeKit to see a new accessory, and lose any associations with HomeKit rooms, groups, scenes, and automations.

package/cli/otau.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+
+// otau.js
+// Copyright © 2023 Erik Baauw. All rights reserved.
+//
+// Command line interface to deCONZ gateway.
+
+'use strict'
+
+const { OtauTool } = require('hb-deconz-tools')
+const pkgJson = require('../package.json')
+
+new OtauTool(pkgJson).main()

package/lib/DeconzService/Battery.js

@@ -14,12 +14,25 @@ const { dateToString } = ApiClient
   */
 class Battery extends ServiceDelegate.Battery {
   constructor (accessory, resource, params = {}) {
-    super(accessory, {
+    const batteryParams = {
       name: accessory.name + ' Battery',
       exposeConfiguredName: true
-    })
+    }
+    const state = resource.body.state
+    const config = resource.body.config
+    if (state.battery != null) {
+      batteryParams.batteryLevel = state.battery
+      batteryParams.lowBatteryThreshold = 20
+      if (state.charging != null) {
+        batteryParams.chargingState = state.charging
+      }
+    } else if (config.battery != null) {
+      batteryParams.batteryLevel = config.battery
+      batteryParams.lowBatteryThreshold = 20
+    }
+    super(accessory, batteryParams)
 
-    if (resource.body.state.battery != null) {
+    if (state.battery != null) {
       this.addCharacteristicDelegate({
         key: 'lastUpdated',
         Characteristic: this.Characteristics.my.LastUpdated,

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -18,16 +18,17 @@
   "main": "index.js",
   "bin": {
     "deconz": "cli/deconz.js",
+    "otau": "cli/otau.js",
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.21.2",
+    "deCONZ": "2.22.2",
     "homebridge": "^1.6.1",
-    "node": "^18.16.1"
+    "node": "18.17.0||^18||^16"
   },
   "dependencies": {
-    "hb-deconz-tools": "~1.0.3",
-    "homebridge-lib": "~6.3.18"
+    "hb-deconz-tools": "~1.0.4",
+    "homebridge-lib": "~6.4.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",