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

fixup gpio nodes to try to be 100% python 2/3 friendly

Browse Source
This commit is contained in:
Dave Conway-Jones 2021-06-18 08:28:54 +01:00
parent 14a8b3293b
commit 7c4b2593ba
No known key found for this signature in database
GPG Key ID: 88BA2B8A411BE9FF
6 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/PiGpio/36-rpi-gpio.js
View File

@ -5,7 +5,7 @@ module.exports = function(RED) {
var exec = require('child_process').exec;
var spawn = require('child_process').spawn;
var testCommand = __dirname+'/testgpio.py'
var testCommand = __dirname+'/testgpio'
var gpioCommand = __dirname+'/nrgpio';
var allOK = true;
@ -225,7 +225,7 @@ module.exports = function(RED) {
var node = this;
if (allOK === true) {
node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
node.child = spawn(gpioCommand, ["mouse",node.butt]);
node.status({fill:"green",shape:"dot",text:"rpi-gpio.status.ok"});
node.child.stdout.on('data', function (data) {
@ -276,7 +276,7 @@ module.exports = function(RED) {
var node = this;
var doConnect = function() {
node.child = spawn(gpioCommand+".py", ["kbd","0"]);
node.child = spawn(gpioCommand, ["kbd","0"]);
node.status({fill:"green",shape:"dot",text:"rpi-gpio.status.ok"});
node.child.stdout.on('data', function (data) {

13
hardware/PiGpio/nrgpio
View File

@ -1,17 +1,4 @@
#!/bin/bash
#
# Copyright JS Foundation and other contributors, http://js.foundation
#
# 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.
#
python_cmd='python3'
# Fallback to Python 2, if Python 3 is not available

14
hardware/PiGpio/nrgpio.py
View File

@ -1,17 +1,3 @@
#!/usr/bin/python
#
# Copyright JS Foundation and other contributors, http://js.foundation
#
# 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.
#
# Import library functions we need
import RPi.GPIO as GPIO

2
hardware/PiGpio/package.json
View File

@ -1,6 +1,6 @@
{
"name": "node-red-node-pi-gpio",
"version": "2.0.0-beta3",
"version": "2.0.0-beta4",
"description": "The basic Node-RED node for Pi GPIO",
"dependencies" : {
},

8
hardware/PiGpio/testgpio Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
python_cmd='python3'
# Fallback to Python 2, if Python 3 is not available
command -v python3 > /dev/null || python_cmd=`python`
BASEDIR=$(dirname $0)
$python_cmd -u $BASEDIR/testgpio.py $@

1
hardware/PiGpio/testgpio.py
View File

@ -1,4 +1,3 @@
#!/usr/bin/python
import sys
try:
import RPi.GPIO as GPIO