Merge branch 'master' of github-1randomdev:1RandomDev/xTool-Connect

Author: 1RandomDev

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+start.sh

main/app.js

@@ -116,7 +116,7 @@ app.whenReady().then(() => {
                     break;
             }
             window.webContents.send('websocket:message', data);
-        });
+        }, appSettings);
         if(result.result == 'ok' && appSettings.grblBridgeEnabled) {
             grblBridge.start(async data => {
                 switch(data.event) {
@@ -132,7 +132,7 @@ app.whenReady().then(() => {
                         break;
                 }
                 window.webContents.send('websocket:message', 'grbl:'+data.event);
-            });
+            }, appSettings, deviceController);
         }
         return result;
     });

main/device-controller.js

@@ -10,6 +10,7 @@ const DIRECTION_MAPPINGS = {
     'right': 'X'
 };
 
+let config;
 let deviceAddress;
 let connected;
 let websocket;
@@ -35,10 +36,11 @@ module.exports.setupWifi = async (credentials) => {
     return {result: 'fail'};
 };
 
-module.exports.connect = async (address, callback) => {
+module.exports.connect = async (address, callback, config_) => {
     if(connected) this.disconnect();
     deviceAddress = address;
     wsCallback = callback;
+    config = config_;
 
     try {
         let res = await axios.get(`http://${deviceAddress}:8080/ping`);
@@ -93,6 +95,11 @@ module.exports.connect = async (address, callback) => {
                 case 'ok:IDLE':
                     paused = false;
                     framing = false;
+                    laserDotActive = false;
+                    break;
+                case 'ok:WORKING_OFFLINE':
+                    framing = false;
+                    laserDotActive = false;
                     break;
                 case 'ok:WORKING_FRAMING':
                     framing = true;
@@ -257,30 +264,35 @@ module.exports.moveLaser = async (direction, distance, speed) => {
     }
 
     try {
+        let laserDotPower = config.laserSpotIntensity;
+        if(laserDotPower > 10) laserDotPower = 10;
+
         let gcode;
         if(direction == 'home') {
             gcode =
 `M17 S1
 M207 S0
-M106 S1
-M205 X424 Y400
 M28
 M18
 `;
         } else {
             gcode =
 `M17 S1
 M207 S0
-M106 S1
-M205 X424 Y400
 M101
 G92 X0 Y0
 G90
-G1 ${DIRECTION_MAPPINGS[direction]+distance} F${speed*60} S0
+G1 ${DIRECTION_MAPPINGS[direction]+distance} F${speed*60} S${laserDotActive ? laserDotPower*10 : 0}
 M18
 `;
         }
 
+        if(laserDotActive) {
+            let power = config.laserSpotIntensity;
+            if(power > 10) power = 10;
+            gcode += `M9 S${power*10} N1000000000000\n`;
+        }
+
         await this.executeGcode(gcode);
     } catch(err) {
         console.error('Moving laser failed failed:', err);
@@ -333,6 +345,21 @@ module.exports.getCurrentState = async () => {
     return state;
 };
 
+module.exports.dotModeActive = async () => {
+    if(!connected) {
+        console.error('Requesting current dot mode state failed: Not connected');
+        return;
+    }
+
+    try {
+        let res = await axios.get(`http://${deviceAddress}:8080/system?action=dotMode`);
+        return res.data.dotMode == 1;
+    } catch(err) {
+        console.error('Requesting current state failed:', err);
+    }
+    return false;
+}
+
 module.exports.getProgress = async () => {
     if(!connected) {
         console.error('Requesting current progress failed: Not connected');

main/grbl-bridge.js

@@ -2,9 +2,11 @@ const net = require('node:net');
 
 const GRBL_PORT = 2354;
 const GRBL_HOST = '127.0.0.1';
-let server, clients, callback;
+let server, clients, callback, config, deviceController;
 
-module.exports.start = (cb) => {
+module.exports.start = (cb, config_, deviceController_) => {
+    config = config_;
+    deviceController = deviceController_;
     callback = cb;
     if(server != null) return;
 
@@ -109,21 +111,34 @@ module.exports.stop = () => {
     server = null;
 };
 
-function fireCallback(data) {
+async function fireCallback(data) {
     if(data.event == 'complete') {
         if(data.gcode.length == 0) return;
 
+        const dotMode = await deviceController.dotModeActive();
+        let dotModePower = config.laserSpotIntensity;
+        if(dotModePower > 10) dotModePower = 10;
+
         if(!data.isProgram) {
+            if(dotMode) {
+                data.gcode = data.gcode.replace(/S0/g, '');
+            }
+
             data.gcode =
 `M17 S1
 M207 S${data.isProgram ? 1 : 0}
-M106 S${data.isProgram ? 0 : 1}
+M106 S${(data.isProgram || dotMode) ? 0 : 1}
 M205 X430 Y400
 M101
 G92 X0 Y0
 G0 F9600
-G1 F1000
-${data.gcode}M18`;
+G1 F1000${dotMode ? 'S'+(dotModePower*10) : ''}
+${data.gcode}M18
+`;
+        }
+
+        if(dotMode && deviceController.isLaserDotActive()) {
+            data.gcode += `M9 S${dotModePower*10} N1000000000000\n`;
         }
     }
     callback(data);

renderer/assets/js/control.js

@@ -99,6 +99,10 @@ stopBtn.addEventListener('click', () => {
                 currentStatus.innerText = 'Framing';
                 pauseBtn.disabled = true;
                 break;
+            case 'ok:WORKING_OFFLINE':
+                laserSpotActive = false;
+                updateLaserSpotBtn();
+                break;
             case 'ok:IDLE':
                 gcodeDropzone.classList.remove('disabled');
                 disableMoveButtons(false);
@@ -111,6 +115,8 @@ stopBtn.addEventListener('click', () => {
                 clearInterval(progressUpdateTimer);
                 progressUpdateTimer = null;
                 currentProgress.style.width = null;
+                laserSpotActive = false;
+                updateLaserSpotBtn();
                 break;
             case 'ok:PAUSING':
                 currentStatus.innerText = 'Paused';