From bf1c5abd7d6aa4aee4927bae651904445ec77d54 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Fri, 10 Apr 2020 22:44:55 +0100 Subject: [PATCH] Merge branch 'master' of https://github.com/node-red/node-red-nodes --- hardware/PiGpio/locales/ja/36-rpi-gpio.json | 140 ++++++++++---------- hardware/PiGpio/package.json | 2 +- utility/group/LICENSE | 14 ++ utility/group/README.md | 25 ++++ utility/group/group.html | 39 ++++++ utility/group/group.js | 16 +++ utility/group/package.json | 20 +++ 7 files changed, 186 insertions(+), 70 deletions(-) create mode 100644 utility/group/LICENSE create mode 100644 utility/group/README.md create mode 100644 utility/group/group.html create mode 100644 utility/group/group.js create mode 100644 utility/group/package.json diff --git a/hardware/PiGpio/locales/ja/36-rpi-gpio.json b/hardware/PiGpio/locales/ja/36-rpi-gpio.json index a76daba6..619eb3ef 100644 --- a/hardware/PiGpio/locales/ja/36-rpi-gpio.json +++ b/hardware/PiGpio/locales/ja/36-rpi-gpio.json @@ -1,73 +1,75 @@ -"rpi-gpio": { - "label": { - "gpiopin": "GPIO", - "selectpin": "端子の選択", - "resistor": "抵抗", - "readinitial": "デプロイや再起動時に端子の初期状態を読み込む", - "type": "出力形式", - "initpin": "端子の状態を初期化", - "debounce": "デバウンス", - "freq": "頻度", - "button": "ボタン", - "pimouse": "Pi Mouse", - "pikeyboard": "Pi Keyboard", - "left": "Left", - "right": "Right", - "middle": "Middle" - }, - "resistor": { - "none": "なし", - "pullup": "プルアップ", - "pulldown": "プルダウン" - }, - "digout": "デジタル出力", - "pwmout": "PWM出力", - "servo": "サーボ出力", - "initpin0": "端子の初期レベル - Low (0)", - "initpin1": "端子の初期レベル - High (1)", - "left": "左", - "right": "右", - "middle": "中間", - "any": "全て", - "pinname": "端子", - "alreadyuse": "使用中", - "alreadyset": "設定済", - "tip": { - "pin": "使用中の端子: ", - "in": "注釈: 入力値は、0または1の数値のみ対応しています。", - "dig": "注釈: 「出力形式」として「デジタル出力」を用いる場合、入力値は0または1の数値である必要があります。", - "pwm": "注釈: 「出力形式」として「PWM出力」を用いる場合、入力値は0～100の数値である必要があります。", - "ser": "注釈: サーボ出力向け - 入力値は0～100の間である必要があります。50が中心値です。" - }, - "types": { +{ + "rpi-gpio": { + "label": { + "gpiopin": "GPIO", + "selectpin": "端子の選択", + "resistor": "抵抗", + "readinitial": "デプロイや再起動時に端子の初期状態を読み込む", + "type": "出力形式", + "initpin": "端子の状態を初期化", + "debounce": "デバウンス", + "freq": "頻度", + "button": "ボタン", + "pimouse": "Pi Mouse", + "pikeyboard": "Pi Keyboard", + "left": "Left", + "right": "Right", + "middle": "Middle" + }, + "resistor": { + "none": "なし", + "pullup": "プルアップ", + "pulldown": "プルダウン" + }, "digout": "デジタル出力", - "input": "入力", - "pullup": "プルアップの入力", - "pulldown": "プルダウンの入力", "pwmout": "PWM出力", - "servo": "サーボ出力" - }, - "status": { - "stopped": "停止", - "closed": "切断", - "not-running": "停止中", - "not-available": "利用不可", - "na": "N/A : __value__", - "ok": "OK" - }, - "errors": { - "ignorenode": "Raspberry Pi固有のノードを無視しました", - "version": "バージョンコマンドが失敗しました", - "sawpitype": "Saw Pi Type", - "libnotfound": "RPi.GPIO pythonライブラリを見つけられませんでした", - "alreadyset": "GPIO端子 __pin__ は既に出力形式が設定されています: __type__", - "invalidpin": "GPIO端子が不正です", - "invalidinput": "入力が不正です", - "needtobeexecutable": "__command__ は実行可能である必要があります", - "mustbeexecutable": "nrgpio は実行可能である必要があります", - "commandnotfound": "nrgpio コマンドが見つかりません", - "commandnotexecutable": "nrgpio コマンドが実行可能ではありません", - "error": "エラー: __error__", - "pythoncommandnotfound": "nrgpio python コマンドが実行されていません" + "servo": "サーボ出力", + "initpin0": "端子の初期レベル - Low (0)", + "initpin1": "端子の初期レベル - High (1)", + "left": "左", + "right": "右", + "middle": "中間", + "any": "全て", + "pinname": "端子", + "alreadyuse": "使用中", + "alreadyset": "設定済", + "tip": { + "pin": "使用中の端子: ", + "in": "注釈: 入力値は、0または1の数値のみ対応しています。", + "dig": "注釈: 「出力形式」として「デジタル出力」を用いる場合、入力値は0または1の数値である必要があります。", + "pwm": "注釈: 「出力形式」として「PWM出力」を用いる場合、入力値は0～100の数値である必要があります。", + "ser": "注釈: サーボ出力向け - 入力値は0～100の間である必要があります。50が中心値です。" + }, + "types": { + "digout": "デジタル出力", + "input": "入力", + "pullup": "プルアップの入力", + "pulldown": "プルダウンの入力", + "pwmout": "PWM出力", + "servo": "サーボ出力" + }, + "status": { + "stopped": "停止", + "closed": "切断", + "not-running": "停止中", + "not-available": "利用不可", + "na": "N/A : __value__", + "ok": "OK" + }, + "errors": { + "ignorenode": "Raspberry Pi固有のノードを無視しました", + "version": "バージョンコマンドが失敗しました", + "sawpitype": "Saw Pi Type", + "libnotfound": "RPi.GPIO pythonライブラリを見つけられませんでした", + "alreadyset": "GPIO端子 __pin__ は既に出力形式が設定されています: __type__", + "invalidpin": "GPIO端子が不正です", + "invalidinput": "入力が不正です", + "needtobeexecutable": "__command__ は実行可能である必要があります", + "mustbeexecutable": "nrgpio は実行可能である必要があります", + "commandnotfound": "nrgpio コマンドが見つかりません", + "commandnotexecutable": "nrgpio コマンドが実行可能ではありません", + "error": "エラー: __error__", + "pythoncommandnotfound": "nrgpio python コマンドが実行されていません" + } } } diff --git a/hardware/PiGpio/package.json b/hardware/PiGpio/package.json index 9e74c11f..708ef257 100644 --- a/hardware/PiGpio/package.json +++ b/hardware/PiGpio/package.json @@ -1,6 +1,6 @@ { "name": "node-red-node-pi-gpio", - "version": "1.0.8", + "version": "1.0.9", "description": "The basic Node-RED node for Pi GPIO", "dependencies" : { }, diff --git a/utility/group/LICENSE b/utility/group/LICENSE new file mode 100644 index 00000000..f5b60114 --- /dev/null +++ b/utility/group/LICENSE @@ -0,0 +1,14 @@ +Copyright 2016 JS Foundation and other contributors, https://js.foundation/ +Copyright 2013-2016 IBM Corp. + +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. diff --git a/utility/group/README.md b/utility/group/README.md new file mode 100644 index 00000000..4c6f56e2 --- /dev/null +++ b/utility/group/README.md @@ -0,0 +1,25 @@ +node-red-node-group +=================== + +A Node-RED node to allow flows containing groups to be imported into older versions +of Node-RED. + +The ability to create groups was introduced in Node-RED 1.1.0, adding a new core +node type called `group`. + +This module provides its own `group` node type that can be installed into older +versions of Node-RED to allow them to run flows containing that type. + +It does *not* provide any group-like functionality - it *only* registers a +placeholder `group` node type. + +The module will only register the type if it detects it is being loaded into +Node-RED 1.0.x or older, otherwise it does nothing. + + +Install +------- + +Run the following command in your Node-RED user directory - typically `~/.node-red` + + npm i node-red-node-group diff --git a/utility/group/group.html b/utility/group/group.html new file mode 100644 index 00000000..d002ba40 --- /dev/null +++ b/utility/group/group.html @@ -0,0 +1,39 @@ + + + + + diff --git a/utility/group/group.js b/utility/group/group.js new file mode 100644 index 00000000..f976d2f4 --- /dev/null +++ b/utility/group/group.js @@ -0,0 +1,16 @@ + +module.exports = function(RED) { + var version = RED.version(); + var parts = /^(\d)+\.(\d)+\.(\d)+/.exec(version); + if (parts) { + var major = parseInt(parts[1]); + var minor = parseInt(parts[2]); + if (major > 1 || (major === 1 && minor > 0)) { + throw new Error("This module is not required for Node-RED 1.1.0 or later") + } + } + function GroupPolyfillNode(n) { + RED.nodes.createNode(this,n); + } + RED.nodes.registerType("group",GroupPolyfillNode); +} diff --git a/utility/group/package.json b/utility/group/package.json new file mode 100644 index 00000000..fb88571e --- /dev/null +++ b/utility/group/package.json @@ -0,0 +1,20 @@ +{ + "name": "node-red-node-group", + "version": "1.0.0", + "description": "A Node-RED node to allow flows containing groups to be imported into Node-RED 1.0.x or earlier.", + "dependencies": {}, + "repository": { + "type": "git", + "url": "https://github.com/node-red/node-red-nodes/tree/master/utility/group" + }, + "license": "Apache-2.0", + "keywords": [ + "node-red" + ], + "node-red": { + "nodes": { + "group": "group.js" + } + }, + "author": "Nick O'Leary " +}