From 19d0694b6c0ab7b22c53dc4a406796b14e5f3042 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Thu, 15 May 2025 22:16:25 +0530 Subject: [PATCH] probing dialog fix --- .../src/dialogs/ProbeDialog.svelte | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/svelte-components/src/dialogs/ProbeDialog.svelte b/src/svelte-components/src/dialogs/ProbeDialog.svelte index 33ded5c..1be754e 100644 --- a/src/svelte-components/src/dialogs/ProbeDialog.svelte +++ b/src/svelte-components/src/dialogs/ProbeDialog.svelte @@ -139,7 +139,7 @@ steps = [ enableSafety && !isRotaryActive ? "CheckProbe" : undefined, - probeType === "xyz" || isRotaryActive ? "BitDimensions" : undefined, + probeType === "xyz" ? "BitDimensions" : undefined, enableSafety ? "PlaceProbeBlock" : undefined, "Probe", "Done", @@ -150,26 +150,26 @@ } if (probeType === "xyz") { - await stepCompleted("BitDimensions", userAcknowledged); - localStorage.setItem( - "cutterDiameter", - numberWithUnit.normalize(cutterDiameterString) - ); - } - - if (isRotaryActive) { - await stepCompleted("BitDimensions", userAcknowledged); - localStorage.setItem( - "cutterDiameterRotary", - numberWithUnit.normalize(cutterDiameterRotaryString) - ); + if(isRotaryActive){ + await stepCompleted("BitDimensions", userAcknowledged); + localStorage.setItem( + "cutterDiameterRotary", + numberWithUnit.normalize(cutterDiameterRotaryString) + ); + } else { + await stepCompleted("BitDimensions", userAcknowledged); + localStorage.setItem( + "cutterDiameter", + numberWithUnit.normalize(cutterDiameterString) + ); + } } await stepCompleted("PlaceProbeBlock", userAcknowledged); await stepCompleted("Probe", probingComplete, probingFailed); await stepCompleted("Done", userAcknowledged); - if (probeType === "xyz" || isRotaryActive) { + if (probeType === "xyz" && !isRotaryActive) { ControllerMethods.gotoZero("xy"); } } catch (err) { @@ -250,7 +250,7 @@ break; case "BitDimensions": - nextButton.disabled = probeType === 'xyz' ? !isFinite(cutterDiameterMetric) : !isFinite(cutterDiameterRotaryMetric); + nextButton.disabled = isRotaryActive ? !isFinite(cutterDiameterRotaryMetric) : !isFinite(cutterDiameterMetric); break; case "Done": @@ -412,7 +412,7 @@ /> {/if} {:else if currentStep === "BitDimensions"} - {#if probeType === "xyz"} + {#if !isRotaryActive}