Merge pull request #302 from parallaxinc/rxtx-timeout

Add rx/tx minimum unlit time, adjust minimum lit time

Author: phated

src/constants/action-types.js

@@ -8,8 +8,10 @@ const actionTypes = {
   ECHO_OFF: 'ECHO_OFF',
   RX_ON: 'RX_ON',
   RX_OFF: 'RX_OFF',
+  RX_CLEAR_TIMEOUT: 'RX_CLEAR_TIMEOUT',
   TX_ON: 'TX_ON',
   TX_OFF: 'TX_OFF',
+  TX_CLEAR_TIMEOUT: 'TX_CLEAR_TIMEOUT',
   RECEIVE: 'RECEIVE',
   TRANSMIT: 'TRANSMIT',
   UPDATE_DURATION: 'UPDATE_DURATION',

src/creators/index.js

@@ -16,8 +16,10 @@ const creators = {
   // terminal creators
   rxOn: require('./rx-on'),
   rxOff: require('./rx-off'),
+  rxClearTimeout: require('./rx-clear-timeout'),
   txOn: require('./tx-on'),
   txOff: require('./tx-off'),
+  txClearTimeout: require('./tx-clear-timeout'),
   receive: require('./receive'),
   transmit: require('./transmit'),
   updateDuration: require('./update-duration'),

src/creators/rx-clear-timeout.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {
+  RX_CLEAR_TIMEOUT
+} = require('../constants/action-types');
+
+function rxClearTimeout(){
+  return {
+    type: RX_CLEAR_TIMEOUT,
+    payload: {}
+  };
+}
+
+module.exports = rxClearTimeout;

src/creators/tx-clear-timeout.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {
+  TX_CLEAR_TIMEOUT
+} = require('../constants/action-types');
+
+function txClearTimeout(){
+  return {
+    type: TX_CLEAR_TIMEOUT,
+    payload: {}
+  };
+}
+
+module.exports = txClearTimeout;

src/plugins/handlers.js

@@ -403,8 +403,15 @@ function handlers(app, opts, done){
       // .catch((err) => this._handleError(err));
   }
 
+  function rxClearTimeout(){
+    consoleStore.dispatch(creators.rxClearTimeout());
+  }
+
   function rxOff(){
+    const { rxtx } = consoleStore.getState();
+    const { offDuration } = rxtx;
     consoleStore.dispatch(creators.rxOff());
+    setTimeout(rxClearTimeout, offDuration);
   }
 
   function rxOn(){
@@ -414,13 +421,20 @@ function handlers(app, opts, done){
     let timeout;
     if(!rxTimeout){
       timeout = setTimeout(rxOff, duration);
+      consoleStore.dispatch(creators.rxOn(timeout));
     }
 
-    consoleStore.dispatch(creators.rxOn(timeout));
+  }
+
+  function txClearTimeout(){
+    consoleStore.dispatch(creators.txClearTimeout());
   }
 
   function txOff(){
+    const { rxtx } = consoleStore.getState();
+    const { offDuration } = rxtx;
     consoleStore.dispatch(creators.txOff());
+    setTimeout(txClearTimeout, offDuration);
   }
 
   function txOn(){
@@ -430,9 +444,9 @@ function handlers(app, opts, done){
     let timeout;
     if(!txTimeout){
       timeout = setTimeout(txOff, duration);
+      consoleStore.dispatch(creators.txOn(timeout));
     }
 
-    consoleStore.dispatch(creators.txOn(timeout));
   }
 
   function updateDuration(duration){

src/reducers/rxtx.js

@@ -10,8 +10,10 @@ const _ = require('lodash');
 const {
   RX_ON,
   RX_OFF,
+  RX_CLEAR_TIMEOUT,
   TX_ON,
   TX_OFF,
+  TX_CLEAR_TIMEOUT,
   UPDATE_DURATION
 } = require('../constants/action-types');
 
@@ -20,18 +22,23 @@ const initial = {
   rxTimeout: null,
   flashTx: false,
   txTimeout: null,
-  duration: 50
+  duration: 100,
+  offDuration: 50
 };
 
 function rxtx(state = initial, { type, payload }){
   switch(type){
     case RX_ON:
       return _.assign({}, state, { flashRx: true, rxTimeout: payload.timeout });
     case RX_OFF:
+      return _.assign({}, state, { flashRx: false });
+    case RX_CLEAR_TIMEOUT:
       return _.assign({}, state, { flashRx: false, rxTimeout: null });
     case TX_ON:
       return _.assign({}, state, { flashTx: true, txTimeout: payload.timeout });
     case TX_OFF:
+      return _.assign({}, state, { flashTx: false });
+    case TX_CLEAR_TIMEOUT:
       return _.assign({}, state, { flashTx: false, txTimeout: null });
     case UPDATE_DURATION:
       return _.assign({}, state, { duration: payload.duration });