diff --git a/electron/src/machines/extruder/HeatingZone.tsx b/electron/src/machines/extruder/HeatingZone.tsx index bb9c7b0c..3b9e5bc7 100644 --- a/electron/src/machines/extruder/HeatingZone.tsx +++ b/electron/src/machines/extruder/HeatingZone.tsx @@ -16,6 +16,7 @@ type Props = { min: number; max: number; onChangeTargetTemp?: (temperature: number) => void; + targetTemperatureEnabled: boolean; }; export function HeatingZone({ title, @@ -25,6 +26,7 @@ export function HeatingZone({ heatingTimeSeries, heatingPower, onChangeTargetTemp, + targetTemperatureEnabled, }: Props) { const targetTemperature = heatingState?.target_temperature ?? 150; @@ -41,19 +43,20 @@ export function HeatingZone({ timeseries={heatingTimeSeries} /> - - + {targetTemperatureEnabled && ( + + )} - {heatingState?.wiring_error && ( + {heatingState?.wiring_error && targetTemperatureEnabled && ( Cant Read Temperature! Check Temperature Sensor Wiring! diff --git a/electron/src/machines/extruder/extruder2/Extruder2ControlPage.tsx b/electron/src/machines/extruder/extruder2/Extruder2ControlPage.tsx index bee23818..c0c08835 100644 --- a/electron/src/machines/extruder/extruder2/Extruder2ControlPage.tsx +++ b/electron/src/machines/extruder/extruder2/Extruder2ControlPage.tsx @@ -68,10 +68,12 @@ export function Extruder2ControlPage() { backTemperature.current?.value ?? 0, state?.heating_states.back.target_temperature ?? 1, ); - const nozzleReady = isZoneReadyForExtrusion( - nozzleTemperature.current?.value ?? 0, - state?.heating_states.nozzle.target_temperature ?? 1, - ); + const nozzleReady = + !state?.extruder_settings_state.nozzle_temperature_target_enabled || + isZoneReadyForExtrusion( + nozzleTemperature.current?.value ?? 0, + state?.heating_states.nozzle.target_temperature ?? 1, + ); return frontReady && middleReady && backReady && nozzleReady; }; @@ -87,6 +89,7 @@ export function Extruder2ControlPage() { onChangeTargetTemp={setFrontHeatingTemperature} min={0} max={300} + targetTemperatureEnabled={true} /> {state?.inverter_status_state.overload_warning == true ? ( diff --git a/electron/src/machines/extruder/extruder2/Extruder2Settings.tsx b/electron/src/machines/extruder/extruder2/Extruder2Settings.tsx index 2184b4fc..71f13ff9 100644 --- a/electron/src/machines/extruder/extruder2/Extruder2Settings.tsx +++ b/electron/src/machines/extruder/extruder2/Extruder2Settings.tsx @@ -20,6 +20,7 @@ export function Extruder2SettingsPage() { setPressurePidKi, setPressurePidKd, setTemperaturePidValue, + setTemperatureTargetEnabled, } = useExtruder2(); const [showAdvanced, setShowAdvanced] = useState(false); @@ -68,6 +69,16 @@ export function Extruder2SettingsPage() { onChange={setExtruderPressureLimitEnabled} /> + +