Fix sensor not displayed since reporting is in stream instead of core

luc-github · Dec 17, 2024 · 8858149 · 8858149
1 parent f9dbf5c
commit 8858149
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 3 deletions.
diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz
diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz
diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz
diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz
diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz
diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz
diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz
diff --git a/src/components/App/version.js b/src/components/App/version.js
@@ -17,7 +17,7 @@
 */
 import { h } from "preact"
 import { webUIbuild } from "../../targets"
-export const webUIversion = "3.0.0-a83"
+export const webUIversion = "3.0.0-a84"
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/components/Panels/ExtraControls.js b/src/components/Panels/ExtraControls.js
@@ -293,7 +293,7 @@ const ExtraInputControl = ({ element, index, size, pos }) => {
 }
 
 const ExtraControlsPanel = () => {
-    const { temperatures, fanSpeed, flowRate, feedRate } = useTargetContext()
+    const { temperatures, fanSpeed, flowRate, feedRate, sensor } = useTargetContext()
     const id = "extraControlsPanel"
     const inputList = [
         { name: "P91", list: fanSpeed },
@@ -346,7 +346,7 @@ const ExtraControlsPanel = () => {
                         })}
                     </div>
                 )}
-                {temperatures["T"].length == 0 && (
+                {temperatures["T"].length == 0 && (!sensor.S || sensor.S.length == 0) && (
                     <div class="loading-panel">
                         <div class="m-2">
                             <div class="m-1">{T("P89")}</div>

diff --git a/src/targets/Printer3D/Marlin-embedded/TargetContext.js b/src/targets/Printer3D/Marlin-embedded/TargetContext.js
@@ -226,6 +226,13 @@ const TargetContextProvider = ({ children }) => {
                         value: cap.value,
                     })
                 })
+            } else if (isSensor(data)) {
+                const result = getSensor(data)
+                setSensorData({ S: result })
+                add2SensorDataList({
+                    temperatures: { S: result },
+                    time: new Date(),
+                })
             }
         } else if (type === "core") {
             if (isSensor(data)) {

diff --git a/src/targets/Printer3D/Marlin/TargetContext.js b/src/targets/Printer3D/Marlin/TargetContext.js
@@ -237,6 +237,13 @@ const TargetContextProvider = ({ children }) => {
                         value: cap.value,
                     })
                 })
+            } else if (isSensor(data)) {
+                const result = getSensor(data)
+                setSensorData({ S: result })
+                add2SensorDataList({
+                    temperatures: { S: result },
+                    time: new Date(),
+                })
             }
         } else if (type === "core") {
             if (isSensor(data)) {

diff --git a/src/targets/Printer3D/Repetier/TargetContext.js b/src/targets/Printer3D/Repetier/TargetContext.js
@@ -195,6 +195,13 @@ const TargetContextProvider = ({ children }) => {
                         value: cap.value,
                     })
                 })
+            } else if (isSensor(data)) {
+                const result = getSensor(data)
+                setSensorData({ S: result })
+                add2SensorDataList({
+                    temperatures: { S: result },
+                    time: new Date(),
+                })
             }
         } else if (type === "core") {
             if (isSensor(data)) {

diff --git a/src/targets/Printer3D/Smoothieware/TargetContext.js b/src/targets/Printer3D/Smoothieware/TargetContext.js
@@ -191,6 +191,13 @@ const TargetContextProvider = ({ children }) => {
                     })
                 })
                 //console.log(printerCapabilities)
+            } else if (isSensor(data)) {
+                const result = getSensor(data)
+                setSensorData({ S: result })
+                add2SensorDataList({
+                    temperatures: { S: result },
+                    time: new Date(),
+                })
             }
         } else if (type === "core") {
             if (isSensor(data)) {