frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary 2018-10-24 16:42:21 +01:00
commit e64f4e3f39
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/node_modules/@node-red/nodes/core/hardware/36-rpi-gpio.js vendored
View File

@ -23,12 +23,16 @@ module.exports = function(RED) {
} catch(err) { } catch(err) {
try { try {
fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot
} catch(err) {
try {
fs.statSync("/usr/local/lib/python2.7/dist-packages/RPi/GPIO"); // installed with pip
} catch(err) { } catch(err) {
RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.libnotfound")); RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.libnotfound"));
allOK = false; allOK = false;
} }
} }
} }
}
if ( !(1 & parseInt((fs.statSync(gpioCommand).mode & parseInt("777", 8)).toString(8)[0]) )) { if ( !(1 & parseInt((fs.statSync(gpioCommand).mode & parseInt("777", 8)).toString(8)[0]) )) {
RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.needtobeexecutable",{command:gpioCommand})); RED.log.warn("rpi-gpio : "+RED._("rpi-gpio.errors.needtobeexecutable",{command:gpioCommand}));
allOK = false; allOK = false;

15
packages/node_modules/@node-red/nodes/core/logic/19-batch.html vendored
View File

@ -100,9 +100,9 @@
defaults: { defaults: {
name: {value:""}, name: {value:""},
mode: {value:"count"}, mode: {value:"count"},
count: {value:10}, count: {value:10,validate:function(v) { return RED.validators.number(v) && (v >= 1); }},
overlap: {value:0}, overlap: {value:0,validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
interval: {value:10}, interval: {value:10,validate:function(v) { return RED.validators.number(v) && (v >= 1); }},
allowEmptySequence: {value:false}, allowEmptySequence: {value:false},
topics: {value:[{topic:""}]} topics: {value:[{topic:""}]}
}, },
@ -149,12 +149,9 @@
removable: true removable: true
}); });
$("#node-input-count").spinner({ $("#node-input-count").spinner({min:1});
}); $("#node-input-overlap").spinner({min:0});
$("#node-input-overlap").spinner({ $("#node-input-interval").spinner({min:1});
});
$("#node-input-interval").spinner({
});
$("#node-input-mode").change(function(e) { $("#node-input-mode").change(function(e) {
var val = $(this).val(); var val = $(this).val();
$(".node-row-msg-count").toggle(val==="count"); $(".node-row-msg-count").toggle(val==="count");