smart-nodes 0.5.1 → 0.5.2

package/CHANGELOG.md

@@ -213,4 +213,8 @@
 
 ## 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".
+-   To be more compatible, topic "set" is also possible instead of "set_state". Same for "set_inverted" instead of "set_state_inverted".
+
+## Version 0.5.2:
+
+-   Added alarm mode to mixing-valve.

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

@@ -63,6 +63,12 @@
                     <td><code>current_temperature</code></td>
                     <td>Setzt die aktuelle Temperatur auf <code>msg.payload</code> °C.</td>
                 </tr>
+                <tr>
+                    <td><code>alarm</code></td>
+                    <td>
+                        Setzt den aktuellen Alarmzustand auf den Wert von <code>msg.payload</code> und löst die konfigurierte Alarmaktion aus (Öffnen / Schließen).
+                    </td>
+                </tr>
                 <tr>
                     <td><code>calibrate</code></td>
                     <td>Erzwingt eine Kalibrierungsfahrt.</td>

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

@@ -15,6 +15,8 @@
 
             "nothing": "Nichts",
             "open": "Öffnen (100%)",
+            "alarm_on": "Alarm Ein",
+            "no_action": "Keine Aktion",
             "close": "Schließen (0%)",
             "heating": "Heizen (normal)",
             "cooling": "Kühlen (invertiert)",

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

@@ -63,6 +63,12 @@
                     <td><code>current_temperature</code></td>
                     <td>Sets the current temperature to <code>msg.payload</code> °C.</td>
                 </tr>
+                <tr>
+                    <td><code>alarm</code></td>
+                    <td>
+                        Sets the current alarm state to the value of <code>msg.payload</code> and triggers the configured alarm action (Open / Close).
+                    </td>
+                </tr>
                 <tr>
                     <td><code>calibrate</code></td>
                     <td>Forces a calibration run.</td>

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

@@ -15,6 +15,8 @@
 
             "nothing": "Nothing",
             "open": "Open (100%)",
+            "alarm_on": "Alarm on",
+            "no_action": "No action",
             "close": "Close (0%)",
             "heating": "Heating (normal)",
             "cooling": "Cooling (inverted)",

package/mixing-valve/mixing-valve.html

@@ -150,7 +150,8 @@
                 max_change_percent: { value: 1 },
                 max_change_temp_difference: { value: 20 },
                 min_change_time: { value: 100 },
-                links: { value: [], type: "smart_central-control[]" }
+                links: { value: [], type: "smart_central-control[]" },
+                alarm_action: { value: "NOTHING" }, // NOTHING | OPEN | CLOSE
             },
             inputs: 1,
             outputs: 1,
@@ -266,7 +267,20 @@
                             ],
                         }],
                     });
-
+                
+                $("#node-input-alarm_action")
+                    .css("max-width", "70%")
+                    .typedInput({
+                        types: [{
+                            value: "alarm_action",
+                            default: "NOTHING",
+                            options: [
+                                { value: "NOTHING", label: node._("mixing-valve.ui.no_action") },
+                                { value: "OPEN", label: node._("mixing-valve.ui.open") },
+                                { value: "CLOSE", label: node._("mixing-valve.ui.close") }
+                            ],
+                        }],
+                    });
 
                 $("#node-input-precision")
                     .css("max-width", "4rem")
@@ -372,6 +386,10 @@
         <label for="node-input-valve_mode"><i class="fa fa-fire"></i> <span data-i18n="mixing-valve.ui.mode"></span></label>
         <input id="node-input-valve_mode" />
     </div>
+    <div class="form-row">
+        <label for="node-input-alarm_action"><i class="fa fa-exclamation-triangle"></i> <span data-i18n="mixing-valve.ui.alarm_on"></span></label>
+        <input id="node-input-alarm_action"/>
+    </div>
     <div class="form-row">
         <label for="node-input-precision" style="width: 250px;"><i class="fa fa-sliders"></i> <span data-i18n="mixing-valve.ui.precision"></span></label>
         <input id="node-input-precision" value="1.0" /> °C

package/mixing-valve/mixing-valve.js

@@ -33,11 +33,9 @@ module.exports = function (RED)
             setpoint: config.setpoint,
             off_mode: config.off_mode,
             valve_mode: config.valve_mode,
-            precision: config.precision || 1,
-            max_change_percent: config.max_change_percent || 2,
-            max_change_temp_difference: config.max_change_temp_difference || 20,
-            min_change_time: config.min_change_time || 0,
             last_position: null,
+            last_enabled_sended: null,
+            alarm_active: false
         }, smart_context.get(node.id));
 
         // Ensure correct types
@@ -45,10 +43,13 @@ module.exports = function (RED)
         node_settings.setpoint = parseFloat(node_settings.setpoint);
         if (isNaN(node_settings.setpoint) || !isFinite(node_settings.setpoint))
             node_settings.setpoint = 20;
-        node_settings.precision = parseInt(node_settings.precision, 10);
-        node_settings.max_change_percent = parseInt(node_settings.max_change_percent, 10);
-        node_settings.max_change_temp_difference = parseInt(node_settings.max_change_temp_difference, 10);
-        node_settings.min_change_time = parseInt(node_settings.min_change_time, 10);
+
+        // Remove old settings
+        delete node_settings.precision;
+        delete node_settings.max_change_percent;
+        delete node_settings.max_change_temp_difference;
+        delete node_settings.min_change_time;
+
 
         // ##################
         // # Dynamic config #
@@ -57,11 +58,17 @@ module.exports = function (RED)
         let time_sampling_s = config.time_sampling;
         let output_mode = config.output_mode || OUTPUT_MODE_OPEN_CLOSE;
         let force_position = null;
+        let alarm_action = config.alarm_action || "NOTHING"; // NOTHING | OPEN | CLOSE
         let min_temperature = null;
         let min_temperature_position = null;
         let max_temperature = null;
         let max_temperature_position = null;
         let temp_save_date = Date.now();
+        let precision = parseInt(config.precision || 1, 10);
+        let max_change_percent = parseInt(config.max_change_percent || 2, 10);
+        let max_change_temp_difference = parseInt(config.max_change_temp_difference || 20, 10);
+        let min_change_time = parseInt(config.min_change_time || 0, 10);
+
 
         // ##################
         // # Runtime values #
@@ -171,6 +178,10 @@ module.exports = function (RED)
                         heating_mode: node_settings.valve_mode,
                         current_temperature,
                         output_mode,
+                        precision,
+                        max_change_percent,
+                        max_change_temp_difference,
+                        min_change_time,
                         min_temperature,
                         min_temperature_position,
                         max_temperature,
@@ -187,6 +198,11 @@ module.exports = function (RED)
                     }
 
                     node_settings.enabled = true;
+
+                    // If in alarm mode, just save enabled state, but don't start changing
+                    if (node_settings.alarm_active)
+                        return;
+
                     stopChanging();
 
                     // Set the most probable position
@@ -233,6 +249,10 @@ module.exports = function (RED)
 
                     node_settings.enabled = false;
 
+                    // If in alarm mode, just save enabled state, but don't start changing
+                    if (node_settings.alarm_active)
+                        return;
+
                     stopSampling();
                     doOffMode();
                     break;
@@ -307,6 +327,45 @@ module.exports = function (RED)
                     calibrate();
                     break;
 
+                case "alarm":
+                    // Make sure it is bool
+                    msg.payload = !!msg.payload;
+
+                    // No alarm change -> nothing to do
+                    if (node_settings.alarm_active == msg.payload)
+                        break;
+
+                    node_settings.alarm_active = msg.payload;
+                    if (node_settings.alarm_active)
+                    {
+                        switch (alarm_action)
+                        {
+                            case "OPEN":
+                                force_position = 100;;
+                                break;
+
+                            case "CLOSE":
+                                force_position = 0;
+                                break;
+
+                            default:
+                            case "NOTHING":
+                                // Don't use alarm mode
+                                node_settings.alarm_active = false;
+                                return;
+                        }
+                    }
+                    else
+                    {
+                        force_position = null;
+                        if (!node_settings.enabled)
+                            doOffMode();
+                    }
+
+                    stopSampling();
+                    startSampling();
+                    break;
+
                 default:
                     helper.warn(this, "Invalid topic: " + real_topic);
                     return;
@@ -317,7 +376,7 @@ module.exports = function (RED)
 
         let startSampling = () =>
         {
-            if (!node_settings.enabled)
+            if (!node_settings.enabled && !node_settings.alarm_active)
             {
                 helper.log(node, "Node is disabled, cannot start sampling");
                 return;
@@ -349,7 +408,7 @@ module.exports = function (RED)
                         helper.log(node, "Force position to " + force_position.toFixed(1) + "%");
 
                         // Under precision % difference => do nothing
-                        if (Math.abs(node_settings.last_position - force_position) <= node_settings.precision)
+                        if (Math.abs(node_settings.last_position - force_position) <= precision)
                         {
                             helper.log(node, "No Force position needed");
                             force_position = null;
@@ -368,6 +427,7 @@ module.exports = function (RED)
                     case OUTPUT_MODE_PERCENTAGE:
                         // Output mode percentage
                         node_settings.last_position = force_position;
+                        force_position = null;
                         node.send({ payload: node_settings.last_position });
                         smart_context.set(node.id, node_settings);
                         setStatus();
@@ -411,20 +471,23 @@ module.exports = function (RED)
 
             // +/- 1°C => already good enough, do nothing
             let temp_diff = Math.abs(current_temperature - node_settings.setpoint);
-            if (temp_diff < node_settings.precision)
+            if (temp_diff < precision)
             {
-                // Found a good position for the current setpoint
-                // Update min/max temperature
-                if (min_temperature === null || current_temperature < min_temperature)
+                if (!node_settings.alarm_active)
                 {
-                    min_temperature = current_temperature;
-                    min_temperature_position = node_settings.last_position;
-                }
+                    // Found a good position for the current setpoint
+                    // Update min/max temperature
+                    if (min_temperature === null || current_temperature < min_temperature)
+                    {
+                        min_temperature = current_temperature;
+                        min_temperature_position = node_settings.last_position;
+                    }
 
-                if (max_temperature === null || current_temperature > max_temperature)
-                {
-                    max_temperature = current_temperature;
-                    max_temperature_position = node_settings.last_position;
+                    if (max_temperature === null || current_temperature > max_temperature)
+                    {
+                        max_temperature = current_temperature;
+                        max_temperature_position = node_settings.last_position;
+                    }
                 }
                 return;
             }
@@ -432,11 +495,11 @@ module.exports = function (RED)
             // 0 °C diff => 0% change
             // for max_change_temp_difference (default: 20 °C) diff => max_change_percent (default: 2%) change
             let change_percentage = helper.scale(
-                Math.min(temp_diff, node_settings.max_change_temp_difference),
+                Math.min(temp_diff, max_change_temp_difference),
                 0,
-                node_settings.max_change_temp_difference,
+                max_change_temp_difference,
                 0,
-                node_settings.max_change_percent
+                max_change_percent
             );
 
             // calculate direction
@@ -476,8 +539,8 @@ module.exports = function (RED)
             // Change time in ms
             let moving_time = (time_total_s * 1000 / 100) * change_percentage;
 
-            if (moving_time < node_settings.min_change_time)
-                moving_time = node_settings.min_change_time;
+            if (moving_time < min_change_time)
+                moving_time = min_change_time;
 
             // start moving
             startChanging(adjustAction, moving_time);
@@ -654,9 +717,9 @@ module.exports = function (RED)
             if (calibration_timeout !== null)
                 node.status({ fill: "yellow", shape: "ring", text: helper.getCurrentTimeForStatus() + ": In calibration" });
             else if (changing_timeout != null)
-                node.status({ fill: node_settings.enabled ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.valve_mode == "HEATING" ? "🔥" : "❄️") + "  " + (adjusting == ADJUST_OPEN ? "Opening" : "Closing") + ", Set: " + helper.toFixed(node_settings.setpoint, 1) + "°C, Cur: " + helper.toFixed(current_temperature, 1) + "°C, Pos: " + helper.toFixed(node_settings.last_position, 1) + "%" });
+                node.status({ fill: node_settings.enabled ? "green" : "red", shape: "ring", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.alarm_active ? "ALARM - " : "") + (node_settings.valve_mode == "HEATING" ? "🔥" : "❄️") + "  " + (adjusting == ADJUST_OPEN ? "Opening" : "Closing") + ", Set: " + helper.toFixed(node_settings.setpoint, 1) + "°C, Cur: " + helper.toFixed(current_temperature, 1) + "°C, Pos: " + helper.toFixed(node_settings.last_position, 1) + "%" });
             else
-                node.status({ fill: node_settings.enabled ? "green" : "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.valve_mode == "HEATING" ? "🔥" : "❄️") + " Set: " + helper.toFixed(node_settings.setpoint, 1) + "°C, Cur: " + helper.toFixed(current_temperature, 1) + "°C, Pos: " + helper.toFixed(node_settings.last_position, 1) + "%" });
+                node.status({ fill: node_settings.enabled ? "green" : "red", shape: "dot", text: helper.getCurrentTimeForStatus() + ": " + (node_settings.alarm_active ? "ALARM - " : "") + (node_settings.valve_mode == "HEATING" ? "🔥" : "❄️") + " Set: " + helper.toFixed(node_settings.setpoint, 1) + "°C, Cur: " + helper.toFixed(current_temperature, 1) + "°C, Pos: " + helper.toFixed(node_settings.last_position, 1) + "%" });
         }
 
         /**
@@ -688,10 +751,30 @@ module.exports = function (RED)
                 node_settings.last_position = 0;
             }
         }
+        else if (node_settings.alarm_active)
+        {
+            switch (alarm_action)
+            {
+                case "OPEN":
+                    force_position = 100;;
+                    break;
+
+                case "CLOSE":
+                    force_position = 0;
+                    break;
+
+                default:
+                case "NOTHING":
+                    // Don't use alarm mode
+                    node_settings.alarm_active = false;
+                    return;
+            }
+
+            startSampling();
+        }
         else if (node_settings.enabled)
         {
             startSampling();
-            node.send([null, null, { payload: helper.toFixed(node_settings.last_position, 1) }]);
         }
 
         setStatus();

package/package.json

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