mirror of
https://github.com/luc-github/ESP3D-WEBUI.git
synced 2026-02-20 01:11:21 +01:00
Fix sensor not displayed since reporting is in stream instead of core
This commit is contained in:
BIN
dist/CNC/GRBL/index.html.gz
vendored
BIN
dist/CNC/GRBL/index.html.gz
vendored
Binary file not shown.
BIN
dist/CNC/GRBLHal/index.html.gz
vendored
BIN
dist/CNC/GRBLHal/index.html.gz
vendored
Binary file not shown.
BIN
dist/Printer3D/Marlin-embedded/index.html.gz
vendored
BIN
dist/Printer3D/Marlin-embedded/index.html.gz
vendored
Binary file not shown.
BIN
dist/Printer3D/Marlin/index.html.gz
vendored
BIN
dist/Printer3D/Marlin/index.html.gz
vendored
Binary file not shown.
BIN
dist/Printer3D/Repetier/index.html.gz
vendored
BIN
dist/Printer3D/Repetier/index.html.gz
vendored
Binary file not shown.
BIN
dist/Printer3D/Smoothieware/index.html.gz
vendored
BIN
dist/Printer3D/Smoothieware/index.html.gz
vendored
Binary file not shown.
BIN
dist/SandTable/GRBL/index.html.gz
vendored
BIN
dist/SandTable/GRBL/index.html.gz
vendored
Binary file not shown.
@@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
import { h } from "preact"
|
import { h } from "preact"
|
||||||
import { webUIbuild } from "../../targets"
|
import { webUIbuild } from "../../targets"
|
||||||
export const webUIversion = "3.0.0-a83"
|
export const webUIversion = "3.0.0-a84"
|
||||||
export const Esp3dVersion = () => (
|
export const Esp3dVersion = () => (
|
||||||
<span>
|
<span>
|
||||||
{webUIversion}.{webUIbuild}
|
{webUIversion}.{webUIbuild}
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ const ExtraInputControl = ({ element, index, size, pos }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const ExtraControlsPanel = () => {
|
const ExtraControlsPanel = () => {
|
||||||
const { temperatures, fanSpeed, flowRate, feedRate } = useTargetContext()
|
const { temperatures, fanSpeed, flowRate, feedRate, sensor } = useTargetContext()
|
||||||
const id = "extraControlsPanel"
|
const id = "extraControlsPanel"
|
||||||
const inputList = [
|
const inputList = [
|
||||||
{ name: "P91", list: fanSpeed },
|
{ name: "P91", list: fanSpeed },
|
||||||
@@ -346,7 +346,7 @@ const ExtraControlsPanel = () => {
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{temperatures["T"].length == 0 && (
|
{temperatures["T"].length == 0 && (!sensor.S || sensor.S.length == 0) && (
|
||||||
<div class="loading-panel">
|
<div class="loading-panel">
|
||||||
<div class="m-2">
|
<div class="m-2">
|
||||||
<div class="m-1">{T("P89")}</div>
|
<div class="m-1">{T("P89")}</div>
|
||||||
|
|||||||
@@ -226,6 +226,13 @@ const TargetContextProvider = ({ children }) => {
|
|||||||
value: cap.value,
|
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") {
|
} else if (type === "core") {
|
||||||
if (isSensor(data)) {
|
if (isSensor(data)) {
|
||||||
|
|||||||
@@ -237,6 +237,13 @@ const TargetContextProvider = ({ children }) => {
|
|||||||
value: cap.value,
|
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") {
|
} else if (type === "core") {
|
||||||
if (isSensor(data)) {
|
if (isSensor(data)) {
|
||||||
|
|||||||
@@ -195,6 +195,13 @@ const TargetContextProvider = ({ children }) => {
|
|||||||
value: cap.value,
|
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") {
|
} else if (type === "core") {
|
||||||
if (isSensor(data)) {
|
if (isSensor(data)) {
|
||||||
|
|||||||
@@ -191,6 +191,13 @@ const TargetContextProvider = ({ children }) => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
//console.log(printerCapabilities)
|
//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") {
|
} else if (type === "core") {
|
||||||
if (isSensor(data)) {
|
if (isSensor(data)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user