feat: adds probe accuracy support (#1365)

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
fluidd-core · Feb 18, 2024 · a72342a · a72342a
1 parent 61a58f7
commit a72342a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -206,7 +206,10 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
   }
 
   get printerSupportsProbeCalibrate (): boolean {
-    return 'probe' in this.printerSettings || 'bltouch' in this.printerSettings
+    return (
+      'probe' in this.printerSettings ||
+      'bltouch' in this.printerSettings
+    )
   }
 
   get printerSupportsZEndstopCalibrate (): boolean {
@@ -318,26 +321,31 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
     })
 
     if (this.printerSupportsProbeCalibrate) {
+      tools.push({
+        name: 'PROBE_ACCURACY',
+        disabled: !this.allHomed,
+        wait: this.$waits.onProbeAccuracy
+      })
       tools.push({
         name: 'PROBE_CALIBRATE',
         disabled: !this.allHomed,
         wait: this.$waits.onProbeCalibrate
       })
     }
 
-    if (this.printerSupportsBedScrewsCalculate) {
+    if (this.printerSupportsQuadGantryLevel) {
       tools.push({
-        name: 'SCREWS_TILT_CALCULATE',
+        name: 'QUAD_GANTRY_LEVEL',
         disabled: !this.allHomed || this.isManualProbeActive,
-        wait: this.$waits.onBedScrewsCalculate
+        wait: this.$waits.onQGL
       })
     }
 
-    if (this.printerSupportsQuadGantryLevel) {
+    if (this.printerSupportsBedScrewsCalculate) {
       tools.push({
-        name: 'QUAD_GANTRY_LEVEL',
+        name: 'SCREWS_TILT_CALCULATE',
         disabled: !this.allHomed || this.isManualProbeActive,
-        wait: this.$waits.onQGL
+        wait: this.$waits.onBedScrewsCalculate
       })
     }
 

diff --git a/src/globals.ts b/src/globals.ts
@@ -458,6 +458,7 @@ export const Waits = Object.freeze({
   onTimelapseSaveFrame: 'onTimelapseSaveFrame',
   onManualProbe: 'onManualProbe',
   onProbeCalibrate: 'onProbeCalibrate',
+  onProbeAccuracy: 'onProbeAccuracy',
   onZEndstopCalibrate: 'onZEndstopCalibrate',
   onQueryEndstops: 'onQueryEndstops',
   onQueryProbe: 'onQueryProbe',