Merge pull request #301 from parallaxinc/ignore-echo

Implement echo toggle functionality

Author: phated

package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@phated/redux-create-store": "^0.3.0",
-    "bs2-serial": "^0.14.1",
+    "bs2-serial": "^0.15.0",
     "codemirror": "^4.13.0",
     "frylord": "^0.7.4",
     "holovisor": "^0.2.0",

src/console-store.js

@@ -9,6 +9,7 @@
 const createStore = require('@phated/redux-create-store');
 
 const reducers = {
+  echo: require('./reducers/echo'),
   rxtx: require('./reducers/rxtx')
 };
 

src/constants/action-types.js

@@ -4,6 +4,8 @@ const actionTypes = {
   SHOW_OVERLAY: 'SHOW_OVERLAY',
   HIDE_OVERLAY: 'HIDE_OVERLAY',
   DELETE_PROJECT_CONFIRM: 'DELETE_PROJECT_CONFIRM',
+  ECHO_ON: 'ECHO_ON',
+  ECHO_OFF: 'ECHO_OFF',
   RX_ON: 'RX_ON',
   RX_OFF: 'RX_OFF',
   TX_ON: 'TX_ON',

src/creators/echo-off.js

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

src/creators/echo-on.js

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

src/creators/index.js

@@ -22,6 +22,8 @@ const creators = {
   transmit: require('./transmit'),
   updateDuration: require('./update-duration'),
   clearTransmission: require('./clear-transmission'),
+  echoOn: require('./echo-on'),
+  echoOff: require('./echo-off'),
   // device creators
   connect: require('./connect'),
   disconnect: require('./disconnect'),

src/plugins/handlers.js

@@ -482,10 +482,26 @@ function handlers(app, opts, done){
     txOn();
   }
 
+  function toggleEcho(){
+    const { device } = store.getState();
+    const { echo } = consoleStore.getState();
+    const { selected, connected } = device;
+    if(echo){
+      consoleStore.dispatch(creators.echoOff());
+    }else{
+      consoleStore.dispatch(creators.echoOn());
+    }
+    if(selected && connected){
+      const board = app.getBoard(selected);
+      board.setEcho(!echo);
+    }
+  }
+
   function download() {
     const { device } = store.getState();
     const { selected } = device;
     const { filename, content } = workspace.getState();
+    const { echo } = consoleStore.getState();
 
     if(!selected){
       return;
@@ -514,6 +530,7 @@ function handlers(app, opts, done){
         board.removeListener('progress', onProgress);
         resetDownloadProgress();
         connect();
+        board.setEcho(echo);
         hideOverlay();
       });
   }
@@ -653,6 +670,7 @@ function handlers(app, opts, done){
     reloadDevices,
     selectDevice,
     download,
+    toggleEcho,
     enableAutoDownload,
     disableAutoDownload
   });

src/plugins/rxtx.js

@@ -32,6 +32,17 @@ const styles = {
     float: 'right',
     paddingTop: '3px'
   },
+  echo: {
+    display: 'inline-block',
+    paddingTop: '3px',
+    paddingLeft: '16px'
+  },
+  echoOn: {
+    color: '#000000'
+  },
+  echoOff: {
+    color: '#888888'
+  },
   rx: {
     backgroundColor: blue
   },
@@ -45,13 +56,15 @@ function applyStyles(el, stylesToApply){
 }
 
 function rxtxBar(app, opts, done){
+  const { toggleEcho } = app.handlers;
 
   let bottomBar;
   let rx;
   let tx;
+  let echoContainer, echoLabel;
 
   function onConsoleChange(){
-    const { rxtx } = consoleStore.getState();
+    const { rxtx, echo } = consoleStore.getState();
     const { flashRx, flashTx } = rxtx;
 
     if(flashRx){
@@ -65,6 +78,14 @@ function rxtxBar(app, opts, done){
     } else {
       tx.style.backgroundColor = styles.indicator.backgroundColor;
     }
+
+    if(echo){
+      applyStyles(echoContainer, styles.echoOn);
+      echoLabel.nodeValue = 'Echo On';
+    }else{
+      applyStyles(echoContainer, styles.echoOff);
+      echoLabel.nodeValue = 'Echo Off';
+    }
   }
 
   app.view('editor', function(el, cb){
@@ -73,6 +94,16 @@ function rxtxBar(app, opts, done){
       bottomBar = document.createElement('div');
       applyStyles(bottomBar, styles.bar);
 
+      echoContainer = document.createElement('span');
+      applyStyles(echoContainer, styles.echo);
+      applyStyles(echoContainer, styles.echoOff);
+      bottomBar.appendChild(echoContainer);
+
+      echoLabel = document.createTextNode('Echo Off');
+      echoContainer.appendChild(echoLabel);
+
+      echoContainer.addEventListener('click', toggleEcho, false);
+
       const rxtxContainer = document.createElement('span');
       applyStyles(rxtxContainer, styles.rxtx);
       bottomBar.appendChild(rxtxContainer);

src/reducers/echo.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/*
+  Don't include this in the index.js because it is used only
+  for the console-store
+ */
+
+const {
+  ECHO_OFF,
+  ECHO_ON
+} = require('../constants/action-types');
+
+const initial = false;
+
+function echo(state = initial, { type }){
+  switch(type){
+    case ECHO_OFF:
+      return false;
+    case ECHO_ON:
+      return true;
+    default:
+      return state;
+  }
+}
+
+module.exports = echo;