smart-nodes 0.3.26 → 0.3.28

package/hysteresis/hysteresis.js

@@ -10,8 +10,10 @@ module.exports = function (RED)
         const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
+        // persistant values
         var node_settings = {
-            active: null,
+            last_value: null,
+            last_result: null,
             last_message: null,
             setpoint: parseFloat(config.setpoint),
             hysteresis: parseFloat(config.hysteresis)
@@ -22,7 +24,7 @@ module.exports = function (RED)
             // load old saved values
             node_settings = Object.assign(node_settings, smart_context.get(node.id));
 
-            switch (node_settings.active)
+            switch (node_settings.last_result)
             {
                 case true:
                     node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Load last state: Higher" });
@@ -47,6 +49,8 @@ module.exports = function (RED)
         // dynamic config
         let out_higher = helper.evaluateNodeProperty(RED, config.out_higher, config.out_higher_type);
         let out_lower = helper.evaluateNodeProperty(RED, config.out_lower, config.out_lower_type);
+        let send_only_change = helper.evaluateNodeProperty(RED, config.send_only_change, "bool");
+        let outputs = helper.evaluateNodeProperty(RED, config.outputs, "num");
 
         // runtime values
 
@@ -55,7 +59,7 @@ module.exports = function (RED)
             let value = parseFloat(msg.payload);
             let real_topic = helper.getTopicName(msg.topic);
 
-            if (isNaN(value) && real_topic !== "resend")
+            if (isNaN(value))
             {
                 // node.error("Invalid payload: " + msg.payload);
                 return;
@@ -65,7 +69,7 @@ module.exports = function (RED)
             {
                 case "setpoint":
                     node_settings.setpoint = value;
-                    node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New setpoint: " + value + "" });
+                    node.status({ fill: node_settings.last_result ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New setpoint: " + value + "" });
 
                     if (config.save_state)
                         smart_context.set(node.id, node_settings);
@@ -73,56 +77,47 @@ module.exports = function (RED)
 
                 case "hysteresis":
                     node_settings.hysteresis = value;
-                    node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New hysteresis: " + value + "" });
+                    node.status({ fill: node_settings.last_result ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": New hysteresis: " + value + "" });
 
                     if (config.save_state)
                         smart_context.set(node.id, node_settings);
                     break;
 
-                case "resend":
-                    if (node_settings.active === true && node_settings.last_message != null)
-                    {
-                        node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Resend higher value" });
-                        node.send([node_settings.last_message, null]);
-                    }
-                    else if (node_settings.active === false && node_settings.last_message != null)
-                    {
-                        node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Resend lower value" });
-                        node.send([null, node_settings.last_message]);
-                    }
+                default:
+                    let result = getResult(value);
+                    let out_msg = null;
+
+                    // Get custom output message
+                    if (result)
+                        out_msg = createMessage(out_higher, config.out_higher_type, msg, value);
                     else
-                    {
-                        node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No resend, state is unknown" });
-                    }
-                    break;
+                        out_msg = createMessage(out_lower, config.out_lower_type, msg, value);
 
-                default:
-                    if (value >= node_settings.setpoint + node_settings.hysteresis && node_settings.active !== true)
+                    // Overwrite automatic values, if not already defined
+                    if (typeof out_msg.payload === "undefined")
+                        out_msg.payload = result ?? node_settings.last_result;
+
+                    // Separate outputs if needed
+                    if (outputs == 2)
                     {
-                        node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned higher by value " + value + "" });
-                        node_settings.active = true;
-                        node_settings.last_message = createMessage(out_higher ?? msg, value);
+                        if (result)
+                            out_msg = [out_msg, null];
+                        else
+                            out_msg = [null, out_msg];
+                    }
 
-                        if (config.save_state)
-                            smart_context.set(node.id, node_settings);
+                    // Send only if needed
+                    if (send_only_change == false || node_settings.last_result != result)
+                        node.send(out_msg);
 
-                        node.send([node_settings.last_message, null]);
-                    }
-                    else if (value <= node_settings.setpoint - node_settings.hysteresis && node_settings.active !== false)
-                    {
-                        node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned lower by value " + value + "" });
-                        node_settings.active = false;
-                        node_settings.last_message = createMessage(out_lower ?? msg, value);
+                    node_settings.last_value = value;
+                    node_settings.last_result = result;
+                    node_settings.last_message = out_msg;
 
-                        if (config.save_state)
-                            smart_context.set(node.id, node_settings);
+                    setStatus();
 
-                        node.send([null, node_settings.last_message]);
-                    }
-                    else
-                    {
-                        node.status({ fill: node_settings.active ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No change by value " + value + "" });
-                    }
+                    if (config.save_state)
+                        smart_context.set(node.id, node_settings);
                     break;
             }
         });
@@ -131,23 +126,45 @@ module.exports = function (RED)
         {
         });
 
-        let createMessage = (msg, value) =>
+        let getResult = value =>
+        {
+            if (value >= node_settings.setpoint + node_settings.hysteresis && node_settings.last_result !== true)
+                return true;
+
+            if (value <= node_settings.setpoint - node_settings.hysteresis && node_settings.last_result !== false)
+                return false;
+
+            return null;
+        }
+
+        let setStatus = () =>
+        {
+            if (node_settings.last_result === true)
+                node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned higher by value " + node_settings.last_value + "" });
+            else if (node_settings.last_result === false)
+                node.status({ fill: "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Turned lower by value " + node_settings.last_value + "" });
+            else
+                node.status({ fill: node_settings.last_result ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": No change by value " + node_settings.last_value + "" });
+        }
+
+        let createMessage = (out_msg, out_type, msg, value) =>
         {
-            return Object.assign({}, msg, {
+            return Object.assign({}, out_type == "original" ? msg : out_msg, {
                 smart_info: {
-                    active: node_settings.active,
+                    last_result: node_settings.last_result,
                     hysteresis: node_settings.hysteresis,
                     setpoint: node_settings.setpoint,
-                    last_value: value
+                    last_value: node_settings.last_value,
+                    value: value
                 }
             })
         };
 
-        if (config.save_state && config.resend_on_start && node_settings.active != null && node_settings.last_message != null)
+        if (config.save_state && config.resend_on_start && node_settings.last_result != null && node_settings.last_message != null)
         {
             setTimeout(() =>
             {
-                if (node_settings.active)
+                if (node_settings.last_result)
                     node.send([node_settings.last_message, null]);
                 else
                     node.send([null, node_settings.last_message]);

package/logic/logic.html

@@ -13,6 +13,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 }
         },
@@ -23,6 +25,10 @@
         {
             return this.name || this.logic || "Binary Logic";
         },
+        outputLabels: function (index)
+        {
+            return this.outputs == 1 ? "" : ["Wahr", "Falsch"][index];
+        },
         oneditprepare: function ()
         {
             $("#node-input-logic").typedInput({
@@ -88,6 +94,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)
@@ -159,7 +189,17 @@
         <input type="hidden" id="node-input-out_false_type">
     </div>
     <div class="form-row">
-        <span><strong>Hinweis:</strong> <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt.</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">
+        <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 Logik-Ergebnis gesetzt,</div>
+        <div>sofern es nicht bereits hier in der Konfiguration gesetzt wurde.</div>
     </div>
     <hr/>
     <h4 style="margin: 0.5rem 0;">Systemstart</h4>
@@ -181,4 +221,7 @@
         <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/>
         Diese Node verwendet nur den Teil <code>nummer</code>. <code>name</code> und <code>#</code> sind dabei optional.
     </p>
+    <p>
+        <strong>Hinweis:</strong> <code>msg.payload</code> wird automatisch auf das Logik-Ergebnis gesetzt, sofern es nicht bereits in der Konfiguration gesetzt wurde.
+    </p>
 </script>

package/logic/logic.js

@@ -10,19 +10,10 @@ module.exports = function (RED)
         const smart_context = require("../persistence.js")(RED);
         const helper = require("../smart_helper.js");
 
-        // dynamic config
-        let logic = config.logic;
-        let out_true = helper.evaluateNodeProperty(RED, config.out_true, config.out_true_type || "json");
-        let out_false = helper.evaluateNodeProperty(RED, config.out_false, config.out_false_type || "json");
-        let logic_inputs = config.logic_inputs;
-        let inverts = config.inverts.split(",").map(n => parseInt(n));
-        let invert_output = config.invert_output;
-
-        // runtime values
-
-
+        // persistant values
         var node_settings = {
-            input_states: Array.from({ length: logic_inputs }).fill(false),
+            input_states: Array.from({ length: config.logic_inputs }).fill(false),
+            last_result: null,
             last_message: null,
         };
 
@@ -37,6 +28,18 @@ module.exports = function (RED)
             smart_context.del(node.id);
         }
 
+        // dynamic config
+        let logic = config.logic;
+        let out_true = helper.evaluateNodeProperty(RED, config.out_true, config.out_true_type || "json");
+        let out_false = helper.evaluateNodeProperty(RED, config.out_false, config.out_false_type || "json");
+        let logic_inputs = config.logic_inputs;
+        let inverts = config.inverts.split(",").map(n => parseInt(n));
+        let invert_output = config.invert_output;
+        let send_only_change = helper.evaluateNodeProperty(RED, config.send_only_change, "bool");
+        let outputs = helper.evaluateNodeProperty(RED, config.outputs, "num");
+
+        // runtime values
+
         node.on("input", function (msg)
         {
             if (typeof msg.topic === "undefined")
@@ -57,26 +60,45 @@ module.exports = function (RED)
             else
                 node_settings.input_states[input - 1] = !!msg.payload; // !! => Convert to boolean
 
-            setStatus();
             let result = getResult();
+            let out_msg = null;
+
+            setStatus();
 
+            // Get custom output message
             if (invert_output ? !result : result)
             {
-                result = out_true;
-                if (result !== null)
-                    result.payload = true;
+                if (out_true !== null)
+                    out_msg = Object.assign({}, out_true);
             }
             else
             {
-                result = out_false;
-                if (result !== null)
-                    result.payload = false;
+                if (out_false !== null)
+                    out_msg = Object.assign({}, out_false);
             }
 
-            if (result !== null && node_settings.last_message?.payload != result.payload)
-                node.send(result);
+            if (out_msg !== null)
+            {
+                // Overwrite automatic values, if not already defined
+                if (typeof out_msg.payload === "undefined")
+                    out_msg.payload = result;
+
+                // 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 = result;
+            node_settings.last_result = result;
+            node_settings.last_message = out_msg;
 
             if (config.save_state)
                 smart_context.set(node.id, node_settings);

package/mixing-valve/mixing-valve.html

@@ -15,7 +15,7 @@
         inputs: 1,
         outputs: 3,
         outputLabels: ["Open", "Close", "Status Position"],
-        icon: "font-awesome/fa-arrows-h",
+        icon: "mixing-valve.png",
         label: function ()
         {
             return this.name || "Mixing Valve";

package/mixing-valve/mixing-valve.js

@@ -93,7 +93,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;
                     }
                     node_settings.setpoint = new_setpoint;
@@ -136,7 +136,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;
                     }
                     current_temperature = new_temp;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-nodes",
-    "version": "0.3.26",
+    "version": "0.3.28",
     "description": "Smart Nodes",
     "keywords": [
         "node-red",

package/shutter-complex-control/shutter-complex-control.html

@@ -140,6 +140,8 @@
                 name: { value: "" },
                 exec_text_names: { value: "" },
                 max_time: { value: 60 },
+                max_time_up: { value: 60 },
+                max_time_down: { value: 60 },
                 revert_time_ms: { value: 100 },
                 alarm_action: { value: 'NOTHING' }, // NOTHING | UP | DOWN
                 links: { value: [], type: "smart_central-control[]" }
@@ -159,7 +161,7 @@
                 onEditPrepare(this, ["smart_central-control"]);
                 initTreeList(node, ["smart_central-control"]);
 
-                $("#node-input-max_time").spinner({
+                $("#node-input-max_time_up").spinner({
                     min: 1,
                     change: function (event, ui)
                     {
@@ -171,6 +173,28 @@
                             $(this).spinner("value", value);
                     }
                 });
+                $("#node-input-max_time_down").spinner({
+                    min: 1,
+                    change: function (event, ui)
+                    {
+                        var value = parseInt(this.value);
+                        value = isNaN(value) ? 0 : value;
+                        value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                        // value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
+                        if (value !== this.value)
+                            $(this).spinner("value", value);
+                    }
+                });
+
+                // Backward compatibility
+                if (typeof node.max_time !== "undefined")
+                {
+                    node.max_time_down = node.max_time;
+                    node.max_time_up = node.max_time;
+                    $("#node-input-max_time_down").val(node.max_time);
+                    $("#node-input-max_time_up").val(node.max_time);
+                    delete node.max_time;
+                }
 
                 $("#node-input-revert_time_ms").spinner({
                     min: 1,
@@ -218,8 +242,12 @@
         <div style="max-width: 450px;">Diese Node kann über die eingegebenen Wörter gesteuert werden. Mehrere Wörter werden durch ein Komma getrennt.</div>
     </div>
     <div class="form-row">
-        <label for="node-input-max_time"><i class="fa fa-clock-o"></i> Zeit [s]</label>
-        <input id="node-input-max_time" placeholder="Zeit für eine komplette Fahrt [s]" />
+        <label for="node-input-max_time_up"><i class="fa fa-clock-o"></i> Zeit auf [s]</label>
+        <input id="node-input-max_time_up" placeholder="Zeit für eine komplette Fahrt nach oben [s]" />
+    </div>
+    <div class="form-row">
+        <label for="node-input-max_time_down"><i class="fa fa-clock-o"></i> Zeit ab [s]</label>
+        <input id="node-input-max_time_down" placeholder="Zeit für eine komplette Fahrt nach unten [s]" />
     </div>
     <div class="form-row">
         <label for="node-input-revert_time_ms"><i class="fa fa-clock-o"></i> Pause Wechsel [ms]</label>
@@ -312,8 +340,8 @@
         </table>
     </p>
     <p>
-        Diese Node verwaltet keine Laufzeit für den Rollladen selbst. Diese muss über ETS für den Ausgang konfiguriert werden.
-        Es ist jedoch möglich, den Rollladen nach einer definierten Zeit automatisch abzuschalten.
+        Diese Node verwaltet die Laufzeit für den Rollladen selbst.
+        Es ist aber auch möglich, den Rollladen nach einer definierten Zeit automatisch abschalten zu lassen.
         Beispiel: <code>msg = { "topic": "up", "time_on": 5000 }</code> oder <code>msg = { "topic": "up", "time_on": "5s" }</code><br/>
         Diese Nachricht lässt den Rollladen für 5000 Millisekunden / 5 Sekunden nach oben fahren. Sollte es sich um eine Jalousie halten, werden die Lamellen entsprechend gedreht.
         Als Einheit für die Zeit können folgende Werte verwendet werden:
@@ -344,6 +372,11 @@
             </tbody>
         </table>
     </p>
+    <p>
+        Um mögliche Positionsabweichungen zu korrigieren läuft der Rollladen immer für mindestens 5 Sekunden, wenn nichts anderes in <code>msg.on_time</code> eingestellt wurde.
+        Dadurch kann der Rollladen auch noch weiter hochgefahren werden, falls er im System als offen erkannt wird, er aber in Wirklichkeit noch nicht ganz oben sein sollte.<br>
+        Manchmal kann es aber auch erwünscht sein, dass ein Rollladen bei 0 oder 100 % nicht nochmals startet. Dafür muss dann <code>msg.exact = true</code> gesetzt werden.
+    </p>
     <p>
         Die Angabe einer Zeit funktioniert nicht mit dem topic <b>position</b>.
     </p>