Merge pull request #15 from thomaspz/feat/no_msg_on_reset

Add Option Message on Reset

README.md

@@ -66,7 +66,7 @@ The node evaluates the following input `msg` types:
 
 ## Outputs
 The node contains two outputs:
-- The **primary output** (upper output) emits an output `msg` at the **countdown start/stop** instant of time.  These `msg.payload` contents are configurable
+- The **primary output** (upper output) emits an output `msg` at the **countdown start/stop** instant of time.  These `msg.payload` contents are configurable. If Option "Send Outputmessage on Reset" ist set, the message is send, when the timer is stopped. Otherwise, the Stop message will only by send, if the timer reaches zero.
 - The **secondary output** (lower output) emits the **remaining time every second** during the timer runs. The `msg.payload` holds the remaining counting value
 
 

countdown.html

@@ -27,6 +27,12 @@
     <span>Restart countdown if message is received while running</span>&nbsp;
   </div>
 
+  <div class="form-row">
+    <label for="node-input-outputOnReset">&nbsp;</label>
+    <input style="display:inline-block; width:15px; vertical-align:baseline;" type="checkbox" id="node-input-outputOnReset">
+    <span>Send Outputmessage on Reset</span>&nbsp;
+  </div>
+
   <div class="form-row">
     <label for="node-input-setTimeToNewWhileRunning">&nbsp;</label>
     <input style="display:inline-block; width:15px; vertical-align:top;" type="checkbox" id="node-input-setTimeToNewWhileRunning">
@@ -130,6 +136,7 @@ <h3>Details</h3>
       payloadTimerStopType: { value: 'bool' },
       timer: { value: 30, validate:RED.validators.number()  },
       resetWhileRunning: { value: false },
+      outputOnReset: { value: true },
       setTimeToNewWhileRunning: { value: true },
       startCountdownOnControlMessage: { value: false }
     },

countdown.js

@@ -43,7 +43,7 @@ module.exports = function(RED) {
             }
         }
 
-        function stopTimer() {
+        function stopTimer(onReset = false) {
             node.status({
                 fill: "red", shape: "dot", text: "Stopped: " + timeout
             });
@@ -67,7 +67,15 @@ module.exports = function(RED) {
             if (node.config.payloadTimerStopType == "nul") {
                 node.send([null, remainingTicksMsg]);
             } else {
-                node.send([msg, remainingTicksMsg]);
+                if (node.config.outputOnReset) {
+                    node.send([msg, remainingTicksMsg]);
+                } else {
+                    if (onReset) {
+                        node.send([null, remainingTicksMsg]);
+                    } else {
+                        node.send([msg, remainingTicksMsg]);
+                    }
+                }
             }
 
             endTicker();
@@ -147,7 +155,7 @@ module.exports = function(RED) {
                 }
 
                 if (msg.payload === false || msg.payload === 0) {
-                    stopTimer();
+                    stopTimer(true);
                 } else {
                     if (ticker) {
                         if (node.config.resetWhileRunning) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-countdown",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A countdown that supports dynamic setting of (future) run time",
   "main": "countdown.js",
   "scripts": {},