smart-nodes 0.3.26 → 0.3.28

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+## Version 0.3.28:
+
+-   Added this changlog file.
+-   Separate values for shutter_complex node for up and down times.
+    (Open each node and save it, to use the new times. This should be done before the version 0.4.0 is released.)
+-   For the following nodes you can choose to have one or two outputs (Could be a **breaking change**, please check your nodes).
+    -   Logic
+    -   Compare
+    -   Hysteresis
+-   You can now separately declare the messages that should be sent by the following nodes (Could be a **breaking change**, please check your nodes).
+    -   Logic
+    -   Compare
+    -   Hysteresis
+
+-   You can choose for the following nodes if they should send the result all the time or only if the result changed.
+    -   Logic
+    -   Compare
+    -   Hysteresis

package/compare/compare.html

@@ -15,6 +15,8 @@
             out_false_type: { value: 'json' },
             out_true: { value: '{"topic": ""}' },
             out_true_type: { value: 'json' },
+            send_only_change: { value: true },
+            outputs: { value: 1 },
             save_state: { value: true },
             resend_on_start: { value: true }
         },
@@ -25,6 +27,10 @@
         {
             return this.name || this.comparator || "Compare";
         },
+        outputLabels: function (index)
+        {
+            return this.outputs == 1 ? "" : ["Wahr", "Falsch"][index];
+        },
         oneditprepare: function ()
         {
             $("#node-input-comparator").typedInput({
@@ -65,6 +71,8 @@
                 typeField: "#node-input-value2_type"
             });
 
+
+
             $("#node-input-out_true").typedInput({
                 type: "json",
                 types: ["json", {
@@ -87,6 +95,30 @@
                 typeField: "#node-input-out_false_type"
             });
 
+            $("#node-input-send_only_change").typedInput({
+                type: "bool",
+                types: [{
+                    value: "1",
+                    options: [
+                        { value: "true", label: "Nur bei Änderung" },
+                        { value: "false", label: "Immer" },
+                    ]
+                }]
+            });
+
+            $("#node-input-outputs").typedInput({
+                type: "num",
+                types: [{
+                    value: "1",
+                    options: [
+                        { value: "1", label: "Gemeinsamer Ausgang" },
+                        { value: "2", label: "Separate Ausgänge" },
+                    ]
+                }]
+            });
+
+
+
             $("#node-input-save_state").on("change", ev =>
             {
                 if (ev.target.checked)
@@ -109,7 +141,8 @@
         <input id="node-input-comparator" />
     </div>
     <div class="form-row">
-        <div>Defaultwerte werden hier gesetzt und können durch die einkommenden Nachrichten überschrieben werden.</div>
+        <div>Defaultwerte werden hier gesetzt und können durch</div>
+        <div>die einkommenden Nachrichten überschrieben werden.</div>
     </div>
     <div class="form-row">
         <label for="node-input-value1"><i class="fa fa-hashtag"></i> Wert 1</label>
@@ -134,13 +167,19 @@
         <input type="hidden" id="node-input-out_false_type">
     </div>
     <div class="form-row">
-        <span><strong>Hinweis:</strong></span>
+        <label for="node-input-send_only_change"><i class="fa fa-repeat"></i> Senden</label>
+        <input id="node-input-send_only_change" />
     </div>
     <div class="form-row">
-        <span>
-            <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt.<br/>
-            <code>msg.comperator</code> wird automatisch auf den Logik-Operator gesetzt.
-        </span>
+        <label for="node-input-outputs"><i class="fa fa-hashtag"></i> Ausgänge</label>
+        <input id="node-input-outputs" />
+    </div>
+    <div class="form-row">
+        <div><strong>Hinweis:</strong></div>
+        <div><code>msg.payload</code> wird automatisch auf das Vergleichs-Ergebnis gesetzt,</div>
+        <div>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.</div>
+        <div><code>msg.comperator</code> wird automatisch auf den Vergleichs-Operator gesetzt,</div>
+        <div>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.</div>
     </div>
     <hr/>
     <h4 style="margin: 0.5rem 0;">Systemstart</h4>
@@ -182,4 +221,11 @@
         </table>
     </p>
     <p>Texte werden anhand ihres Ascii-Codes verglichen.<code>"c" &lt; "b"</code> ergibt <code>false</code><code>"C" &lt; "b"</code> ergibt <code>true</code>.</p>
+    <p>
+        <strong>Hinweis:</strong><br/>
+        <code>msg.payload</code> wird automatisch auf das Vergleichs-Ergebnis gesetzt,
+        sofern es nicht bereits in der Konfiguration gesetzt wurde.<br/>
+        <code>msg.comperator</code> wird automatisch auf den Vergleichs-Operator gesetzt,
+        sofern es nicht bereits in der Konfiguration gesetzt wurde.
+    </p>
 </script>

package/compare/compare.js

@@ -10,11 +10,13 @@ module.exports = function (RED)
         const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
+        // persistant values
         var node_settings = {
             values: [
                 helper.evaluateNodeProperty(RED, config.value1, config.value1_type),
                 helper.evaluateNodeProperty(RED, config.value2, config.value2_type)
             ],
+            last_result: null,
             last_message: null,
         };
 
@@ -33,6 +35,8 @@ module.exports = function (RED)
         let comparator = config.comparator;
         let out_true = helper.evaluateNodeProperty(RED, config.out_true, config.out_true_type);
         let out_false = helper.evaluateNodeProperty(RED, config.out_false, config.out_false_type);
+        let send_only_change = helper.evaluateNodeProperty(RED, config.send_only_change, "bool");
+        let outputs = helper.evaluateNodeProperty(RED, config.outputs, "num");
 
         // runtime values
 
@@ -50,7 +54,7 @@ module.exports = function (RED)
             let num = parseFloat(msg.payload);
             if (Number.isNaN(num))
             {
-                node.error("Payload has to be numeric");
+                // node.error("Payload has to be numeric");
                 return;
             }
 
@@ -58,28 +62,52 @@ module.exports = function (RED)
             node_settings.values[input - 1] = num;
 
             let result = getResult();
+            let out_msg = null;
+
             setStatus(result);
 
             if (result != null)
             {
-                let msg = result ? out_true : out_false;
+                // Get custom output message
+                if (result)
+                {
+                    if (out_true !== null)
+                        out_msg = Object.assign({}, out_true);
+                }
+                else
+                {
+                    if (out_false !== null)
+                        out_msg = Object.assign({}, out_false);
+                }
 
-                if (msg != null)
+                if (out_msg !== null)
                 {
-                    msg = Object.assign(
-                        {},
-                        msg,
-                        { payload: result, comparator: comparator }
-                    );
+                    // Overwrite automatic values, if not already defined
+                    if (typeof out_msg.payload === "undefined")
+                        out_msg.payload = result;
+
+                    if (typeof out_msg.comparator === "undefined")
+                        out_msg.comparator = comparator;
+
+                    // Separate outputs if needed
+                    if (outputs == 2)
+                    {
+                        if (result)
+                            out_msg = [out_msg, null];
+                        else
+                            out_msg = [null, out_msg];
+                    }
+
+                    // Send only if needed
+                    if (send_only_change == false || node_settings.last_result != result)
+                        node.send(out_msg);
                 }
 
-                node_settings.last_message = msg;
+                node_settings.last_result = result;
+                node_settings.last_message = out_msg;
 
                 if (config.save_state)
                     smart_context.set(node.id, node_settings);
-
-                if (msg != null)
-                    node.send(msg);
             }
         });
 

package/counter/counter.html

@@ -2,25 +2,38 @@
     RED.nodes.registerType("smart_counter", {
         category: "Smart Nodes",
         paletteLabel: "Counter",
-        color: "#6EE2D9",
+        color: "#E2D96E",
         defaults: {
             name: { value: "" },
             start: { value: 0 },
             step: { value: 1 },
             min: { value: 0 },
             max: { value: 10 },
+            out_message: { value: '{"topic": ""}' },
+            out_message_type: { value: 'json' },
             save_state: { value: true },
             resend_on_start: { value: true }
         },
         inputs: 1,
         outputs: 1,
-        icon: "smart_counter.png",
+        icon: "counter.png",
         label: function ()
         {
             return this.name || "Counter";
         },
         oneditprepare: function ()
         {
+            $("#node-input-out_message").typedInput({
+                type: "json",
+                types: ["json", {
+                    value: "null",
+                    label: "Standard",
+                    icon: "fa fa-times",
+                    hasValue: false,
+                }],
+                typeField: "#node-input-out_message_type"
+            });
+
             $("#node-input-save_state").on("change", ev =>
             {
                 if (ev.target.checked)
@@ -55,6 +68,21 @@
         <input type="number" id="node-input-max" placeholder="Max">
     </div>
     <hr/>
+    <h4 style="margin: 0.5rem 0;">Ausgangsnachricht</h4>
+    <div class="form-row">
+        <label for="node-input-out_message"><i class="fa fa-check-circle"></i> Nachricht</label>
+        <input type="text" id="node-input-out_message"/>
+        <input type="hidden" id="node-input-out_message_type">
+    </div>
+    <div class="form-row">
+        <span><strong>Hinweis:</strong></span>
+    </div>
+    <div class="form-row">
+        <span>
+            <code>msg.payload</code> wird immer automatisch auf den Ergebnis-Wert gesetzt.
+        </span>
+    </div>
+    <hr/>
     <h4 style="margin: 0.5rem 0;">Systemstart</h4>
     <div class="form-row">
         <input type="checkbox" id="node-input-save_state" style="width: 20px;" />
@@ -86,6 +114,18 @@
                 </tr>
             </thead>
             <tbody>
+                <tr>
+                    <td><code>set_min</code></td>
+                    <td>Überschreibt den eingestellten Min-Wert mit <code>msg.payload</code>.</td>
+                </tr>
+                <tr>
+                    <td><code>set_max</code></td>
+                    <td>Überschreibt den eingestellten Max-Wert mit <code>msg.payload</code>.</td>
+                </tr>
+                <tr>
+                    <td><code>set_step</code></td>
+                    <td>Überschreibt die eingestellte Schrittweite mit <code>msg.payload</code>.</td>
+                </tr>
                 <tr>
                     <td><code>up</code></td>
                     <td>Erhöht den Wert um <code>msg.payload</code> oder falls nicht gesetzt (oder <code>null</code>) um die konfigurierte Schrittweite. Der neue Wert ist dabei immer innerhalb der Min- und Max-Werte.</td>

package/counter/counter.js

@@ -31,6 +31,7 @@ module.exports = function (RED)
         let step = config.step;
         let min = config.min;
         let max = config.max;
+        let out_message = helper.evaluateNodeProperty(RED, config.out_message, config.out_message_type);
 
         // runtime values
 
@@ -47,6 +48,18 @@ module.exports = function (RED)
             let temp_value;
             switch (real_topic)
             {
+                case "set_min":
+                    min = parseFloat(msg.payload);
+                    break;
+
+                case "set_max":
+                    max = parseFloat(msg.payload);
+                    break;
+
+                case "set_step":
+                    step = parseFloat(msg.payload);
+                    break;
+
                 case "up":
                     temp_value = parseFloat(msg.payload);
                     if (isNaN(temp_value) && !isFinite(temp_value))
@@ -86,7 +99,12 @@ module.exports = function (RED)
             if (node_settings.value == node_settings.last_message?.payload)
                 return;
 
-            node_settings.last_message = { payload: node_settings.value };
+            // if out_message is set, use this instead of the default message
+            if (out_message)
+                node_settings.last_message = Object.assign({}, out_message, { payload: node_settings.value });
+            else
+                node_settings.last_message = { payload: node_settings.value };
+
             smart_context.set(node.id, node_settings);
 
             node.send(node_settings.last_message);
@@ -102,7 +120,7 @@ module.exports = function (RED)
             if (node_settings.value == null)
                 node.status({});
             else
-                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Value = " + node_settings.value });
+                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Min = " + min + " |  Max = " + max + " | Value = " + node_settings.value });
         }
 
         if (config.save_state && config.resend_on_start && node_settings.last_message != null)

package/delay/delay.js

@@ -94,7 +94,7 @@ module.exports = function (RED)
             }
         });
 
-        let send = (msg) =>
+        let send = msg =>
         {
             let delay_ms = 0;
 
@@ -139,7 +139,7 @@ module.exports = function (RED)
             // No delay if 0 or smaller
             if (delay_ms <= 0)
             {
-                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended msg.topic = '" + +msg.topic + "' msg.payload = '" + msg.payload + "'" });
+                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended " + getMessageStatusText(msg) });
                 node_settings.last_message = msg
 
                 if (config.save_state)
@@ -150,11 +150,11 @@ module.exports = function (RED)
             }
 
             // start new timeout
-            node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + "Forward msg.topic = '" + msg.topic + "' msg.payload = '" + msg.payload + "' in " + helper.formatMsToStatus(delay_ms, "at") });
+            node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + "Forward " + getMessageStatusText(msg) + " in " + helper.formatMsToStatus(delay_ms, "at") });
             timeout = setTimeout(() =>
             {
                 timeout = null;
-                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended msg.topic = '" + msg.topic + "' msg.payload = '" + msg.payload + "'" });
+                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended " + getMessageStatusText(msg) });
                 node_settings.last_message = msg
 
                 if (config.save_state)
@@ -164,11 +164,25 @@ module.exports = function (RED)
             }, delay_ms);
         }
 
+        let getMessageStatusText = msg =>
+        {
+            let text = "";
+            if (msg.topic != null)
+                text += " topic = '" + msg.topic + "'";
+            if (msg.payload != null)
+                text += " payload = '" + msg.payload + "'";
+
+            if (text == "")
+                return "a message";
+
+            return text.trim();
+        }
+
         if (config.save_state && config.resend_on_start && node_settings.last_message != null)
         {
             setTimeout(() =>
             {
-                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended msg.topic = '" + node_settings.last_message.topic + "' msg.payload = '" + node_settings.last_message.payload + "'" });
+                node.status({ fill: "yellow", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + "Sended " + getMessageStatusText(node_settings.last_message) });
                 node.send(node_settings.last_message);
             }, 10000);
         }

package/heating-curve/heating-curve.html

@@ -223,7 +223,6 @@
             let first = true;
 
             let labels = [];
-            debugger;
 
             for (let out = 20; out >= -20; out -= 1)
             {

package/heating-curve/heating-curve.js

@@ -46,7 +46,7 @@ module.exports = function (RED)
                     let new_setpoint = parseFloat(msg.payload);
                     if (isNaN(new_setpoint) && !isFinite(new_setpoint))
                     {
-                        node.error("Invalid payload: " + msg.payload);
+                        // node.error("Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -58,7 +58,7 @@ module.exports = function (RED)
                     let new_temp = parseFloat(msg.payload);
                     if (isNaN(new_temp) && !isFinite(new_temp))
                     {
-                        node.error("Invalid payload: " + msg.payload);
+                        // node.error("Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -70,7 +70,7 @@ module.exports = function (RED)
                     let new_flow_min = parseFloat(msg.payload);
                     if (isNaN(new_flow_min) && !isFinite(new_flow_min))
                     {
-                        node.error("Invalid payload: " + msg.payload);
+                        // node.error("Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -82,7 +82,7 @@ module.exports = function (RED)
                     let new_flow_max = parseFloat(msg.payload);
                     if (isNaN(new_flow_max) && !isFinite(new_flow_max))
                     {
-                        node.error("Invalid payload: " + msg.payload);
+                        // node.error("Invalid payload: " + msg.payload);
                         return;
                     }
 

package/hysteresis/hysteresis.html

@@ -11,17 +11,22 @@
             out_higher_type: { value: 'json' },
             out_lower: { value: '{"topic": ""}' },
             out_lower_type: { value: 'json' },
+            send_only_change: { value: true },
+            outputs: { value: 1 },
             save_state: { value: true },
             resend_on_start: { value: true }
         },
         inputs: 1,
         outputs: 2,
-        outputLabels: ["Über", "Unter"],
         icon: "font-awesome/fa-arrows-v",
         label: function ()
         {
             return this.name || this.comparator || "Hysteresis";
         },
+        outputLabels: function (index)
+        {
+            return this.outputs == 1 ? "" : ["Höher", "Niedriger"][index];
+        },
         oneditprepare: function ()
         {
             $("#node-input-setpoint").typedInput({
@@ -34,28 +39,66 @@
                 types: ["num"]
             });
 
+
+
             $("#node-input-out_higher").typedInput({
                 type: "json",
-                types: ["json", {
-                    value: "null",
-                    label: "Originalnachricht",
-                    icon: "fa fa-times",
-                    hasValue: false,
-                }],
+                types: ["json",
+                    {
+                        value: "null",
+                        label: "Nichts senden",
+                        icon: "fa fa-times",
+                        hasValue: false,
+                    }, {
+                        value: "original",
+                        label: "Originalnachricht",
+                        icon: "fa fa-arrow-right",
+                        hasValue: false,
+                    }],
                 typeField: "#node-input-out_higher_type"
             });
 
             $("#node-input-out_lower").typedInput({
                 type: "json",
-                types: ["json", {
-                    value: "null",
-                    label: "Originalnachricht",
-                    icon: "fa fa-times",
-                    hasValue: false,
-                }],
+                types: ["json",
+                    {
+                        value: "null",
+                        label: "Nichts senden",
+                        icon: "fa fa-times",
+                        hasValue: false,
+                    }, {
+                        value: "original",
+                        label: "Originalnachricht",
+                        icon: "fa fa-arrow-right",
+                        hasValue: false,
+                    }],
                 typeField: "#node-input-out_lower_type"
             });
 
+            $("#node-input-send_only_change").typedInput({
+                type: "bool",
+                types: [{
+                    value: "1",
+                    options: [
+                        { value: "true", label: "Nur bei Änderung" },
+                        { value: "false", label: "Immer" },
+                    ]
+                }]
+            });
+
+            $("#node-input-outputs").typedInput({
+                type: "num",
+                types: [{
+                    value: "1",
+                    options: [
+                        { value: "1", label: "Gemeinsamer Ausgang" },
+                        { value: "2", label: "Separate Ausgänge" },
+                    ]
+                }]
+            });
+
+
+
             $("#node-input-save_state").on("change", ev =>
             {
                 if (ev.target.checked)
@@ -98,6 +141,20 @@
         <input type="text" id="node-input-out_lower" />
         <input type="hidden" id="node-input-out_lower_type">
     </div>
+    <div class="form-row">
+        <label for="node-input-send_only_change"><i class="fa fa-repeat"></i> Senden</label>
+        <input id="node-input-send_only_change" />
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputs"><i class="fa fa-hashtag"></i> Ausgänge</label>
+        <input id="node-input-outputs" />
+    </div>
+    <div class="form-row">
+        <div><strong>Hinweis:</strong></div>
+        <div><code>msg.payload</code> wird automatisch auf das Hystere-Ergebnis gesetzt,</div>
+        <div>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.</div>
+        <div><code>true</code>, wenn höher, <code>false</code> wenn niedriger.</div>
+    </div>
     <hr/>
     <h4 style="margin: 0.5rem 0;">Systemstart</h4>
     <div class="form-row">
@@ -139,10 +196,6 @@
                     <td><code>hysteresis</code></td>
                     <td>Überschreibt die Hysterese mit <code>msg.payload</code>.</td>
                 </tr>
-                <tr>
-                    <td><code>resend</code></td>
-                    <td>Sendet den aktuellen Zustand erneut.</td>
-                </tr>
             </tbody>
         </table>
     </p>