Merge branch 'master' of https://github.com/node-red/node-red-nodes

hardware/PiGpio/locales/ja/36-rpi-gpio.json

@@ -1,73 +1,75 @@
-"rpi-gpio": {
+{
-    "label": {
+    "rpi-gpio": {
-        "gpiopin": "GPIO",
+        "label": {
-        "selectpin": "端子の選択",
+            "gpiopin": "GPIO",
-        "resistor": "抵抗",
+            "selectpin": "端子の選択",
-        "readinitial": "デプロイや再起動時に端子の初期状態を読み込む",
+            "resistor": "抵抗",
-        "type": "出力形式",
+            "readinitial": "デプロイや再起動時に端子の初期状態を読み込む",
-        "initpin": "端子の状態を初期化",
+            "type": "出力形式",
-        "debounce": "デバウンス",
+            "initpin": "端子の状態を初期化",
-        "freq": "頻度",
+            "debounce": "デバウンス",
-        "button": "ボタン",
+            "freq": "頻度",
-        "pimouse": "Pi Mouse",
+            "button": "ボタン",
-        "pikeyboard": "Pi Keyboard",
+            "pimouse": "Pi Mouse",
-        "left": "Left",
+            "pikeyboard": "Pi Keyboard",
-        "right": "Right",
+            "left": "Left",
-        "middle": "Middle"
+            "right": "Right",
-    },
+            "middle": "Middle"
-    "resistor": {
+        },
-        "none": "なし",
+        "resistor": {
-        "pullup": "プルアップ",
+            "none": "なし",
-        "pulldown": "プルダウン"
+            "pullup": "プルアップ",
-    },
+            "pulldown": "プルダウン"
-    "digout": "デジタル出力",
+        },
-    "pwmout": "PWM出力",
-    "servo": "サーボ出力",
-    "initpin0": "端子の初期レベル - Low (0)",
-    "initpin1": "端子の初期レベル - High (1)",
-    "left": "左",
-    "right": "右",
-    "middle": "中間",
-    "any": "全て",
-    "pinname": "端子",
-    "alreadyuse": "使用中",
-    "alreadyset": "設定済",
-    "tip": {
-        "pin": "<b>使用中の端子</b>: ",
-        "in": "注釈: 入力値は、0または1の数値のみ対応しています。",
-        "dig": "注釈: 「出力形式」として「デジタル出力」を用いる場合、入力値は0または1の数値である必要があります。",
-        "pwm": "注釈: 「出力形式」として「PWM出力」を用いる場合、入力値は0～100の数値である必要があります。",
-        "ser": "<b>注釈</b>: サーボ出力向け - 入力値は0～100の間である必要があります。50が中心値です。"
-    },
-    "types": {
         "digout": "デジタル出力",
-        "input": "入力",
-        "pullup": "プルアップの入力",
-        "pulldown": "プルダウンの入力",
         "pwmout": "PWM出力",
-        "servo": "サーボ出力"
+        "servo": "サーボ出力",
-    },
+        "initpin0": "端子の初期レベル - Low (0)",
-    "status": {
+        "initpin1": "端子の初期レベル - High (1)",
-        "stopped": "停止",
+        "left": "左",
-        "closed": "切断",
+        "right": "右",
-        "not-running": "停止中",
+        "middle": "中間",
-        "not-available": "利用不可",
+        "any": "全て",
-        "na": "N/A : __value__",
+        "pinname": "端子",
-        "ok": "OK"
+        "alreadyuse": "使用中",
-    },
+        "alreadyset": "設定済",
-    "errors": {
+        "tip": {
-        "ignorenode": "Raspberry Pi固有のノードを無視しました",
+            "pin": "<b>使用中の端子</b>: ",
-        "version": "バージョンコマンドが失敗しました",
+            "in": "注釈: 入力値は、0または1の数値のみ対応しています。",
-        "sawpitype": "Saw Pi Type",
+            "dig": "注釈: 「出力形式」として「デジタル出力」を用いる場合、入力値は0または1の数値である必要があります。",
-        "libnotfound": "RPi.GPIO pythonライブラリを見つけられませんでした",
+            "pwm": "注釈: 「出力形式」として「PWM出力」を用いる場合、入力値は0～100の数値である必要があります。",
-        "alreadyset": "GPIO端子  __pin__ は既に出力形式が設定されています: __type__",
+            "ser": "<b>注釈</b>: サーボ出力向け - 入力値は0～100の間である必要があります。50が中心値です。"
-        "invalidpin": "GPIO端子が不正です",
+        },
-        "invalidinput": "入力が不正です",
+        "types": {
-        "needtobeexecutable": "__command__ は実行可能である必要があります",
+            "digout": "デジタル出力",
-        "mustbeexecutable": "nrgpio は実行可能である必要があります",
+            "input": "入力",
-        "commandnotfound": "nrgpio コマンドが見つかりません",
+            "pullup": "プルアップの入力",
-        "commandnotexecutable": "nrgpio コマンドが実行可能ではありません",
+            "pulldown": "プルダウンの入力",
-        "error": "エラー: __error__",
+            "pwmout": "PWM出力",
-        "pythoncommandnotfound": "nrgpio python コマンドが実行されていません"
+            "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 コマンドが実行されていません"
+        }
     }
 }

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"  : {
   },

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.

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

utility/group/group.html

@@ -0,0 +1,39 @@
+<script type="text/html" data-template-name="group">
+    <div class="form-row">
+        <div class="form-tips">
+            <p>The current flow was created in a newer version of Node-RED and contains
+                <code>groups</code>.</p>
+            <p>This version of Node-RED does not support <code>groups</code> and
+                they have been replaced by this placeholder node by the
+                <code>node-red-node-group</code> module.</p>
+            <p>To use <code>groups</code>, upgrade to Node-RED 1.1.0 or later.</p>
+        </div>
+    </div>
+    <div class="form-row">
+        <label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]editor:common.label.name">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="group">
+    <p>A placeholder node for the grouping feature added in Node-RED 1.1.0.</p>
+    <p>This version of Node-RED does not support <code>groups</code> and
+        they have been replaced by this placeholder node by the
+        <code>node-red-node-group</code> module.</p>
+    <p>To use <code>groups</code>, upgrade to Node-RED 1.1.0 or later.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('group',{
+        category: 'config',
+        defaults: {
+            name:{value:""},
+            style:{value:{}},
+            nodes:{value:[]}
+        },
+        label: function() {
+            return this.name||"group";
+        },
+        labelStyle: "node_label_italic"
+    });
+</script>

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);
+}

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 <nick.oleary@gmail.com>"
+}