diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz index c64e0bcd..aaf436ca 100644 Binary files a/dist/CNC/GRBL/index.html.gz and b/dist/CNC/GRBL/index.html.gz differ diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz index 701d0fba..ee630504 100644 Binary files a/dist/CNC/GRBLHal/index.html.gz and b/dist/CNC/GRBLHal/index.html.gz differ diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz index 38b5ab2e..ec6495a4 100644 Binary files a/dist/Printer3D/Marlin-embedded/index.html.gz and b/dist/Printer3D/Marlin-embedded/index.html.gz differ diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz index d4d4c09f..12381962 100644 Binary files a/dist/Printer3D/Marlin/index.html.gz and b/dist/Printer3D/Marlin/index.html.gz differ diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz index 2ffe49e2..9151dfaf 100644 Binary files a/dist/Printer3D/Repetier/index.html.gz and b/dist/Printer3D/Repetier/index.html.gz differ diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz index 7a038a69..cfb77738 100644 Binary files a/dist/Printer3D/Smoothieware/index.html.gz and b/dist/Printer3D/Smoothieware/index.html.gz differ diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz index 54ecb488..8da3fb8b 100644 Binary files a/dist/SandTable/GRBL/index.html.gz and b/dist/SandTable/GRBL/index.html.gz differ diff --git a/src/components/App/version.js b/src/components/App/version.js index b979e36b..5b12bc08 100644 --- 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 = () => ( {webUIversion}.{webUIbuild} diff --git a/src/components/Panels/ExtraControls.js b/src/components/Panels/ExtraControls.js index 1c3f2f8c..1f074764 100644 --- 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 = () => { })} )} - {temperatures["T"].length == 0 && ( + {temperatures["T"].length == 0 && (!sensor.S || sensor.S.length == 0) && (
{T("P89")}
diff --git a/src/targets/Printer3D/Marlin-embedded/TargetContext.js b/src/targets/Printer3D/Marlin-embedded/TargetContext.js index 65eed938..4aee2d9c 100644 --- 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 index 44b16542..0696c014 100644 --- 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 index a133f4bc..69890b41 100644 --- 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 index 965cad89..33da7e98 100644 --- 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)) {