Merge pull request #62 from Achronite/develop

v0.5.1 Release from Develop

README.md

@@ -4,7 +4,6 @@ A node-red module to control the Energenie MiHome line of products via the ENER3
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-brightgreen.svg)](https://github.com/Achronite/node-red-contrib-energenie-ener314/graphs/commit-activity)
 [![Downloads](https://img.shields.io/npm/dm/node-red-contrib-energenie-ener314rt.svg)](https://www.npmjs.com/package/node-red-contrib-energenie-ener314rt)
 [![HitCount](http://hits.dwyl.io/achronite/node-red-contrib-energenie-ener314rt.svg)](http://hits.dwyl.io/achronite/node-red-contrib-energenie-ener314rt)
-[![Dependencies Status](https://img.shields.io/david/Achronite/node-red-contrib-energenie-ener314rt.svg)](https://david-dm.org/Achronite/node-red-contrib-energenie-ener314rt)
 ![node](https://img.shields.io/node/v/node-red-contrib-energenie-ener314rt)
 [![Release](https://img.shields.io/github/release-pre/achronite/node-red-contrib-energenie-ener314rt.svg)](https://github.com/Achronite/node-red-contrib-energenie-ener314rt/releases)
 [![NPM](https://nodei.co/npm/node-red-contrib-energenie-ener314rt.png)](https://nodei.co/npm/node-red-contrib-energenie-ener314rt/)
@@ -339,6 +338,7 @@ If you have any issues with the code, particularly if your board is not initiali
 0.4.1|bugfix|Reduced internal efficiency 'sleep' from 5s to 0.5s (for non-eTRV send mode) to reduce risk of losing a message (Issue #14). Fix crash when using over 6 devices (Issue #15).
 0.4.2|05 May 21|Added MiHome Dimmer node. Made ON/OFF status messages consistant across node types. Bug fix for issue #49. Only stop monitoring during close if has been started. README updates.|
 0.5.0|19 Apr 22|Added specific node for MIHO069 MiHome Thermostat, deprecating the generic Control & Monitor node (as no other C&M devices exist at present).
+0.5.1|Sep 22|Increased support for MiHome House Monitor issue #57 (added apparent_power to node status & new node icon), Fixed Zone 0 (all) for Control Node (Issue #61)
 
 
 ## Dependencies
@@ -366,4 +366,4 @@ I am currently working on supporting the MIHO069 Thermostat (which I do not own)
 https://github.com/Achronite/node-red-contrib-energenie-ener314rt/issues
 
 
-@Achronite - April 2022 - v0.5.0 Beta
+@Achronite - September 2022 - v0.5.1 Beta

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-energenie-ener314rt",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Node-red module for energenie ENER314-RT board for raspberry pi",
   "dependencies": {
     "energenie-ener314rt": "0.5.0"

red/ook-switch.js

@@ -1,8 +1,8 @@
 /*
 ** Node-red control of Energenie ENER314-RT board for remote control of radio sockets
-** Author: Achronite, December 2018 - September 2019
+** Author: Achronite, December 2018 - September 2022
 **
-** v0.3 Alpha
+** v0.4 Alpha
 **
 ** File: ook-switch.js
 ** Purpose: Node-Red wrapper for call to switch node for ENER314-RT OOK device
@@ -32,8 +32,8 @@ module.exports = function (RED) {
 
                 //this.log(`IN ${msg.payload.zone}:${msg.payload.unit} state=${msg.payload.state}`);
 
-                var zone = Number(msg.payload.zone) || Number(config.zone) || 0;
-                var switchNum = Number(msg.payload.switchNum) || Number(msg.payload.unit) || Number(config.switchNum) || 1;
+                var zone = Number(msg.payload.zone) || Number(config.zone);
+                var switchNum = Number(msg.payload.switchNum) || Number(msg.payload.unit) || Number(config.switchNum);
                 var xmits = Number(msg.payload.repeat) || 20;
 
                 // Check Switch State in message (default to off)

red/openThings-monitor.js

@@ -46,6 +46,8 @@ module.exports = function (RED) {
                     d.setUTCSeconds(OTmsg.timestamp);
                     let timeStr = d.toTimeString();
                     node.status({ fill: "grey", shape: "ring", text: `No Motion at ${timeStr}` });
+                } else if (OTmsg.APPARENT_POWER > 0) {
+                    node.status({ fill: "grey", shape: "ring", text: "Power " + OTmsg.APPARENT_POWER });
                 }
                 // send on decoded OpenThings message as is
                 node.send({ 'payload': OTmsg });