Revert button disabled changes for grbl devices

Sienci-Labs · Feb 16, 2024 · a58c742 · a58c742
1 parent cb82211
commit a58c742
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/src/app/widgets/Rotary/ActionArea.js b/src/app/widgets/Rotary/ActionArea.js
@@ -3,7 +3,7 @@ import get from 'lodash/get';
 import { useSelector } from 'react-redux';
 
 import store from 'app/store';
-import { WORKSPACE_MODE } from 'app/constants';
+import { WORKSPACE_MODE, GRBL } from 'app/constants';
 
 import FunctionButton from '../../components/FunctionButton/FunctionButton';
 import { MODALS } from './utils/constants';
@@ -13,7 +13,7 @@ import { SET_ACTIVE_DIALOG } from './Context/actions';
 
 const ActionArea = ({ actions }) => {
     const { dispatch } = useContext(RotaryContext);
-    const { state: controllerState } = useSelector(store => get(store, 'controller'));
+    const { state: controllerState, type: controllerType } = useSelector(store => get(store, 'controller'));
 
     const showUnitSetup = () => {
         dispatch({ type: SET_ACTIVE_DIALOG, payload: MODALS.PHYSICAL_UNIT_SETUP });
@@ -25,13 +25,37 @@ const ActionArea = ({ actions }) => {
 
     const isInRotaryMode = store.get('workspace.mode', WORKSPACE_MODE.DEFAULT) === WORKSPACE_MODE.ROTARY;
     const isFileRunning = controllerState.status?.activeState === 'Hold' || controllerState.status?.activeState === 'Run';
+    const isUsingGrbl = controllerType === GRBL;
 
     return (
         <div style={{ display: 'flex', flexDirection: 'column', marginBottom: '1rem' }}>
-            <FunctionButton onClick={handleStockTurningClick}>Rotary Surfacing</FunctionButton>
-            <FunctionButton onClick={() => actions.runProbing('Z-axis', runZAxisProbing())} disabled={isFileRunning}>Probe Rotary Z-Axis</FunctionButton>
-            <FunctionButton onClick={() => actions.runProbing('Y-axis alignment', runYAxisAlignmentProbing())} disabled={isInRotaryMode || isFileRunning}>Y-axis Alignment</FunctionButton>
-            <FunctionButton onClick={showUnitSetup} disabled={isInRotaryMode || isFileRunning}>Rotary Mounting Setup</FunctionButton>
+            <FunctionButton
+                onClick={handleStockTurningClick}
+                disabled={(isUsingGrbl && !isInRotaryMode) || isFileRunning}
+            >
+                Rotary Surfacing
+            </FunctionButton>
+
+            <FunctionButton
+                onClick={() => actions.runProbing('Z-axis', runZAxisProbing())}
+                disabled={(isUsingGrbl && !isInRotaryMode) || isFileRunning}
+            >
+                Probe Rotary Z-Axis
+            </FunctionButton>
+
+            <FunctionButton
+                onClick={() => actions.runProbing('Y-axis alignment', runYAxisAlignmentProbing())}
+                disabled={(isUsingGrbl && isInRotaryMode) || isFileRunning}
+            >
+                Y-axis Alignment
+            </FunctionButton>
+
+            <FunctionButton
+                onClick={showUnitSetup}
+                disabled={(isUsingGrbl && isInRotaryMode) || isFileRunning}
+            >
+                Rotary Mounting Setup
+            </FunctionButton>
         </div>
     );
 };