smart-nodes 0.4.16-beta → 0.4.16

package/CHANGELOG.md

@@ -1,153 +1,146 @@
-# 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
-
-## Version 0.3.29:
-
--   Fixed that hysteresis sends only on change, when separate outputs are enabled.
--   Added a definable short up/down time for the shutter control.
--   Fixed calculation of the time from string.
-
-## Version 0.3.30:
-
--   Added counter example.
-
-## Version 0.3.31:
-
--   Fixed logic node - invert output option.
-
-## Version 0.3.32:
-
--   Fixed hysteresis node - always change result.
-
-## Version 0.3.33:
-
--   Fixed hysteresis node - init send.
-
-## Version 0.3.34:
-
--   Fixed hysteresis node - init send.
--   Fixed light node - status.
-
-## Version 0.3.35:
-
--   Fixed saving last message object as a clone of the original message, because it could be changed later.
-
-## Version 0.3.36:
-
--   Fixed mixing-valve - call of toFixed function.
-
-## Version 0.3.37:
-
--   Fixed using typedInput with node-red v4.
--   Started to add English translations.
-
-## Version 0.4.0:
-
--   Fully added English and German translations.
--   Light control: Added Alarm off action
--   Shutter complex control: Added Alarm off action
--   Restructured the complete code
--   Improved status texts
--   **breaking change** (soon): Changed some node internal values. Please open and save the following node types:
-
-    -   Central node
-    -   Compare node
-    -   Counter node
-    -   Hysteresis node
-    -   Shutter complex node
-    -   Statistic node
-
-    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.
-
-## Version 0.4.3:
-
--   Corrected hysteresis (again) to send original message.
-
-## Version 0.4.4:
-
--   Fixed the delay node to not restart the time if "only on change" option is enabled.
-
-## Version 0.4.5:
-
--   Fixed the status of hysteresis node.
-
-## Version 0.4.6:
-
--   Fixed the status of hysteresis node.
-
-## Version 0.4.7:
-
--   Added blink topic to light node.
-
-## Version 0.4.8:
-
--   Fixed reading values in heating-curve node.
-
-## Version 0.4.9:
-
--   Fixed reading config values for offset and slope in heating-curve node.
-
-## Version 0.4.10:
-
--   **breaking change** (soon): Added common and separate outputs to multi press node.
-    Please open node config and save it to make sure it will work in later versions.
--   Added common and separate outputs to long press node.
-
-## Version 0.4.11:
-
--   Fixed long press default outputs.
-
-## Version 0.4.12:
-
--   Fixed text exec node.
-
-## Version 0.4.13:
-
--   Fixed text exec node again.
-
-## Version 0.4.14:
-
--   Removed log outputs.
-
-## Version 0.5.0:
-
--   Added new option to define node output format.
-
-    -   Simple: Compatible with knx_ultimate nodes.
-    -   HomeAssistant: Outputs messages that can directly be sent to home assistant entities via action nodes.
-
-        **Important Action node settings:**
-
-        -   Disable option `Block input overrides`, so the smart nodes can control the actions and the sended data.
+# 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
+
+## Version 0.3.29:
+
+-   Fixed that hysteresis sends only on change, when separate outputs are enabled.
+-   Added a definable short up/down time for the shutter control.
+-   Fixed calculation of the time from string.
+
+## Version 0.3.30:
+
+-   Added counter example.
+
+## Version 0.3.31:
+
+-   Fixed logic node - invert output option.
+
+## Version 0.3.32:
+
+-   Fixed hysteresis node - always change result.
+
+## Version 0.3.33:
+
+-   Fixed hysteresis node - init send.
+
+## Version 0.3.34:
+
+-   Fixed hysteresis node - init send.
+-   Fixed light node - status.
+
+## Version 0.3.35:
+
+-   Fixed saving last message object as a clone of the original message, because it could be changed later.
+
+## Version 0.3.36:
+
+-   Fixed mixing-valve - call of toFixed function.
+
+## Version 0.3.37:
+
+-   Fixed using typedInput with node-red v4.
+-   Started to add English translations.
+
+## Version 0.4.0:
+
+-   Fully added English and German translations.
+-   Light control: Added Alarm off action
+-   Shutter complex control: Added Alarm off action
+-   Restructured the complete code
+-   Improved status texts
+-   **breaking change** (soon): Changed some node internal values. Please open and save the following node types:
+
+    -   Central node
+    -   Compare node
+    -   Counter node
+    -   Hysteresis node
+    -   Shutter complex node
+    -   Statistic node
+
+    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.
+
+## Version 0.4.3:
+
+-   Corrected hysteresis (again) to send original message.
+
+## Version 0.4.4:
+
+-   Fixed the delay node to not restart the time if "only on change" option is enabled.
+
+## Version 0.4.5:
+
+-   Fixed the status of hysteresis node.
+
+## Version 0.4.6:
+
+-   Fixed the status of hysteresis node.
+
+## Version 0.4.7:
+
+-   Added blink topic to light node.
+
+## Version 0.4.8:
+
+-   Fixed reading values in heating-curve node.
+
+## Version 0.4.9:
+
+-   Fixed reading config values for offset and slope in heating-curve node.
+
+## Version 0.4.10:
+
+-   **breaking change** (soon): Added common and separate outputs to multi press node.
+    Please open node config and save it to make sure it will work in later versions.
+-   Added common and separate outputs to long press node.
+
+## Version 0.4.11:
+
+-   Fixed long press default outputs.
+
+## Version 0.4.12:
+
+-   Fixed text exec node.
+
+## Version 0.4.13:
+
+-   Fixed text exec node again.
+
+## Version 0.4.14:
+
+-   Removed log outputs.
+
+## Version 0.4.15:
+
+-   Reverted some tests.

package/LICENSE.md

@@ -1,21 +1,21 @@
-# The MIT License (MIT)
-
-Copyright (c) 2024 BergenSoft
-
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in
-> all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# The MIT License (MIT)
+
+Copyright (c) 2024 BergenSoft
+
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 > THE SOFTWARE.

package/light/light.html

@@ -139,7 +139,6 @@
             defaults: {
                 name: { value: "" },
                 exec_text_names: { value: "" },
-                data_type: { value: "SIMPLE" }, // SIMPLE || HOMEASSISTANT
                 max_time_on: { value: "0" },
                 max_time_on_unit: { value: "s" },
                 alarm_action: { value: 'NOTHING' }, // NOTHING | ON | OFF
@@ -160,19 +159,6 @@
                 onEditPrepare(this, ["smart_central-control"]);
                 initTreeList(node, ["smart_central-control"]);
 
-                $("#node-input-data_type")
-                    .css("max-width", "70%")
-                    .typedInput({
-                        types: [{
-                            value: "data_type",
-                            default: "SIMPLE",
-                            options: [
-                                { value: "SIMPLE", label: node._("light.ui.simple") },
-                                { value: "HOMEASSISTANT", label: node._("light.ui.home_assistant") }
-                            ],
-                        }],
-                    });
-
                 $("#node-input-max_time_on")
                     .css("max-width", "4rem")
                     .spinner({
@@ -251,10 +237,6 @@
         <input id="node-input-exec_text_names" type="text" />
         <div style="max-width: 450px;" data-i18n="light.ui.controlled_by_words"></div>
     </div>
-    <div class="form-row">
-        <label for="node-input-data_type"><i class="fa fa-file-code-o"></i> <span data-i18n="light.ui.data_type"></span></label>
-        <input id="node-input-data_type"/>
-    </div>
     <div class="form-row">
         <label for="node-input-max_time_on"><i class="fa fa-clock-o"></i> <span data-i18n="light.ui.max_time_on"></span></label>
         <input id="node-input-max_time_on" value="0" />

package/light/light.js

@@ -45,7 +45,6 @@ module.exports = function (RED)
         let max_time_on = helper.getTimeInMs(config.max_time_on, config.max_time_on_unit);
         let alarm_action = config.alarm_action || "NOTHING";
         let alarm_off_action = config.alarm_off_action || "NOTHING";
-        let data_type = config.data_type || "SIMPLE";
 
         // ##################
         // # Runtime values #
@@ -231,7 +230,7 @@ module.exports = function (RED)
                     if (!node_settings.alarm_active)
                     {
                         isBlinking = true;
-                        sendState(!node_settings.last_value)
+                        node.send({ payload: !node_settings.last_value });
                         setStatus();
                         setTimeout(
                             () =>
@@ -239,7 +238,7 @@ module.exports = function (RED)
                                 isBlinking = false;
                                 if (!node_settings.alarm_active)
                                 {
-                                    sendState(node_settings.last_value)
+                                    node.send({ payload: node_settings.last_value });
                                     setStatus();
                                 }
                             },
@@ -284,7 +283,7 @@ module.exports = function (RED)
             }
 
             if (node_settings.alarm_active || helper.getTopicName(msg.topic) != "status")
-                sendState(node_settings.last_value)
+                node.send({ payload: node_settings.last_value });
 
             // Output is on, now
             if (node_settings.last_value && doRestartTimer)
@@ -327,7 +326,7 @@ module.exports = function (RED)
             {
                 timeout = null;
                 node_settings.last_value = false;
-                sendTurnOff();
+                node.send({ payload: false });
                 notifyCentral(false);
 
                 setStatus();
@@ -373,67 +372,6 @@ module.exports = function (RED)
             }
         }
 
-        /**
-         * Turns the output to the given state and returns the sent message
-         * @param {bool} state The new state of the output
-         * @returns The sent message
-         */
-        let sendState = state =>
-        {
-            if (state)
-                return sendTurnOn();
-
-            return sendTurnOff();
-        }
-
-        /**
-         * Turns the output on and returns the sent message
-         * @returns The sent message
-         */
-        let sendTurnOn = () =>
-        {
-            let data = null;
-            switch (data_type)
-            {
-                case "SIMPLE":
-                    data = { payload: true };
-                    break;
-
-                case "HOMEASSISTANT":
-                    data = { payload: { action: "homeassistant.turn_on" } };
-                    break;
-
-                default:
-                    return null;
-            }
-            node.send(data);
-            return data;
-        }
-
-        /**
-         * Turns the output off and returns the sent message
-         * @returns The sent message
-         */
-        let sendTurnOff = () =>
-        {
-            let data = null;
-            switch (data_type)
-            {
-                case "SIMPLE":
-                    data = { payload: false };
-                    break;
-
-                case "HOMEASSISTANT":
-                    data = { payload: { action: "homeassistant.turn_off" } };
-                    break;
-
-                default:
-                    return null;
-            }
-            node.send(data);
-            return data;
-        }
-
         /**
          * Notify all connected central nodes
          * @param {boolean} state The state if the light is on

package/light/locales/de-DE/light.json

@@ -1,29 +1,24 @@
-{
-    "light": {
-        "ui": {
-            "name": "Name",
-            "text": "Text",
-            "controlled_by_words": "Diese Node kann über die eingegebenen Wörter gesteuert werden. Mehrere Wörter werden durch ein Komma getrennt.",
-
-            "data_type": "Datentyp",
-            "simple": "Einfaches Format",
-            "home_assistant": "HA Action Format",
-
-            "max_time_on": "Max Zeit Ein",
-            "alarm_on": "Alarm Ein",
-            "alarm_off": "Alarm Aus",
-            "controlled_by_central": "Dieser Baustein wird von folgenden Zentralbausteinen gesteuert:",
-
-            "milliseconds": "Millisekunden",
-            "seconds": "Sekunden",
-            "minutes": "Minuten",
-            "hours": "Stunden",
-
-            "no_action": "Keine Aktion",
-            "turn_on": "Einschalten",
-            "turn_off": "Ausschalten",
-            "last_state": "Letzen Zustand",
-            "last_sended_state": "Zuletzt gesendeten Zustand"
-        }
-    }
-}
+{
+    "light": {
+        "ui": {
+            "name": "Name",
+            "text": "Text",
+            "controlled_by_words": "Diese Node kann über die eingegebenen Wörter gesteuert werden. Mehrere Wörter werden durch ein Komma getrennt.",
+            "max_time_on": "Max Zeit Ein",
+            "alarm_on": "Alarm Ein",
+            "alarm_off": "Alarm Aus",
+            "controlled_by_central": "Dieser Baustein wird von folgenden Zentralbausteinen gesteuert:",
+
+            "milliseconds": "Millisekunden",
+            "seconds": "Sekunden",
+            "minutes": "Minuten",
+            "hours": "Stunden",
+
+            "no_action": "Keine Aktion",
+            "turn_on": "Einschalten",
+            "turn_off": "Ausschalten",
+            "last_state": "Letzen Zustand",
+            "last_sended_state": "Zuletzt gesendeten Zustand"
+        }
+    }
+}

package/light/locales/en-US/light.json

@@ -1,29 +1,24 @@
-{
-    "light": {
-        "ui": {
-            "name": "Name",
-            "text": "Text",
-            "controlled_by_words": "This node can be controlled using the words entered. Multiple words are separated by a comma.",
-
-            "data_type": "Data type",
-            "simple": "Simple format",
-            "home_assistant": "HA Action format",
-
-            "max_time_on": "Max time on",
-            "alarm_on": "Alarm on",
-            "alarm_off": "Alarm off",
-            "controlled_by_central": "This block is controlled by the following central blocks:",
-
-            "milliseconds": "Milliseconds",
-            "seconds": "Seconds",
-            "minutes": "Minutes",
-            "hours": "Hours",
-
-            "no_action": "No action",
-            "turn_on": "Turn on",
-            "turn_off": "Turn off",
-            "last_state": "Last state",
-            "last_sended_state": "Last sent state"
-        }
-    }
-}
+{
+    "light": {
+        "ui": {
+            "name": "Name",
+            "text": "Text",
+            "controlled_by_words": "This node can be controlled using the words entered. Multiple words are separated by a comma.",
+            "max_time_on": "Max time on",
+            "alarm_on": "Alarm on",
+            "alarm_off": "Alarm off",
+            "controlled_by_central": "This block is controlled by the following central blocks:",
+
+            "milliseconds": "Milliseconds",
+            "seconds": "Seconds",
+            "minutes": "Minutes",
+            "hours": "Hours",
+
+            "no_action": "No action",
+            "turn_on": "Turn on",
+            "turn_off": "Turn off",
+            "last_state": "Last state",
+            "last_sended_state": "Last sent state"
+        }
+    }
+}

package/package.json

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

package/scene/locales/de-DE/scene.json

@@ -1,26 +1,21 @@
-{
-    "scene": {
-        "ui": {
-            "name": "Name",
-            "text": "Text",
-            "controlled_by_words": "Diese Node kann über die eingegebenen Wörter gesteuert werden. Mehrere Wörter werden durch ein Komma getrennt.",
-            
-            "data_type": "Datentyp",
-            "simple": "Einfaches Format",
-            "home_assistant": "HA Action Format",
-
-            "time_on": "Zeit Ein",
-            "controlled_by_central": "Dieser Baustein wird von folgenden Zentralbausteinen gesteuert:",
-
-            "outputs": "Ausgänge",
-            "scenes": "Szenen",
-            "links": "Links",
-            
-            "milliseconds": "Millisekunden",
-            "seconds": "Sekunden",
-            "minutes": "Minuten",
-            "hours": "Stunden"
-
-        }
-    }
-}
+{
+    "scene": {
+        "ui": {
+            "name": "Name",
+            "text": "Text",
+            "controlled_by_words": "Diese Node kann über die eingegebenen Wörter gesteuert werden. Mehrere Wörter werden durch ein Komma getrennt.",
+            "time_on": "Zeit Ein",
+            "controlled_by_central": "Dieser Baustein wird von folgenden Zentralbausteinen gesteuert:",
+
+            "outputs": "Ausgänge",
+            "scenes": "Szenen",
+            "links": "Links",
+            
+            "milliseconds": "Millisekunden",
+            "seconds": "Sekunden",
+            "minutes": "Minuten",
+            "hours": "Stunden"
+
+        }
+    }
+}