smart-nodes 0.4.23 → 0.4.25

package/CHANGELOG.md

@@ -181,3 +181,7 @@
 -   Changed default of save_state and resend_on_start to false for all nodes.
 -   Hysteresis node can now be defined by min/max values.
 -   Added support for percentage output for the light node.
+
+## Version 0.4.24:
+
+- Added set_inverted to light node.

package/README.md

@@ -95,7 +95,7 @@ You can also choose 2-4 press detection.
 
 ## 7. Hysteresis
 
-This node is checking if the input value reachs a defined value until the upper message is send. When the lower level is reached, the lower masssage will be send
+This node is checking if the input value reachs a defined value until the upper message is send. When the lower level is reached, the lower message will be send.
 
 ### **Features:**
 
@@ -104,7 +104,7 @@ This node is checking if the input value reachs a defined value until the upper
 
 ## 8. Logic
 
-This node can be used for AND, OR and XOR logics.
+This node can be used for AND, OR and XOR logics. Inputs and outputs can be individually selected to be inverted.
 
 ### **Features:**
 

package/light/light.js

@@ -110,6 +110,16 @@ module.exports = function (RED)
             let doRestartTimer = true;
             let real_topic = helper.getTopicName(msg.topic);
 
+            if (real_topic == "set_inverted")
+            {
+                real_topic = "set";
+
+                if (mode == "BOOL")
+                    msg.payload = !msg.payload;
+                else if (mode == "PERCENTAGE")
+                    msg.payload = 100 - boolToInt(msg.payload);
+            }
+
             switch (real_topic)
             {
                 case "status":
@@ -223,7 +233,7 @@ module.exports = function (RED)
 
                 case "alarm":
                     isBlinking = false;
-                    
+
                     // Make sure it is bool
                     msg.payload = !!msg.payload;
 

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

@@ -39,7 +39,15 @@
                 <tr>
                     <td><code>set</code></td>
                     <td>
-                        Schaltet den Ausgang bei <code>msg.payload = true</code> ein und bei <code>msg.payload = false</code> aus, bzw. setzt den Ausgang auf den gesendeten Prozent Wert <code>msg.payload = 50</code>.<br/>
+                        Schaltet den Ausgang bei <code>msg.payload = true</code> ein und bei <code>msg.payload = false</code> aus, bzw. setzt den Ausgang auf den gesendeten Prozent Wert <code>msg.payload = 30</code>.<br/>
+                        Bei einem Wechsel des Ausgangswerts wird die Zeitmessung für die hinterlegte, bzw. mitgesendete Zeit gestartet, sofern vorhanden.
+                    </td>
+                    <td>Nein</td>
+                </tr>
+                <tr>
+                    <td><code>set_inverted</code></td>
+                    <td>
+                        Schaltet den Ausgang bei <code>msg.payload = false</code> ein und bei <code>msg.payload = true</code> aus, bzw. setzt den Ausgang auf 100 - den gesendeten Prozent Wert <code>msg.payload = 30</code> => sendet 70%.<br/>
                         Bei einem Wechsel des Ausgangswerts wird die Zeitmessung für die hinterlegte, bzw. mitgesendete Zeit gestartet, sofern vorhanden.
                     </td>
                     <td>Nein</td>

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

@@ -38,7 +38,15 @@
                 <tr>
                     <td><code>set</code></td>
                     <td>
-                        Switches the output on when <code>msg.payload = true</code> and off when <code>msg.payload = false, or sets the output to the sent percent value <code>msg.payload = 50</code>.</code>.<br />
+                        Switches the output on when <code>msg.payload = true</code> and off when <code>msg.payload = false, or sets the output to the sent percent value <code>msg.payload = 30</code>.</code>.<br />
+                        When changing the output value, the time measurement is started for the stored or sent time, if available.
+                    </td>
+                    <td>No</td>
+                </tr>
+                <tr>
+                    <td><code>set_inverted</code></td>
+                    <td>
+                        Switches the output on when <code>msg.payload = false</code> and off when <code>msg.payload = true, or sets the output to 100 - the sent percent value <code>msg.payload = 30</code> => sent 70%.</code>.<br />
                         When changing the output value, the time measurement is started for the stored or sent time, if available.
                     </td>
                     <td>No</td>

package/package.json

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

package/dimmer/dimmer.html

@@ -1,389 +0,0 @@
-<script type="text/javascript">
-    (function ()
-    {
-        let treeList;
-        let candidateNodesCount = 0;
-        let flows = [];
-        let flowMap = {};
-
-        function onEditPrepare(node, targetTypes)
-        {
-            if (!node.links)
-                node.links = [];
-
-            const activeSubflow = RED.nodes.subflow(node.z);
-
-            treeList = $("<div>")
-                .css({ width: "100%", height: "100%" })
-                .appendTo(".node-input-link-row")
-                .treeList({ autoSelect: false })
-                .on("treelistitemmouseover", function (e, item)
-                {
-                    if (item.node)
-                    {
-                        item.node.highlighted = true;
-                        item.node.dirty = true;
-                        RED.view.redraw();
-                    }
-                })
-                .on("treelistitemmouseout", function (e, item)
-                {
-                    if (item.node)
-                    {
-                        item.node.highlighted = false;
-                        item.node.dirty = true;
-                        RED.view.redraw();
-                    }
-                });
-
-            flows = [];
-            flowMap = {};
-
-            if (activeSubflow)
-            {
-                flowMap[activeSubflow.id] = {
-                    id: activeSubflow.id,
-                    class: "red-ui-palette-header",
-                    label: "Subflow : " + (activeSubflow.name || activeSubflow.id),
-                    expanded: true,
-                    children: []
-                };
-                flows.push(flowMap[activeSubflow.id]);
-            }
-            else
-            {
-                RED.nodes.eachWorkspace(function (ws)
-                {
-                    if (!ws.disabled)
-                    {
-                        flowMap[ws.id] = {
-                            id: ws.id,
-                            class: "red-ui-palette-header",
-                            label: (ws.label || ws.id) + (node.z === ws.id ? " *" : ""),
-                            expanded: true,
-                            children: []
-                        };
-                        flows.push(flowMap[ws.id]);
-                    }
-                });
-            }
-
-            setTimeout(function ()
-            {
-                treeList.treeList("show", node.z);
-            }, 100);
-        }
-
-        function initTreeList(node, targetTypes)
-        {
-            candidateNodesCount = 0;
-            for (const key in flowMap)
-            {
-                flowMap[key].children = [];
-            }
-
-            let candidateNodes = [];
-
-            targetTypes.forEach(function (targetType)
-            {
-                candidateNodes = candidateNodes.concat(RED.nodes.filterNodes({ type: targetType }));
-            });
-
-            candidateNodes.forEach(function (n)
-            {
-                if (flowMap[n.z])
-                {
-                    const isChecked = (node.links.indexOf(n.id) !== -1) || (n.links || []).indexOf(node.id) !== -1;
-                    if (isChecked)
-                    {
-                        flowMap[n.z].children.push({
-                            id: n.id,
-                            node: n,
-                            label: n.name || n.id,
-                            selected: false,
-                            checkbox: false,
-                            radio: false
-                        });
-                        candidateNodesCount++;
-                    }
-                }
-            });
-
-            for (const key in flowMap)
-            {
-                flowMap[key].children.sort((a, b) => a.label.localeCompare(b.label));
-            }
-
-            const flowsFiltered = flows.filter(function (f) { return f.children.length > 0 });
-            treeList.treeList("empty");
-            treeList.treeList("data", flowsFiltered);
-        }
-
-        function resizeNodeList()
-        {
-            var rows = $("#dialog-form>div:not(.node-input-link-row)");
-            var height = $("#dialog-form").height();
-            for (var i = 0; i < rows.length; i++)
-            {
-                if ($(rows[i]).is(":visible"))
-                    height -= $(rows[i]).outerHeight(true);
-            }
-            var editorRow = $("#dialog-form>div.node-input-link-row");
-            height -= (parseInt(editorRow.css("marginTop")) + parseInt(editorRow.css("marginBottom")));
-            $(".node-input-link-row").css("height", height + "px");
-        }
-
-        RED.nodes.registerType("smart_dimmer-control", {
-            category: "Smart Nodes",
-            paletteLabel: "Dimmer control",
-            color: "#C882FF",
-            defaults: {
-                name: { value: "" },
-                exec_text_names: { value: "" },
-                max_time_on: { value: "0" },
-                max_time_on_unit: { value: "s" },
-                long_press_ms: { value: "1000" },
-                dim_time_total: { value: "0" },
-                dim_time_total_unit: { value: "s" },
-                alarm_on_action: { value: 'NOTHING' }, // NOTHING | ON | OFF | PERCENTAGE
-                alarm_on_percentage: { value: 0 },
-                alarm_off_action: { value: 'NOTHING' }, // NOTHING | ON | OFF | PERCENTAGE | LAST | LAST_SENDED
-                alarm_off_percentage: { value: 0 },
-                links: { value: [], type: "smart_central-control[]" }
-            },
-            inputs: 1,
-            outputs: 1,
-            icon: "font-awesome/fa-circle-o-notch",
-            label: function ()
-            {
-                return this.name || "Dimmer control";
-            },
-            oneditprepare: function ()
-            {
-                let node = this;
-
-                onEditPrepare(this, ["smart_central-control"]);
-                initTreeList(node, ["smart_central-control"]);
-
-                $("#node-input-max_time_on")
-                    .css("max-width", "4rem")
-                    .spinner({
-                        min: 0,
-                        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);
-                        },
-                    });
-
-                $("#node-input-max_time_on_unit")
-                    .css("max-width", "10rem")
-                    .typedInput({
-                        types: [{
-                            value: "max_time_on_unit",
-                            default: "s",
-                            options: [
-                                { value: "ms", label: node._("dimmer.ui.milliseconds") },
-                                { value: "s", label: node._("dimmer.ui.seconds") },
-                                { value: "min", label: node._("dimmer.ui.minutes") },
-                                { value: "h", label: node._("dimmer.ui.hours") },
-                            ],
-                        }],
-                    });
-
-                $("#node-input-dim_time_total")
-                    .css("max-width", "4rem")
-                    .spinner({
-                        min: 0,
-                        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);
-                        },
-                    });
-
-                $("#node-input-dim_time_total_unit")
-                    .css("max-width", "10rem")
-                    .typedInput({
-                        types: [{
-                            value: "dim_time_total_unit",
-                            default: "s",
-                            options: [
-                                { value: "ms", label: node._("dimmer.ui.milliseconds") },
-                                { value: "s", label: node._("dimmer.ui.seconds") },
-                                { value: "min", label: node._("dimmer.ui.minutes") },
-                                { value: "h", label: node._("dimmer.ui.hours") },
-                            ],
-                        }],
-                    });
-
-                $("#node-input-long_press_ms")
-                    .css("max-width", "4rem")
-                    .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);
-                        }
-                    });
-
-                $("#node-input-update_interval")
-                    .css("max-width", "4rem")
-                    .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);
-                        }
-                    });
-
-                $("#node-input-alarm_on_action")
-                    .css("max-width", "13rem")
-                    .typedInput({
-                        types: [{
-                            value: "alarm_on_action",
-                            default: "NOTHING",
-                            options: [
-                                { value: "NOTHING", label: node._("dimmer.ui.no_action") },
-                                { value: "ON", label: node._("dimmer.ui.turn_on") },
-                                { value: "OFF", label: node._("dimmer.ui.turn_off") },
-                                { value: "PERCENTAGE", label: node._("dimmer.ui.turn_percentage") }
-                            ],
-                        }],
-                    });
-
-                $("#node-input-alarm_on_percentage")
-                    .css("max-width", "4rem")
-                    .spinner({
-                        min: 0,
-                        max: 100,
-                        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);
-                        },
-                    });
-
-                $("#node-input-alarm_off_action")
-                    .css("max-width", "13rem")
-                    .typedInput({
-                        types: [{
-                            value: "alarm_off_action",
-                            default: "NOTHING",
-                            options: [
-                                { value: "NOTHING", label: node._("dimmer.ui.no_action") },
-                                { value: "ON", label: node._("dimmer.ui.turn_on") },
-                                { value: "OFF", label: node._("dimmer.ui.turn_off") },
-                                { value: "PERCENTAGE", label: node._("dimmer.ui.turn_percentage") },
-                                { value: "LAST", label: node._("dimmer.ui.last_state") },
-                                { value: "LAST_SENDED", label: node._("dimmer.ui.last_sended_state") }
-                            ],
-                        }],
-                    });
-
-                $("#node-input-alarm_off_percentage")
-                    .css("max-width", "4rem")
-                    .spinner({
-                        min: 0,
-                        max: 100,
-                        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);
-                        },
-                    });
-
-                $("#node-input-alarm_on_action").on("change", function ()
-                {
-                    if (this.value == "PERCENTAGE")
-                        $("#alarm_on_percentage_block").show();
-                    else
-                        $("#alarm_on_percentage_block").hide();
-                });
-
-                $("#node-input-alarm_off_action").on("change", function ()
-                {
-                    if (this.value == "PERCENTAGE")
-                        $("#alarm_off_percentage_block").show();
-                    else
-                        $("#alarm_off_percentage_block").hide();
-                });
-            },
-            onadd: function ()
-            {
-                this.links = [];
-            },
-            oneditresize: resizeNodeList
-        });
-    })();
-</script>
-
-<script type="text/html" data-template-name="smart_dimmer-control">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="dimmer.ui.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]dimmer.ui.name" />
-    </div>
-    <div class="form-row">
-        <label for="node-input-exec_text_names"><i class="fa fa-comments-o"></i> <span data-i18n="dimmer.ui.text"></span></label>
-        <input id="node-input-exec_text_names" type="text" />
-        <div style="max-width: 450px;" data-i18n="dimmer.ui.controlled_by_words"></div>
-    </div>
-    <div class="form-row">
-        <label for="node-input-max_time_on"><i class="fa fa-clock-o"></i> <span data-i18n="dimmer.ui.max_time_on"></span></label>
-        <input id="node-input-max_time_on" value="0" />
-        <input id="node-input-max_time_on_unit" />
-    </div>
-    <div class="form-row">
-        <label for="node-input-dim_time_total"><i class="fa fa-clock-o"></i> <span data-i18n="dimmer.ui.dim_time_on"></span></label>
-        <input id="node-input-dim_time_total" value="0" />
-        <input id="node-input-dim_time_total_unit" />
-    </div>
-    <div class="form-row">
-        <label for="node-input-long_press_ms"><i class="fa fa-clock-o"></i> <span data-i18n="dimmer.ui.time_for_long"></span></label>
-        <input id="node-input-long_press_ms" value="1000" />
-        <span data-i18n="dimmer.ui.milliseconds"></span>
-    </div>
-    <div class="form-row">
-        <label for="node-input-update_interval"><i class="fa fa-clock-o"></i> <span data-i18n="dimmer.ui.update_interval"></span></label>
-        <input id="node-input-update_interval" value="500" />
-        <span data-i18n="dimmer.ui.milliseconds"></span>
-    </div>
-    <div class="form-row">
-        <label for="node-input-alarm_on_action"><i class="fa fa-exclamation-triangle"></i> <span data-i18n="dimmer.ui.alarm_on"></span></label>
-        <input id="node-input-alarm_on_action"/>
-        <span id="alarm_on_percentage_block" style="display: none;">
-            <input id="node-input-alarm_on_percentage" value="0" /> %
-        </span>
-    </div>
-    <div class="form-row">
-        <label for="node-input-alarm_off_action"><i class="fa fa-exclamation-triangle"></i> <span data-i18n="dimmer.ui.alarm_off"></span></label>
-        <input id="node-input-alarm_off_action"/>
-        <span id="alarm_off_percentage_block" style="display: none;">
-            <input id="node-input-alarm_off_percentage" value="0" /> %
-        </span>
-    </div>
-    <span><i class="fa fa-link"></i> <span data-i18n="dimmer.ui.controlled_by_central"></span></span>
-    <div class="form-row node-input-link-row node-input-link-rows"></div>
-</script>