Merge branch 'master' into dev

Koenkk · Dec 17, 2018 · 9191788 · 9191788
2 parents 75dddf4 + 84593a5
commit 9191788
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/getting_started/flashing_the_cc2531.md b/docs/getting_started/flashing_the_cc2531.md
@@ -1,7 +1,7 @@
 # Flashing the firmware on the CC2531 USB stick
 The CC2531 USB stick needs to be flashed with a custom firmware.
 
-*NOTE: The following instructions assume you have a CC Debugger. In case you don't, see [Alternative firmware flashing methods](../useful_information/alternative-firmware-flashing-methods.md).*
+*NOTE: The following instructions assume you have a CC Debugger. In case you don't, see [Alternative firmware flashing methods](../information/alternative_flashing_methods.md).*
 
 ## Windows
 1. Install [SmartRF Flash programmer](http://www.ti.com/tool/FLASH-PROGRAMMER) (**NOT V2**). This software is free but requires a Texas Instruments account in order to download.
@@ -43,4 +43,4 @@ sudo ./cc-tool -e -w CC2531ZNP-Prod.hex
 ```
 
 # What's next?
-[Running Zigbee2mqtt](running_zigbee2mqtt.md)
+[Running Zigbee2mqtt](running_zigbee2mqtt.md)
diff --git a/lib/extension/devicePublish.js b/lib/extension/devicePublish.js
@@ -155,7 +155,7 @@ class DevicePublish {
             // Therefore; at the end of the transition, read the new state from the device.
             if (topic.type === 'set' && converted.zclData.transtime) {
                 const time = converted.zclData.transtime * 100;
-                const getConverted = converter.convert(json[key], json, 'get');
+                const getConverted = converter.convert(key, json[key], json, 'get');
                 setTimeout(() => {
                     // Add job to queue
                     this.queue.push((queueCallback) => {

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Zigbee to MQTT bridge using zigbee-shepherd",
   "main": "index.js",
   "repository": {