smart-nodes 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -80,3 +80,13 @@
 
     After saving the nodes, the values are automatically converted to the new one.
     This conversion will be removed in version 0.5.0.
+
+## Version 0.4.1:
+
+-   Show only up to 2 decimal places in node status text.
+-   Improved warn messages shown in console.
+
+## Version 0.4.2:
+
+-   Fixed design of property page of forwarder node.
+-   Corrected hysteresis to send original message.

package/central/central.js

@@ -50,7 +50,7 @@ module.exports = function (RED)
         {
             if (typeof msg.source == "undefined" || typeof msg.state == "undefined")
             {
-                console.warn("Unknown message received in smart_node central.", msg);
+                helper.warn(this, "Unknown message received in smart_node central.", msg);
                 return;
             }
 

package/compare/compare.js

@@ -85,7 +85,7 @@ module.exports = function (RED)
             let real_topic_number = helper.getTopicNumber(msg.topic);
             if (real_topic_number == null || real_topic_number < 1 || real_topic_number > 2)    
             {
-                console.warn("Topic has to be 1 or 2, sended: " + msg.topic);
+                helper.warn(this, "Topic has to be 1 or 2, sended: " + msg.topic);
                 return;
             }
 
@@ -93,7 +93,7 @@ module.exports = function (RED)
             let num = parseFloat(msg.payload);
             if (Number.isNaN(num))
             {
-                console.warn("Payload has to be numeric: " + msg.payload);
+                helper.warn(this, "Payload has to be numeric: " + msg.payload);
                 return;
             }
 

package/forwarder/forwarder.html

@@ -46,15 +46,15 @@
     </div>
     <div class="form-row">
         <input type="checkbox" id="node-input-forward_last_on_enable" style="width: 20px;" />
-        <label for="node-input-forward_last_on_enable" data-i18n="forwarder.ui.forward_last_on_enable"></label>
+        <label for="node-input-forward_last_on_enable" style="width: calc(100% - 30px);" data-i18n="forwarder.ui.forward_last_on_enable"></label>
     </div>
     <div class="form-row">
         <input type="checkbox" id="node-input-always_forward_true" style="width: 20px;" />
-        <label for="node-input-always_forward_true" data-i18n="[html]forwarder.ui.always_forward_true"></label>
+        <label for="node-input-always_forward_true" style="width: calc(100% - 30px);" data-i18n="[html]forwarder.ui.always_forward_true"></label>
     </div>
     <div class="form-row">
         <input type="checkbox" id="node-input-always_forward_false" style="width: 20px;" />
-        <label for="node-input-always_forward_false" data-i18n="[html]forwarder.ui.always_forward_false"></label>
+        <label for="node-input-always_forward_false" style="width: calc(100% - 30px);" data-i18n="[html]forwarder.ui.always_forward_false"></label>
     </div>
     <hr/>
     <h4 style="margin: 0.5rem 0;" data-i18n="forwarder.ui.system_start"></h4>

package/heating-curve/heating-curve.js

@@ -75,7 +75,7 @@ module.exports = function (RED)
                     let new_setpoint = parseFloat(msg.payload);
                     if (isNaN(new_setpoint) && !isFinite(new_setpoint))
                     {
-                        console.warn("Invalid payload: " + msg.payload);
+                        // helper.warn(this, "Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -86,7 +86,7 @@ module.exports = function (RED)
                     let new_temp = parseFloat(msg.payload);
                     if (isNaN(new_temp) && !isFinite(new_temp))
                     {
-                        console.warn("Invalid payload: " + msg.payload);
+                        // helper.warn(this, "Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -97,7 +97,7 @@ module.exports = function (RED)
                     let new_flow_min = parseFloat(msg.payload);
                     if (isNaN(new_flow_min) && !isFinite(new_flow_min))
                     {
-                        console.warn("Invalid payload: " + msg.payload);
+                        // helper.warn(this, "Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -108,7 +108,7 @@ module.exports = function (RED)
                     let new_flow_max = parseFloat(msg.payload);
                     if (isNaN(new_flow_max) && !isFinite(new_flow_max))
                     {
-                        console.warn("Invalid payload: " + msg.payload);
+                        // helper.warn(this, "Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -146,7 +146,7 @@ module.exports = function (RED)
 
         let setStatus = () =>
         {
-            node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Out: " + node_settings.temperature_outside.toFixed(1) + "°C, Flow: " + node_settings.last_flow_temperature?.toFixed(1) + "°C" });
+            node.status({ fill: "green", shape: "dot", text: helper.getCurrentTimeForStatus() + ": Out: " + node_settings.temperature_outside?.toFixed(1) + "°C, Flow: " + node_settings.last_flow_temperature?.toFixed(1) + "°C" });
         }
 
         if (node_settings.last_flow_temperature !== null)

package/hysteresis/hysteresis.js

@@ -54,7 +54,6 @@ module.exports = function (RED)
         else
         {
             // delete old saved values
-            node.status({});
             smart_context.del(node.id);
         }
 
@@ -103,7 +102,7 @@ module.exports = function (RED)
 
             if (isNaN(value))
             {
-                console.warn("Invalid payload: " + msg.payload);
+                // helper.warn(this, "Invalid payload: " + msg.payload);
                 return;
             }
 
@@ -176,12 +175,12 @@ module.exports = function (RED)
             if (node_settings.last_result == null)
                 node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": ❓ S: " + node_settings.setpoint + " - H: " + node_settings.hysteresis + " - V: null" });
             else
-                node.status({ fill: node_settings.last_result ? "green" : "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.last_result ? "⬆️" : "⬇️") + " S: " + node_settings.setpoint + " - H: " + node_settings.hysteresis + " - V: " + node_settings.last_value.toFixed(2) });
+                node.status({ fill: node_settings.last_result ? "green" : "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.last_result ? "⬆️" : "⬇️") + " S: " + node_settings.setpoint + " - H: " + node_settings.hysteresis + " - V: " + node_settings.last_value?.toFixed(2) });
         }
 
         let createMessage = (out_msg, out_type, msg, value) =>
         {
-            return helper.cloneObject(out_type == "ORIGINAL" ? msg : out_msg, {
+            return helper.cloneObject(out_type == "NOTHING" ? msg : out_msg, {
                 smart_info: {
                     last_result: node_settings.last_result,
                     hysteresis: node_settings.hysteresis,

package/light/light.js

@@ -287,7 +287,7 @@ module.exports = function (RED)
 
             if (isNaN(timeMs))
             {
-                console.warn("Invalid time_on value send: " + origTimeMs);
+                helper.warn(this, "Invalid time_on value send: " + origTimeMs);
                 timeMs = max_time_on;
             }
 

package/mixing-valve/mixing-valve.js

@@ -124,7 +124,7 @@ module.exports = function (RED)
                     let new_setpoint = parseFloat(msg.payload);
                     if (isNaN(new_setpoint) && !isFinite(new_setpoint))
                     {
-                        console.warn("Invalid payload: " + msg.payload);
+                        // helper.warn(this, "Invalid payload: " + msg.payload);
                         return;
                     }
 
@@ -144,7 +144,7 @@ module.exports = function (RED)
                             break;
 
                         default:
-                            console.warn("Invalid off_mode: " + msg.payload);
+                            helper.warn(this, "Invalid off_mode: " + msg.payload);
                             return;
                     }
                     break;
@@ -159,7 +159,7 @@ module.exports = function (RED)
                             break;
 
                         default:
-                            console.warn("Invalid valve_mode: " + msg.payload);
+                            helper.warn(this, "Invalid valve_mode: " + msg.payload);
                             return;
                     }
 
@@ -170,7 +170,7 @@ module.exports = function (RED)
                     let new_temp = parseFloat(msg.payload);
                     if (isNaN(new_temp) && !isFinite(new_temp))
                     {
-                        console.warn("Invalid payload for current_temperature: " + msg.payload);
+                        // helper.warn(this, "Invalid payload for current_temperature: " + msg.payload);
                         return;
                     }
                     current_temperature = new_temp;
@@ -181,7 +181,7 @@ module.exports = function (RED)
                     break;
 
                 default:
-                    console.warn("Invalid topic: " + real_topic);
+                    helper.warn(this, "Invalid topic: " + real_topic);
                     return;
             }
         }

package/package.json

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

package/shutter/shutter.js

@@ -206,7 +206,7 @@ module.exports = function (RED)
             let timeMs = helper.getTimeInMsFromString(msg.time_on);
             if (isNaN(timeMs) || timeMs <= 0)
             {
-                console.warn("Invalid msg.time_on value was sent.", msg);
+                helper.warn(this, "Invalid msg.time_on value was sent.", msg);
                 return;
             }
 

package/shutter-complex/shutter-complex.js

@@ -354,7 +354,7 @@ module.exports = function (RED)
                     // data is the position in percent
                     if (data == null)
                     {
-                        console.warn("WARN: Try to set position without giving a new position");
+                        helper.warn(this, "Try to set position without giving a new position");
                         return;
                     }
 

package/smart_helper.js

@@ -348,5 +348,14 @@ module.exports = {
     {
         // uncomment to see all log values
         // console.log(...arguments);
+    },
+
+    /**
+     * Forward all arguments to the console if it is enabled
+     */
+    warn(node, ...args)
+    {
+        // uncomment to see all warn values
+        console.warn(typeof node + " (" + node.id + "):", ...args);
     }
 };

package/statistic/statistic.html

@@ -64,7 +64,7 @@
             $("#node-input-out_message").typedInput({
                 type: "json",
                 types: ["json", {
-                    value: "DEFAULT",
+                    value: "NOTHING",
                     label: node._("statistic.ui.default"),
                     icon: "fa fa-times",
                     hasValue: false,
@@ -83,10 +83,10 @@
 
 
             // Backward compatibility
-            if (this.out_message_type == "null")
+            if (this.out_message_type == "null" || this.out_message_type == "DEFAULT")
             {
-                this.out_message_type = "DEFAULT";
-                $("#node-input-out_message_type").val("DEFAULT");
+                this.out_message_type = "NOTHING";
+                $("#node-input-out_message_type").val("NOTHING");
             }
 
         }

package/statistic/statistic.js

@@ -73,7 +73,7 @@ module.exports = function (RED)
         {
             if (isNaN(parseFloat(msg.payload)))
             {
-                console.warn("Invalid payload: " + msg.payload);
+                // helper.warn(this, "Invalid payload: " + msg.payload);
                 return;
             }
 
@@ -214,7 +214,7 @@ module.exports = function (RED)
             if (operation === "ABS")
                 node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + operation + " => " + msg.payload });
             else
-                node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + operation + "(" + Object.entries(node_settings.values).map(v => v[1]).join(", ") + ") => " + msg.payload });
+                node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + operation + "(" + Object.entries(node_settings.values).map(v => v[1]).join(", ") + ") => " + msg.payload?.toFixed(2) });
         }
 
         if (config.save_state && config.resend_on_start && node_settings.last_message != null)