Make "Go To Work Zero" and "Go To Machine Zero" buttons configurable (#…

…181)

src/web/lib/combokeys.js

@@ -6,6 +6,7 @@ import { preventDefault } from './dom-events';
 const AXIS_X = 'x';
 const AXIS_Y = 'y';
 const AXIS_Z = 'z';
+const AXIS_A = 'a';
 const FORWARD = 1;
 const BACKWARD = -1;
 const OVERSHOOT_FACTOR = 10; // 10x
@@ -286,6 +287,66 @@ const commandKeys = [
         },
         preventDefault: false
     },
+    { // Jog A+
+        keys: ']',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: FORWARD,
+            factor: 1
+        },
+        preventDefault: false
+    },
+    { // Jog A+ (undershoot)
+        keys: 'alt+]',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: FORWARD,
+            factor: UNDERSHOOT_FACTOR
+        },
+        preventDefault: false
+    },
+    { // Jog A+ (overshoot)
+        keys: 'shift+]',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: FORWARD,
+            factor: OVERSHOOT_FACTOR
+        },
+        preventDefault: false
+    },
+    { // Jog A-
+        keys: '[',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: BACKWARD,
+            factor: 1
+        },
+        preventDefault: false
+    },
+    { // Jog A- (undershoot)
+        keys: 'alt+[',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: BACKWARD,
+            factor: UNDERSHOOT_FACTOR
+        },
+        preventDefault: false
+    },
+    { // Jog A- (overshoot)
+        keys: 'shift+[',
+        cmd: 'JOG',
+        payload: {
+            axis: AXIS_A,
+            direction: BACKWARD,
+            factor: OVERSHOOT_FACTOR
+        },
+        preventDefault: false
+    },
     { // Shuttle Zone -7
         keys: ['ctrl', 'alt', 'shift', '7'].join('+'),
         cmd: 'SHUTTLE',

src/web/store/index.js

@@ -51,6 +51,8 @@ export const defaultState = {
                 selectedDistance: '1',
                 customDistance: 10
             },
+            wzero: 'G0 X0 Y0 Z0', // Go To Work Zero
+            mzero: 'G53 G0 X0 Y0 Z0', // Go To Machine Zero
             shuttle: {
                 feedrateMin: 500,
                 feedrateMax: 2000,

src/web/styles/bootstrap-override.styl

@@ -15,6 +15,11 @@ label {
     text-decoration: none;
 }
 
+// Tooltip
+.tooltip-inner {
+    max-width: 240px;
+}
+
 // font-size
 .btn,
 .dropdown-header,

src/web/widgets/Axes/Axes.jsx

@@ -1,29 +1,21 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Settings from './Settings';
-import Toolbar from './Toolbar';
 import DisplayPanel from './DisplayPanel';
 import ControlPanel from './ControlPanel';
-import {
-    MODAL_SETTINGS
-} from './constants';
 
 const Axes = (props) => {
-    const { state, actions } = props;
+    const { config, state, actions } = props;
 
     return (
         <div>
-            {state.modal.name === MODAL_SETTINGS &&
-            <Settings state={state} actions={actions} />
-            }
-            <Toolbar state={state} actions={actions} />
-            <DisplayPanel state={state} actions={actions} />
-            <ControlPanel state={state} actions={actions} />
+            <DisplayPanel config={config} state={state} actions={actions} />
+            <ControlPanel config={config} state={state} actions={actions} />
         </div>
     );
 };
 
 Axes.propTypes = {
+    config: PropTypes.object,
     state: PropTypes.object,
     actions: PropTypes.object
 };

src/web/widgets/Axes/ControlPanel.jsx

@@ -1,35 +1,21 @@
-import React, { Component, PropTypes } from 'react';
-import shallowCompare from 'react-addons-shallow-compare';
-import JogPad from './JogPad';
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
+import Keypad from './Keypad';
 import JogDistance from './JogDistance';
-import MotionButtonGroup from './MotionButtonGroup';
 import styles from './index.styl';
 
-class ControlPanel extends Component {
+class ControlPanel extends PureComponent {
     static propTypes = {
+        config: PropTypes.object,
         state: PropTypes.object,
         actions: PropTypes.object
     };
 
-    shouldComponentUpdate(nextProps, nextState) {
-        return shallowCompare(this, nextProps, nextState);
-    }
     render() {
         return (
             <div className={styles.controlPanel}>
-                <div className="row no-gutters">
-                    <div className="col-xs-6">
-                        <JogPad {...this.props} />
-                    </div>
-                    <div className="col-xs-6">
-                        <MotionButtonGroup {...this.props} />
-                    </div>
-                </div>
-                <div className="row no-gutters">
-                    <div className="col-xs-12">
-                        <JogDistance {...this.props} />
-                    </div>
-                </div>
+                <Keypad {...this.props} />
+                <JogDistance {...this.props} />
             </div>
         );
     }