Fix input node (+2 squashed commits)

Squashed commits:
[3079c2d] Added Heatmiser input and output nodes
[62bd1f3] Added Heatmiser input and output nodes

Fix input node bugs
This commit is contained in:
Sean Bedford
2014-03-24 20:15:20 +00:00
parent 18b1190029
commit c4ec78e854
5 changed files with 226 additions and 53 deletions

View File

@@ -0,0 +1,62 @@
<!--
Copyright 2014 Sean Bedford
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script type="text/x-red" data-template-name="heatmiser-out">
<div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
</div>
<div class="form-row">
<label for="node-input-uuid"><i class="icon-tag"></i> IP Address</label>
<input type="text" id="node-input-ip" placeholder="192.168.0.1">
</div>
<div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> PIN</label>
<input type="text" id="node-input-pin" placeholder="1234">
</div>
<div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Poll time (in minutes)</label>
<input type="text" id="node-input-pollTime" placeholder="30">
</div>
<div class="form-tips">Expects a msg.payload with a JSON object that contains settings for the Heatmiser thermostat</div>
</script>
<script type="text/x-red" data-help-name="heatmiser-out">
<p>Heatmiser Output node.</p>
<p>Will read and send a status update at a configurable time interval. This is set to every 30 minutes by default</p>
</script>
<script type="text/javascript">
RED.nodes.registerType('heatmiser-out',{
category: 'advanced-function',
color:"GoldenRod",
defaults: {
name: {value:""},
ip: {value:""},
pin: {value:""},
pollTime : {value:""}
},
inputs:0,
outputs:1,
icon: "timer.png",
label: function() {
return this.name||"heatmiser-out";
},
labelStyle: function() {
return this.name?"node_label_italic":"";
}
});
</script>

View File

@@ -0,0 +1,91 @@
/**
* Copyright 2014 Sean Bedford
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
var RED = require(process.env.NODE_RED_HOME+"/red/red");
var Heatmiser = require("heatmiser");
var util = require('util');
function HeatmiserOutputNode(n) {
// TODO - holiday and hot water cases when confirmed working
var DEBUG = false;
RED.nodes.createNode(this,n);
this.ip = n.ip || "192.168.0.1";
this.pin = n.pin || "1234";
this.pollTime = n.pollTime*60*1000 || 30*60*1000;
this.pollIntervalRef = undefined;
hmoutnode = this;
this.hm = new Heatmiser(this.ip, this.pin);
this.hm.on('success', function(data) {
if (DEBUG) {
util.log("[100-heatmiser-in.js] - Successfully wrote data. Response : " + JSON.stringify(data));
}
hmoutnode.send({topic: "", payload:JSON.stringify(data.dcb)});
});
this.hm.on('error', function(data) {
if (DEBUG) {
util.log("[100-heatmiser-in.js] - Error during data setting : " + JSON.stringify(data));
}
hmoutnode.send(data);
});
this.read = function() {
if (hmoutnode.hm) {
hmoutnode.hm.read_device();
}
};
if (!this.currentStatus) {
this.read();
this.pollIntervalRef = setInterval(this.read, this.pollTime);
}
this.on("close", function() {
if (this.pollIntervalRef) {
clearInterval(this.pollIntervalRef);
this.pollIntervalRef = undefined;
}
});
this.on("input", function(message) {
// Valid inputs are heating:{target:, hold:}, read:, runmode:frost/heating, holiday:{enabled:, time:}, hotwater:{'on':1/0 / 'boost':1/0}
if (message.payload == "undefined" || !message.payload) {
message.payload = {read : true};
}
if (typeof(message.payload) == "string") {
message.payload = JSON.parse(message.payload);
}
if (message.payload.read) {
hmoutnode.read();
}
else if (message.payload) {
// Compare message.payload data to confirm valid and send to thermostat
var validInputs = ["heating", "runmode"];
for (var key in message.payload) {
if (message.payload.hasOwnProperty(key)) {
if (validInputs.indexOf(key) < 0) {
util.log("[100-heatmiser.js] Warning: Unsupported key ("+key+") passed!");
return;
}
}
}
hmoutnode.validateAndWrite(message);
}
});
}
RED.nodes.registerType("heatmiser-out",HeatmiserOutputNode);