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

Merge d177d6d7a50f882bc928bdfcf46f371e5ab1fe48 into 4bdb6216d3b8227b0285c3f3a3cd05cb62bff8d8

Browse Source
This commit is contained in:
Philipp 2021-01-22 11:53:30 -05:00 committed by GitHub
commit 0e2115c031
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hardware/pigpiod/locales/en-US/pi-gpiod.json
View File

@ -7,6 +7,7 @@
"resistor": "Resistor?", "resistor": "Resistor?",
"readinitial": "Read initial state of pin on deploy/restart?", "readinitial": "Read initial state of pin on deploy/restart?",
"type": "Type", "type": "Type",
"freq": "Frequency",
"initpin": "Initialise pin state?", "initpin": "Initialise pin state?",
"debounce": "Debounce", "debounce": "Debounce",
"limits": "Limits", "limits": "Limits",
@ -32,7 +33,7 @@
"pin": "<b>Pins in Use</b>: ", "pin": "<b>Pins in Use</b>: ",
"in": "Only Digital Input is supported - input must be 0 or 1.", "in": "Only Digital Input is supported - input must be 0 or 1.",
"dig": "Digital output - input must be 0 or 1.", "dig": "Digital output - input must be 0 or 1.",
"pwm": "PWM output - input must be between 0 to 100.", "pwm": "PWM output - input must be between 0 to 100.<br/>Frequency must be in between 5 and 40000 Hz.",
"ser": "Servo output - input must be between 0 to 100. 50 is centre.<br/>Min must be 500uS or more, Max must be 2500uS or less." "ser": "Servo output - input must be between 0 to 100. 50 is centre.<br/>Min must be 500uS or more, Max must be 2500uS or less."
}, },
"types": { "types": {

12
hardware/pigpiod/pi-gpiod.html
View File

@ -381,6 +381,10 @@
<option value="ser" data-i18n="pi-gpiod.servo"></option> <option value="ser" data-i18n="pi-gpiod.servo"></option>
</select> </select>
</div> </div>
<div class="form-row" id="node-set-frequency">
<label>&nbsp;&nbsp;&nbsp;&nbsp;<span data-i18n="pi-gpiod.label.freq"></label>
<input type="text" id="node-input-freq" style="width:70px;"> Hz
</div>
<div class="form-row" id="node-set-minimax"> <div class="form-row" id="node-set-minimax">
<label>&nbsp;&nbsp;&nbsp;&nbsp;<span data-i18n="pi-gpiod.label.limits"></label> <label>&nbsp;&nbsp;&nbsp;&nbsp;<span data-i18n="pi-gpiod.label.limits"></label>
<span data-i18n="pi-gpiod.label.min"></span> <input type="text" id="node-input-sermin" style="width:70px;"> uS <span data-i18n="pi-gpiod.label.min"></span> <input type="text" id="node-input-sermin" style="width:70px;"> uS
@ -449,6 +453,7 @@
set: { value:"" }, set: { value:"" },
level: { value:"0" }, level: { value:"0" },
out: { value:"out" }, out: { value:"out" },
freq: { value:"800" },
sermin: { value:"1000" }, sermin: { value:"1000" },
sermax: { value:"2000" } sermax: { value:"2000" }
}, },
@ -480,8 +485,9 @@
if ($("#node-input-out").val() === "pwm") { if ($("#node-input-out").val() === "pwm") {
$('#node-set-tick').hide(); $('#node-set-tick').hide();
$('#node-set-state').hide(); $('#node-set-state').hide();
$('#node-set-minimax').hide();
$('#node-input-set').prop('checked', false); $('#node-input-set').prop('checked', false);
$("#node-set-frequency").show();
$('#node-set-minimax').hide();
$("#dig-tip").hide(); $("#dig-tip").hide();
$("#pwm-tip").show(); $("#pwm-tip").show();
$("#ser-tip").hide(); $("#ser-tip").hide();
@ -489,14 +495,16 @@
else if ($("#node-input-out").val() === "ser") { else if ($("#node-input-out").val() === "ser") {
$('#node-set-tick').hide(); $('#node-set-tick').hide();
$('#node-set-state').hide(); $('#node-set-state').hide();
$('#node-set-minimax').show();
$('#node-input-set').prop('checked', false); $('#node-input-set').prop('checked', false);
$("#node-set-frequency").hide();
$('#node-set-minimax').show();
$("#dig-tip").hide(); $("#dig-tip").hide();
$("#pwm-tip").hide(); $("#pwm-tip").hide();
$("#ser-tip").show(); $("#ser-tip").show();
} }
else { else {
$('#node-set-tick').show(); $('#node-set-tick').show();
$("#node-set-frequency").hide();
$('#node-set-minimax').hide(); $('#node-set-minimax').hide();
$("#dig-tip").show(); $("#dig-tip").show();
$("#pwm-tip").hide(); $("#pwm-tip").hide();

11
hardware/pigpiod/pi-gpiod.js
View File

@ -86,6 +86,9 @@ module.exports = function(RED) {
this.set = n.set || false; this.set = n.set || false;
this.level = parseInt(n.level || 0); this.level = parseInt(n.level || 0);
this.out = n.out || "out"; this.out = n.out || "out";
this.freq = Number(n.freq || 800);
if (this.freq < 5) { this.freq = 5; }
if (this.freq > 40000) { this.freq = 40000; }
this.sermin = Number(n.sermin)/100; this.sermin = Number(n.sermin)/100;
this.sermax = Number(n.sermax)/100; this.sermax = Number(n.sermax)/100;
if (this.sermin > this.sermax) { if (this.sermin > this.sermax) {
@ -155,10 +158,10 @@ module.exports = function(RED) {
} else { } else {
node.status({fill:"green",shape:"dot",text:"node-red:common.status.ok"}); node.status({fill:"green",shape:"dot",text:"node-red:common.status.ok"});
} }
// if (node.out === "pwm") { if (node.out === "pwm") {
// PiGPIO.set_PWM_frequency(1000); PiGPIO.set_PWM_frequency(node.pin,node.freq);
// PiGPIO.set_PWM_range(1000); //PiGPIO.set_PWM_range(node.pin,1000);
// } }
} }
}); });
} }