smart-nodes 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -209,4 +209,8 @@
 -   Mixing valve can now output as percentage directly or with open/close impulses.
 -   Mixing valve tries to guess the best position, when getting enabled.
 -   Added debug topic to all nodes, to see current values.
--   Added new node "mode-selector".
+-   Added new node "mode-selector".
+
+## Version 0.5.1:
+
+-   To be more compatible, topic "set" is also possible instead of "set_state". Same for "set_inverted" instead of "set_state_inverted".

package/forwarder/forwarder.js

@@ -81,16 +81,19 @@ module.exports = function (RED)
         {
             let real_topic = helper.getTopicName(msg.topic);
 
-            if (real_topic == "set_state_inverted")
+            if (real_topic.startsWith("set_state"))
+                real_topic = real_topic.replace("set_state", "set");
+
+            if (real_topic == "set_inverted")
             {
-                real_topic = "set_state";
+                real_topic = "set";
                 msg.payload = !msg.payload;
             }
 
             let new_state = null;
-            if (real_topic == "enable" || (real_topic == "set_state" && msg.payload))
+            if (real_topic == "enable" || (real_topic == "set" && msg.payload))
                 new_state = true;
-            else if (real_topic == "disable" || (real_topic == "set_state" && !msg.payload))
+            else if (real_topic == "disable" || (real_topic == "set" && !msg.payload))
                 new_state = false;
 
             switch (real_topic)

package/forwarder/locales/de-DE/forwarder.html

@@ -27,11 +27,11 @@
                     <td>Deaktiviert das Weiterleiten.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> oder <code>set_state</code></td>
                     <td>Aktiviert das Weiterleiten, wenn <code>msg.payload = true</code> oder deaktiviert das Weiterleiten, wenn <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> oder <code>set_state_inverted</code></td>
                     <td>Aktiviert das Weiterleiten, wenn <code>msg.payload = false</code> oder deaktiviert das Weiterleiten, wenn <code>msg.payload = true</code>.</td>
                 </tr>
             </tbody>

package/forwarder/locales/en-US/forwarder.html

@@ -27,11 +27,11 @@
                     <td>Disables forwarding.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> or <code>set_state</code></td>
                     <td>Enables forwarding if <code>msg.payload = true</code> or disables forwarding if <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> or <code>set_state_inverted</code></td>
                     <td>Enables forwarding if <code>msg.payload = false</code> or disables forwarding if <code>msg.payload = true</code>.</td>
                 </tr>
             </tbody>

package/light/light.js

@@ -288,7 +288,6 @@ module.exports = function (RED)
                                 break;
                         }
                     }
-
                     break;
 
                 case "blink":

package/mixing-valve/locales/de-DE/mixing-valve.html

@@ -34,11 +34,11 @@
                     <td>Deaktiviert die Mischeransteuerung und fährt die Position an, die als Aus-Modus festgelegt ist.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> oder <code>set_state</code></td>
                     <td>Aktiviert den Mischer, wenn <code>msg.payload = true</code> oder deaktiviert ihn, wenn <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> oder <code>set_state_inverted</code></td>
                     <td>Aktiviert den Mischer, wenn <code>msg.payload = false</code> oder deaktiviert ihn, wenn <code>msg.payload = true</code>.</td>
                 </tr>
                 <tr>

package/mixing-valve/locales/en-US/mixing-valve.html

@@ -34,11 +34,11 @@
                     <td>Deactivates the mixer control and moves to the position that is set as the off mode.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> or <code>set_state</code></td>
                     <td>Activates the mixing valve when <code>msg.payload = true</code> or deactivates it if <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> or <code>set_state_inverted</code></td>
                     <td>Activates the mixing valve when <code>msg.payload = false</code> or deactivates it if <code>msg.payload = true</code>.</td>
                 </tr>
                 <tr>

package/mixing-valve/mixing-valve.html

@@ -170,6 +170,33 @@
                 onEditPrepare(this, ["smart_central-control"]);
                 initTreeList(node, ["smart_central-control"]);
 
+                $("#node-input-output_mode")
+                    .css("max-width", "70%")
+                    .typedInput({
+                        type: "num",
+                        types: [{
+                            value: "output_mode",
+                            options: [
+                                { value: "OPEN_CLOSE", label: node._("mixing-valve.ui.open_close") },
+                                { value: "PERCENTAGE", label: node._("mixing-valve.ui.percentage") },
+                            ]
+                        }]
+                    });
+
+                $("#node-input-output_mode").on("change", function ()
+                {
+                    if (this.value == "OPEN_CLOSE")
+                    {
+                        $(".only-open-close").show();
+                        node.outputs = 3;
+                    }
+                    else
+                    {
+                        $(".only-open-close").hide();
+                        node.outputs = 1;
+                    }
+                });
+
                 $("#node-input-setpoint")
                     .css("max-width", "4rem")
                     .spinner({
@@ -240,49 +267,22 @@
                         }],
                     });
 
-                $("#node-input-output_mode")
-                    .css("max-width", "70%")
-                    .typedInput({
-                        type: "num",
-                        types: [{
-                            value: "output_mode",
-                            options: [
-                                { value: "OPEN_CLOSE", label: node._("mixing-valve.ui.open_close") },
-                                { value: "PERCENTAGE", label: node._("mixing-valve.ui.percentage") },
-                            ]
-                        }]
-                    });
-
-                $("#node-input-output_mode").on("change", function ()
-                {
-                    if (this.value == "OPEN_CLOSE")
-                    {
-                        $(".only-open-close").show();
-                        node.outputs = 3;
-                    }
-                    else
-                    {
-                        $(".only-open-close").hide();
-                        node.outputs = 1;
-                    }
-                });
-
 
                 $("#node-input-precision")
-                        .css("max-width", "4rem")
-                        .spinner({
-                            min: 0.1,
-                            max: 1.0,
-                            step: 0.1,
-                            change: function (event, ui)
-                            {
-                                var value = parseFloat(this.value);
-                                value = isNaN(value) ? 0.0 : value;
-                                value = Math.max(value, parseFloat($(this).attr("aria-valuemin")));
-                                value = Math.min(value, parseFloat($(this).attr("aria-valuemax")));
-                                if (value !== this.value) $(this).spinner("value", value);
-                            },
-                        });
+                    .css("max-width", "4rem")
+                    .spinner({
+                        min: 0.1,
+                        max: 1.0,
+                        step: 0.1,
+                        change: function (event, ui)
+                        {
+                            var value = parseFloat(this.value);
+                            value = isNaN(value) ? 0.0 : value;
+                            value = Math.max(value, parseFloat($(this).attr("aria-valuemin")));
+                            value = Math.min(value, parseFloat($(this).attr("aria-valuemax")));
+                            if (value !== this.value) $(this).spinner("value", value);
+                        },
+                    });
 
                 $("#node-input-max_change_percent")
                     .css("max-width", "4rem")

package/mixing-valve/mixing-valve.js

@@ -148,13 +148,16 @@ module.exports = function (RED)
 
             let real_topic = helper.getTopicName(msg.topic);
 
-            if (real_topic == "set_state_inverted")
+            if (real_topic.startsWith("set_state"))
+                real_topic = real_topic.replace("set_state", "set");
+
+            if (real_topic == "set_inverted")
             {
-                real_topic = "set_state";
+                real_topic = "set";
                 msg.payload = !msg.payload;
             }
 
-            if (real_topic == "set_state")
+            if (real_topic == "set")
                 real_topic = (!!msg.payload) ? "enable" : "disable";
 
             switch (real_topic)
@@ -179,7 +182,7 @@ module.exports = function (RED)
                 case "enable":
                     if (node_settings.enabled)
                     {
-                        helpers.log(node, "Already enabled");
+                        helper.log(node, "Already enabled");
                         break;
                     }
 

package/mode-selector/locales/de-DE/mode-selector.json

@@ -1,5 +1,5 @@
 {
-    "modeSelector": {
+    "mode-selector": {
         "ui": {
             "name": "Name",
             "update_only_changed_outputs": "Nur an geänderte Ausgänge senden",

package/mode-selector/locales/en-US/mode-selector.json

@@ -1,5 +1,5 @@
 {
-    "modeSelector": {
+    "mode-selector": {
         "ui": {
             "name": "Name",
             "update_only_changed_outputs": "Only send to changed outputs",

package/mode-selector/mode-selector.html

@@ -81,7 +81,7 @@
                             .appendTo(row);
 
                         // Output name
-                        var modeName = $("<input/>", { class: "node-input-prop-name", placeholder: node._("modeSelector.ui.name"), type: "text" })
+                        var modeName = $("<input/>", { class: "node-input-prop-name", placeholder: node._("mode-selector.ui.name"), type: "text" })
                             .css("width", "90%")
                             .appendTo(row);
 
@@ -115,7 +115,7 @@
                 tabs.addTab({
                     id: "modes-tab-outputs",
                     iconClass: "fa fa-list-ol",
-                    label: node._("modeSelector.ui.modes")
+                    label: node._("mode-selector.ui.modes")
                 });
             },
             oneditsave: function ()
@@ -135,12 +135,12 @@
 
 <script type="text/html" data-template-name="smart_mode-selector">
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="modeSelector.ui.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]modeSelector.ui.name" />
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="mode-selector.ui.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]mode-selector.ui.name" />
     </div>
     <div class="form-row">
         <input type="checkbox" id="node-input-update_only_changed_outputs" style="width: 20px;" />
-        <label for="node-input-update_only_changed_outputs" style="width: calc(100% - 30px);" data-i18n="modeSelector.ui.update_only_changed_outputs"></label>
+        <label for="node-input-update_only_changed_outputs" style="width: calc(100% - 30px);" data-i18n="mode-selector.ui.update_only_changed_outputs"></label>
     </div>
 
     <div id="mode-selector-modes">
@@ -154,10 +154,10 @@
         </div>
     </div>
     <hr/>
-    <h4 style="margin: 0.5rem 0;" data-i18n="modeSelector.ui.system_start"></h4>
+    <h4 style="margin: 0.5rem 0;" data-i18n="mode-selector.ui.system_start"></h4>
     <div class="form-row">
         <input type="checkbox" id="node-input-resend_on_start" style="width: 20px;" />
-        <label for="node-input-resend_on_start" style="width: calc(100% - 30px);" data-i18n="modeSelector.ui.send_after_start"></label>
+        <label for="node-input-resend_on_start" style="width: calc(100% - 30px);" data-i18n="mode-selector.ui.send_after_start"></label>
     </div>
 
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-nodes",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "description": "Controls light, shutters and more. Includes common used logic and statistic nodes to control your home.",
     "keywords": [
         "node-red",

package/scheduler/locales/de-DE/scheduler.html

@@ -25,11 +25,11 @@
                     <td>Deaktiviert den Scheduler.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> oder <code>set_state</code></td>
                     <td>Aktiviert den Scheduler, wenn <code>msg.payload = true</code> oder deaktiviert den Scheduler, wenn <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> oder <code>set_state_inverted</code></td>
                     <td>Aktiviert den Scheduler, wenn <code>msg.payload = false</code> oder deaktiviert den Scheduler, wenn <code>msg.payload = true</code>.</td>
                 </tr>
             </tbody>

package/scheduler/locales/en-US/scheduler.html

@@ -25,11 +25,11 @@
                     <td>Disables the scheduler.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state</code></td>
+                    <td><code>set</code> or <code>set_state</code></td>
                     <td>Enables the scheduler if <code>msg.payload = true</code> or disables the scheduler if <code>msg.payload = false</code>.</td>
                 </tr>
                 <tr>
-                    <td><code>set_state_inverted</code></td>
+                    <td><code>set_inverted</code> oder <code>set_state_inverted</code></td>
                     <td>Enables the scheduler if <code>msg.payload = false</code> or disables the scheduler if <code>msg.payload = true</code>.</td>
                 </tr>
             </tbody>

package/scheduler/scheduler.js

@@ -102,13 +102,16 @@ module.exports = function (RED)
         {
             let real_topic = helper.getTopicName(msg.topic);
 
-            if (real_topic == "set_state_inverted")
+            if (real_topic.startsWith("set_state"))
+                real_topic = real_topic.replace("set_state", "set");
+
+            if (real_topic == "set_inverted")
             {
-                real_topic = "set_state";
+                real_topic = "set";
                 msg.payload = !msg.payload;
             }
 
-            if (real_topic == "set_state")
+            if (real_topic == "set")
                 real_topic = (!!msg.payload) ? "enable" : "disable";
 
             switch (real_topic)

package/statistic/locales/de-DE/statistic.html

@@ -1,7 +1,7 @@
 <script type="text/html" data-help-name="smart_statistic">
     <p>Dieser Knoten berechnet das Minimum, Maximum, die Summe, die Differenz, den absoluten Wert, die absolute Differenz, den Durchschnitt sowie den gleitenden Mittelwert verschiedener Werte.</p>
     <p>Jeder Wert muss mit einem eigenen Topic gesendet werden. Kommt ein zweiter Wert mit dem gleichen Topic, wird der entsprechende Wert überschrieben.</p>
-    <p>Im Falle von MIN, MAX und ABS wird das entsprechende Topic, welches mit den Werten kam, mit ausgegeben. Bei SUM, DIFF, AVG und MOV_AVG handelt es sich um kombinierte Ergebnisse, weshalb Topic hier immer nicht gesetzt ist.</p>
+    <p>Im Falle von MIN, MAX und ABS wird das entsprechende Topic, welches mit den Werten kam, mit ausgegeben. Bei SUM, DIFF, AVG und MOV_AVG handelt es sich um kombinierte Ergebnisse, weshalb das Topic hier immer nicht gesetzt ist.</p>
     <p>Für den absoluten Wert sowie den gleitenden Mittelwert spielt das Topic keine Rolle, jeder Wert der empfangen wird, wird für die Berechnung verwendet.</p>
     <p>
         <b>Hinweis:</b> Smart Nodes verwenden Topics im Format <code>name#nummer</code>, damit können verschiedene Smart Nodes mit dem gleichen Topic angesteuert werden.<br/>