Skip to content

Commit 8858149

Browse files
committed
Fix sensor not displayed since reporting is in stream instead of core
1 parent f9dbf5c commit 8858149

File tree

13 files changed

+31
-3
lines changed

13 files changed

+31
-3
lines changed

dist/CNC/GRBL/index.html.gz

-4 Bytes
Binary file not shown.

dist/CNC/GRBLHal/index.html.gz

-4 Bytes
Binary file not shown.
27 Bytes
Binary file not shown.
35 Bytes
Binary file not shown.
26 Bytes
Binary file not shown.
26 Bytes
Binary file not shown.

dist/SandTable/GRBL/index.html.gz

-5 Bytes
Binary file not shown.

src/components/App/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
import { h } from "preact"
1919
import { webUIbuild } from "../../targets"
20-
export const webUIversion = "3.0.0-a83"
20+
export const webUIversion = "3.0.0-a84"
2121
export const Esp3dVersion = () => (
2222
<span>
2323
{webUIversion}.{webUIbuild}

src/components/Panels/ExtraControls.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ const ExtraInputControl = ({ element, index, size, pos }) => {
293293
}
294294

295295
const ExtraControlsPanel = () => {
296-
const { temperatures, fanSpeed, flowRate, feedRate } = useTargetContext()
296+
const { temperatures, fanSpeed, flowRate, feedRate, sensor } = useTargetContext()
297297
const id = "extraControlsPanel"
298298
const inputList = [
299299
{ name: "P91", list: fanSpeed },
@@ -346,7 +346,7 @@ const ExtraControlsPanel = () => {
346346
})}
347347
</div>
348348
)}
349-
{temperatures["T"].length == 0 && (
349+
{temperatures["T"].length == 0 && (!sensor.S || sensor.S.length == 0) && (
350350
<div class="loading-panel">
351351
<div class="m-2">
352352
<div class="m-1">{T("P89")}</div>

src/targets/Printer3D/Marlin-embedded/TargetContext.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,13 @@ const TargetContextProvider = ({ children }) => {
226226
value: cap.value,
227227
})
228228
})
229+
} else if (isSensor(data)) {
230+
const result = getSensor(data)
231+
setSensorData({ S: result })
232+
add2SensorDataList({
233+
temperatures: { S: result },
234+
time: new Date(),
235+
})
229236
}
230237
} else if (type === "core") {
231238
if (isSensor(data)) {

0 commit comments

Comments
 (0)