frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2025-03-01 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Pi nodes to allow initial read / level set.

Browse Source 
More consitent use of icons
Move to Raspberry Pi category
This commit is contained in:
Dave C-J
2014-10-27 20:28:05 +00:00
parent ecbde5d3d5
commit 48b0c3a68b
11 changed files with 141 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
hardware/PiFace/37-rpi-piface.html
View File

@@ -1,5 +1,5 @@
<!--
Copyright 2013 IBM Corp.
Copyright 2013,2014 IBM Corp.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
<script type="text/x-red" data-template-name="rpi-piface in">
<div class="form-row">
<label for="node-input-pin"><i class="fa fa-asterisk"></i> GPIO Pin</label>
<label for="node-input-pin"><i class="fa fa-circle"></i> GPIO Pin</label>
<select type="text" id="node-input-pin" style="width: 150px;">
<option value="-" disabled>select pin</option>
<option value='' disabled selected style='display:none;'>select input</option>
<option value="Button S1">Button S1</option>
<option value="Button S2">Button S2</option>
<option value="Button S3">Button S3</option>
@@ -38,12 +38,18 @@
</select>
</div>
<div class="form-row">
<label for="node-input-intype"><i class="fa fa-expand"></i> Resistor?</label>
<label for="node-input-intype"><i class="fa fa-level-up"></i> Resistor ?</label>
<select type="text" id="node-input-intype" style="width: 150px;">
<option value="up">pullup</option>
<option value="tri">none</option>
</select>
</div>
<div class="form-row">
<label>&nbsp;</label>
<input type="checkbox" id="node-input-read" style="display: inline-block; width: auto; vertical-align: top;">
<label for="node-input-read" style="width: 70%;">Read initial state of pin on deploy/restart ?</label>
</div>
<br/>
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
@@ -61,12 +67,13 @@
<script type="text/javascript">
RED.nodes.registerType('rpi-piface in',{
category: 'advanced-input',
category: 'Raspberry Pi',
color:"#c6dbef",
defaults: {
name: { value:"" },
intype: { value: "up" },
pin: { value:"",required:true},
intype: { value: "up" },
read: { value:false }
},
inputs:0,
outputs:1,
@@ -83,9 +90,9 @@
<script type="text/x-red" data-template-name="rpi-piface out">
<div class="form-row">
<label for="node-input-pin"><i class="fa fa-asterisk"></i> GPIO Pin</label>
<label for="node-input-pin"><i class="fa fa-circle"></i> GPIO Pin</label>
<select type="text" id="node-input-pin" style="width: 150px;">
<option value="-" disabled>select pin</option>
<option value='' disabled selected style='display:none;'>select output</option>
<option value="LED 0 / Relay 0">LED 0 / Relay 0</option>
<option value="LED 1 / Relay 1">LED 1 / Relay 1</option>
<option value="LED 2">LED 2</option>
@@ -96,6 +103,19 @@
<option value="LED 7">LED 7</option>
</select>
</div>
<div class="form-row">
<label>&nbsp;</label>
<input type="checkbox" id="node-input-set" style="display: inline-block; width: auto; vertical-align: top;">
<label for="node-input-set" style="width: 70%;">Initialise output state ?</label>
</div>
<div class="form-row" id="node-set-state">
<label for="node-input-level">&nbsp;</label>
<select id="node-input-level" style="width: 300px;">
<option value="0">initial level of output - off - low - 0</option>
<option value="1">initial level of output - on - high - 1</option>
</select>
</div>
<br/>
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
@@ -111,11 +131,13 @@
<script type="text/javascript">
RED.nodes.registerType('rpi-piface out',{
category: 'advanced-output',
category: 'Raspberry Pi',
color:"#c6dbef",
defaults: {
name: { value:"" },
pin: { value:"",required:true},
set: { value:false },
level: { value:"0" }
},
inputs:1,
outputs:0,
@@ -126,6 +148,15 @@
},
labelStyle: function() {
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
$("#node-input-set").change(function() {
if ($('#node-input-set').is(":checked")) {
$("#node-set-state").show();
} else {
$("#node-set-state").hide();
}
});
}
});
</script>

9
hardware/PiFace/37-rpi-piface.js
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2013 IBM Corp.
* Copyright 2013,2014 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,6 +63,8 @@ module.exports = function(RED) {
this.npin = n.pin;
this.pin = pintable[n.pin];
this.intype = n.intype;
this.read = n.read || false;
if (this.read) { this.buttonState = -2; }
var node = this;
if (node.pin) {
exec("gpio -p mode "+node.pin+" "+node.intype, function(err,stdout,stderr) {
@@ -99,6 +101,11 @@ module.exports = function(RED) {
this.pin = pintable[n.pin];
var node = this;
if (node.pin) {
if (node.set) {
exec("gpio -p write "+node.pin+" "+node.level, function(err,stdout,stderr) {
if (err) { node.error(err); }
});
}
node.on("input", function(msg) {
if (msg.payload === "true") { msg.payload = true; }
if (msg.payload === "false") { msg.payload = false; }

2
hardware/PiFace/package.json
View File

@@ -1,6 +1,6 @@
{
"name" : "node-red-node-piface",
"version" : "0.0.1",
"version" : "0.0.2",
"description" : "Node-RED nodes to read from and write to a PiFace Digital Raspberry Pi add-on board",
"dependencies" : {
},