Fix v4.11.0 1 (#2468)

* Fix: Semi auto material thickness mode set wrong work origin coordinate * Fix: Stopping Print the laser or CNC may not turn off due to asynchronous issues * Fix: Update tryPause logic and resumeGcode without go home modal
Snapmaker · Mar 6, 2024 · 40298d8 · 40298d8
1 parent 85f4dca
commit 40298d8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 12 deletions.
diff --git a/src/app/ui/widgets/Connection/modals/GoHomeModal.tsx b/src/app/ui/widgets/Connection/modals/GoHomeModal.tsx
@@ -1,7 +1,8 @@
-import type { MachineToolHeadOptions } from '@snapmaker/luban-platform';
+import { WorkflowStatus, MachineToolHeadOptions } from '@snapmaker/luban-platform';
 import React, { useCallback, useEffect, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
+import { includes } from 'lodash';
 import { RootState } from '../../../../flux/index.def';
 import { actions as workspaceActions } from '../../../../flux/workspace';
 import i18n from '../../../../lib/i18n';
@@ -24,7 +25,7 @@ const GoHomeModal: React.FC = () => {
 
     const {
         isHomed,
-
+        workflowStatus,
         activeMachine,
     } = useSelector((state: RootState) => state.workspace);
 
@@ -41,7 +42,7 @@ const GoHomeModal: React.FC = () => {
                 return;
             }
 
-            if (!isHomed) {
+            if (!isHomed && !includes([WorkflowStatus.Running], workflowStatus)) {
                 setShowModal(true);
             } else {
                 // already homed, which means machine coordinates are ready

diff --git a/src/app/ui/widgets/WorkspaceVisualizer/Visualizer.jsx b/src/app/ui/widgets/WorkspaceVisualizer/Visualizer.jsx
@@ -373,7 +373,7 @@ class Visualizer extends React.PureComponent {
                             e: Number(workPosition.e)
                         }
                     };
-                    if (this.pauseStatus.headStatus) {
+                    if (this.pauseStatus.headStatus || this.props.headType !== HEAD_PRINTING) {
                         this.props.executeGcode('M5');
                     }
 
@@ -438,6 +438,11 @@ class Visualizer extends React.PureComponent {
             if (workflowStatus !== WorkflowStatus.Idle) {
                 setTimeout(() => {
                     server.stopServerGcode();
+
+                    // Stop the laser or CNC machine. While trying to pause, if the 'tryPause' doesn't turn off, then wait for synchronization issues.
+                    if (connectionType === CONNECTION_TYPE_SERIAL && (this.pauseStatus.headStatus || this.props.headType !== HEAD_PRINTING)) {
+                        this.props.executeGcode('M5');
+                    }
                 }, 60);
             }
         },

diff --git a/src/server/services/machine/ConnectionManager.ts b/src/server/services/machine/ConnectionManager.ts
@@ -662,6 +662,12 @@ class ConnectionManager {
                         || (toolHead === LEVEL_ONE_POWER_LASER_FOR_SM2 && isLaserPrintAutoMode))
                         && ((materialThickness !== 0 && materialThickness !== -1) || isRotate)) {
                         await this.channel.laserSetWorkHeight({ toolHead, materialThickness, isRotate });
+
+                        // Fixme: multi call to set work orign coordinate
+                        // Camera Aid Background mode, force machine to work on machine coordinates (Origin = 0,0)
+                        if (background.enabled && !isRotate) {
+                            await this.channel.setAbsoluteWorkOrigin({ x: 0, y: 0, z: 0, isRotate });
+                        }
                     }
 
                     const { jogSpeed = 1500 } = options;

diff --git a/src/server/services/machine/channels/SacpChannel.ts b/src/server/services/machine/channels/SacpChannel.ts
@@ -1486,20 +1486,39 @@ class SacpChannelBase extends Channel implements
         }
     }
 
-    public async setAbsoluteWorkOrigin({ z, isRotate = false }: {
-        x: number, y: number, z: number, isRotate: boolean
+    public async setAbsoluteWorkOrigin({ x, y, z, isRotate = false }: {
+        x?: number, y?: number, z: number, isRotate: boolean
     }) {
         try {
             const res1 = await this.sacpClient.updateCoordinate(CoordinateType.MACHINE);
             log.debug(`updateCoordinate CoordinateType.MACHINE res: ${JSON.stringify(res1)}`);
             await this.sacpClient.getCurrentCoordinateInfo().then(async ({ coordinateSystemInfo }) => {
+                const xNow = coordinateSystemInfo.coordinates.find(item => item.key === Direction.X1).value;
+                const yNow = coordinateSystemInfo.coordinates.find(item => item.key === Direction.Y1).value;
                 const zNow = coordinateSystemInfo.coordinates.find(item => item.key === Direction.Z1).value;
-                log.debug(`current positions, ${zNow}, ${z}`);
+                log.debug(`current positions, (${xNow}, ${yNow}, ${zNow}), (${x}, ${y}, ${z})`);
+
                 // calculate the absolute distance on seperate axis, same reason with coordinate moving func 'coordinateMove'
+                const newCoord = [];
+                const setXCoord = () => {
+                    const newX = new CoordinateInfo(Direction.X1, xNow - x);
+                    newCoord.push(newX);
+                };
+                const setYCoord = () => {
+                    const newY = new CoordinateInfo(Direction.Y1, yNow - y);
+                    newCoord.push(newY);
+                };
+                const setZCoord = () => {
+                    const newZ = new CoordinateInfo(Direction.Z1, isRotate ? 0 : zNow - z);
+                    newCoord.push(newZ);
+                };
 
-                const newZ = new CoordinateInfo(Direction.Z1, isRotate ? 0 : zNow - z);
-                const newCoord = [newZ];
-                log.debug(`new positions, ${zNow - z}, ${JSON.stringify(newCoord)}`);
+                if (!isRotate) {
+                    typeof x !== 'undefined' && setXCoord();
+                    typeof y !== 'undefined' && setYCoord();
+                }
+                typeof z !== 'undefined' && setZCoord();
+                log.debug(`new positions, (${xNow - x}, ${yNow - y}, ${zNow - z}), ${JSON.stringify(newCoord)}`);
                 await this.sacpClient.updateCoordinate(CoordinateType.WORKSPACE);
                 const res = await this.sacpClient.setWorkOrigin(newCoord);
                 log.debug(`setAbsoluteWorkOrigin res:${JSON.stringify(res)}`);
@@ -1520,8 +1539,6 @@ class SacpChannelBase extends Channel implements
         const { laserToolHeadInfo } = await this.sacpClient.getLaserToolHeadInfo(headModule.key);
         log.debug(`laserFocalLength:${laserToolHeadInfo.laserFocalLength}, materialThickness: ${materialThickness}, platformHeight:${laserToolHeadInfo.platformHeight}`);
         await this.setAbsoluteWorkOrigin({
-            x: 0,
-            y: 0,
             z: laserToolHeadInfo.laserFocalLength + laserToolHeadInfo.platformHeight + materialThickness,
             isRotate
         });

diff --git a/src/server/services/machine/channels/SacpTcpChannel.ts b/src/server/services/machine/channels/SacpTcpChannel.ts
@@ -367,6 +367,7 @@ class SacpTcpChannel extends SacpChannelBase {
 
                     await this.sacpClient.updateCoordinate(CoordinateType.WORKSPACE);
 
+                    // Fixme: multi call to set work orign coordinate
                     if (isCameraCapture) {
                         const newX = new CoordinateInfo(Direction.X1, xNow);
                         const newY = new CoordinateInfo(Direction.Y1, yNow);