Fix deadloop if no FW settings and has autopolling enabled

Author: Luc

dist/grbl/debug/index.html.gz

@@ -31,6 +31,7 @@ import {
     initApp,
     preferences,
     stopPolling,
+    startPolling,
     startWizard,
 } from "./settings"
 import { Header, ExtraPages } from "./header"
@@ -218,6 +219,7 @@ export {
     beepError,
     beep,
     stopPolling,
+    startPolling,
     finishSetup,
     disconnectPage,
     disconnectWsServer,

dist/grbl/production/index.html.gz

@@ -38,10 +38,17 @@ import {
     SendPostHttp,
     cancelCurrentQuery,
     lastError,
+    clearCommandList,
 } from "../http"
 import { useStoreon } from "storeon/preact"
 import { showDialog, updateProgress } from "../dialog"
-import { esp3dSettings, prefs, getPanelIndex } from "../app"
+import {
+    esp3dSettings,
+    prefs,
+    getPanelIndex,
+    stopPolling,
+    startPolling,
+} from "../app"
 /*
  * Local constants
  *
@@ -207,6 +214,7 @@ function sdSerialListSuccess(responseText) {}
  */
 function sdSerialListError(errorCode, responseText) {
     isSDListRequested = false
+    startPolling()
     fileSystemLoaded[currentFilesType] = false
     showDialog({ type: "error", numError: errorCode, message: T("S103") })
 }
@@ -218,8 +226,10 @@ function ListSDSerialFiles() {
     let cmd = listSDSerialFilesCmd()
     if (cmd) {
         console.log(cmd[0])
-        SendCommand(cmd[0], sdCheckSuccess, sdCheckError, null, "sdlist", 1)
         isSDListRequested = true
+        stopPolling()
+        clearCommandList()
+        SendCommand(cmd[0], sdCheckSuccess, sdCheckError, null, "sdlist", 1)
         listDataSize = 0
     }
 }
@@ -389,6 +399,7 @@ function processFiles(rawdata) {
         if (response) {
             if (data.indexOf(response[2]) != -1) {
                 isSDListRequested = false
+                startPolling()
                 isSDListDetected = false
                 fileSystemCache[currentFilesType] = []
                 fileSystemCache[currentFilesType].files = generateSDList(
@@ -405,6 +416,7 @@ function processFiles(rawdata) {
                 data.status = T("S111")
                 buildStatus(data)
                 isSDListRequested = false
+                startPolling()
                 isSDListDetected = false
                 //revert path to allow refresh
                 let pos = currentPath[currentFilesType].lastIndexOf("/")
@@ -720,7 +732,7 @@ function processCreateDir() {
 
 function startJobFile(source, filename) {
     console.log("print " + filename + " from " + source)
-    let cmd =""
+    let cmd = ""
     const { dispatch } = useStoreon()
     dispatch("status/print", T("P63"))
     switch (source) {
@@ -731,8 +743,11 @@ function startJobFile(source, filename) {
                 case "repetier":
                 case "marlin":
                 case "marlinkimbra":
-                    if((esp3dSettings.serialprotocol == "MKS") && ((source=="TFTSD") || (source=="TFTUSB"))) {
-                        if (source=="TFTSD") cmd = "M998 1\n"
+                    if (
+                        esp3dSettings.serialprotocol == "MKS" &&
+                        (source == "TFTSD" || source == "TFTUSB")
+                    ) {
+                        if (source == "TFTSD") cmd = "M998 1\n"
                         else cmd = "M998 0\n"
                     }
                     cmd += "M23 " + filename + "\nM24"

dist/printer/debug/index.html.gz

@@ -19,10 +19,17 @@
 */
 
 import { h, Fragment } from "preact"
-import { Setting, esp3dSettings, prefs, beep } from "../app"
+import {
+    Setting,
+    esp3dSettings,
+    prefs,
+    beep,
+    startPolling,
+    stopPolling,
+} from "../app"
 import { useEffect } from "preact/hooks"
 import { T } from "../translations"
-import { SendCommand } from "../http"
+import { SendCommand, clearCommandList } from "../http"
 import { JogPanel, processPositions } from "./jog"
 import { TemperaturesPanel, processTemperatures } from "./temperatures"
 import { FeedratePanel, processFeedRate } from "./feedrate"
@@ -688,6 +695,7 @@ function processWSData(buffer) {
                 }
                 isConfigData = false
                 isConfigRequested = false
+                startPolling()
                 if (
                     buffer.startsWith(configurationCmd(isoverloadedconfig)[2])
                 ) {
@@ -802,6 +810,8 @@ function processConfigData() {
  */
 function timeoutError() {
     stopTimeout()
+    startPolling()
+    isConfigRequested = false
     showDialog({ type: "error", numError: 404, message: T("P17") })
 }
 
@@ -820,16 +830,18 @@ function stopTimeout() {
     if (timeoutLoader != null) {
         clearInterval(timeoutLoader)
     }
-    timeoutLoader = null
 }
 
 /*
  * Load Firmware settings
  */
 function loadConfig() {
     const cmd = configurationCmd(isoverloadedconfig)[0]
+    stopPolling()
+    console.log("***************************************");
     isloaded = true
     isConfigRequested = true
+    clearCommandList()
     isConfigData = false
     configDataSize = 0
     listrawSettings = []
@@ -845,6 +857,7 @@ function loadConfig() {
 function loadConfigError(errorCode, responseText) {
     isConfigRequested = false
     isConfigData = false
+    startPolling()
     showDialog({ type: "error", numError: errorCode, message: T("S5") })
 }
 

dist/printer/production/index.html.gz

@@ -121,9 +121,12 @@ function processStatus(buffer) {
             //M994 filename;size
             let status = buffer.split(" ")
             printFileName = status[1].split(";")[0]
-            if (printFileName.startsWith("0:") || printFileName.startsWith("1:")){
-               let f = printFileName.replace("0:", "USB:")
-               printFileName = f.replace("1:", "SD:")
+            if (
+                printFileName.startsWith("0:") ||
+                printFileName.startsWith("1:")
+            ) {
+                let f = printFileName.replace("0:", "USB:")
+                printFileName = f.replace("1:", "SD:")
             }
             dispatch("status/print", printFileName + lastStatus)
             lastStatusReset = 0

src/components/app.js

@@ -32,6 +32,7 @@ import {
     setcurrentprefs,
     initApp,
     stopPolling,
+    startPolling,
 } from "./webui"
 import { Esp3DSettings } from "./esp3d"
 import { useStoreon } from "storeon/preact"
@@ -69,5 +70,6 @@ export {
     setcurrentprefs,
     initApp,
     stopPolling,
+    startPolling,
     startWizard,
 }

src/components/printer/files.js

@@ -38,6 +38,7 @@ import {
     cancelCurrentQuery,
     SendGetHttp,
     SendPostHttp,
+    clearCommandList,
 } from "../http"
 import { useStoreon } from "storeon/preact"
 import { useEffect } from "preact/hooks"
@@ -127,6 +128,7 @@ function stopPolling() {
         clearInterval(pollingInterval)
     }
     pollingInterval = null
+    console.log("Stop polling")
 }
 
 /*
@@ -1984,6 +1986,7 @@ export {
     prefs,
     WebUISettings,
     stopPolling,
+    startPolling,
     macros,
     LanguageSelection,
 }