Minor bugfixes

Author: 1RandomDev

main/app.js

@@ -111,19 +111,19 @@ app.whenReady().then(() => {
                 case 'err:limitCheck':
                     desktopNotification({body: 'Limit reached!\nThe current job was aborted because a limit switch was activated.', urgency: 'critical'});
                     break;
-                case 'grbl:complete':
-                    desktopNotification({body: 'LightBurn upload complete!\nou can now start the job by pressing the start button on the device.'});
-                    break;
-                case 'grbl:timeout':
-                    desktopNotification({body: 'LightBurn upload failed!\nFile could not be sent to the device.'});
-                    break;
             }
             window.webContents.send('websocket:message', data);
         });
         if(result.result == 'ok' && appSettings.grblBridgeEnabled) {
             grblBridge.start(async data => {
-                if(data.event == 'complete') {
-                    await deviceController.uploadGcode(data.gcode, data.isProgram ? 1 : 0);
+                switch(data.event) {
+                    case 'complete':
+                        await deviceController.uploadGcode(data.gcode, data.isProgram ? 1 : 0);
+                        desktopNotification({body: 'LightBurn upload complete!\nou can now start the job by pressing the start button on the device.'});
+                        break;
+                    case 'timeout':
+                        desktopNotification({body: 'LightBurn upload failed!\nFile could not be sent to the device.'});
+                        break;
                 }
                 window.webContents.send('websocket:message', 'grbl:'+data.event);
             });

renderer/assets/js/control.js

@@ -28,7 +28,7 @@ gcodeDropzone.addEventListener('drop', (event) => {
 gcodeDropzone.addEventListener('click', (event) => {
     let input = document.createElement('input');
     input.type = 'file';
-    input.accept = '.gcode';
+    input.accept = '.gcode,.gc,.g';
     input.onchange = () => {
         handleUpload(input.files[0])
     };
@@ -81,20 +81,23 @@ stopBtn.addEventListener('click', () => {
     laserSpotIntensity.value = settings.laserSpotIntensity;
 
     window.electronAPI.onWebsocketMessage(data => {
+        if(data == 'ok:WORKING_OFFLINE' || data == 'ok:WORKING_FRAMING') {
+            gcodeDropzone.classList.add('disabled');
+            disableMoveButtons(true);
+            pauseBtn.disabled = false;
+            stopBtn.disabled = false;
+            currentStatus.innerText = 'Working';
+            pauseBtn.innerText = 'Pause';
+            pauseBtn.value = 'pause';
+            if(!progressUpdateTimer) {
+                updateProgress();
+                progressUpdateTimer = setInterval(updateProgress, 5000);
+            }
+        }
         switch(data) {
-            case 'ok:WORKING_OFFLINE':
             case 'ok:WORKING_FRAMING':
-                gcodeDropzone.classList.add('disabled');
-                disableMoveButtons(true);
-                pauseBtn.disabled = false;
-                stopBtn.disabled = false;
-                currentStatus.innerText = 'Working';
-                pauseBtn.innerText = 'Pause';
-                pauseBtn.value = 'pause';
-                if(!progressUpdateTimer) {
-                    updateProgress();
-                    progressUpdateTimer = setInterval(updateProgress, 5000);
-                }
+                currentStatus.innerText = 'Framing';
+                pauseBtn.disabled = true;
                 break;
             case 'ok:IDLE':
                 gcodeDropzone.classList.remove('disabled');
@@ -116,9 +119,6 @@ stopBtn.addEventListener('click', () => {
                 clearInterval(progressUpdateTimer);
                 progressUpdateTimer = null;
                 break;
-            case 'ok:WORKING_FRAMING':
-                currentStatus.innerText = 'Framing';
-                break;
             case 'WORK_STOPED':
                 toastr.error('The current job was canceled either by the user or due to an error.', 'Job canceled');
                 break;