From 276f7cd3cb1f11caba6b5f1cbfc0f7e0b433dba7 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Tue, 10 Jan 2023 11:50:00 +0000
Subject: [PATCH 1/5] feat: adds new Screws Tilt Adjust helper dialog

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 components.d.ts                               |   1 +
 .../common/BedScrewsAdjustDialog.vue          |  14 +--
 .../common/ScrewsTiltAdjustDialog.vue         | 110 ++++++++++++++++++
 src/components/settings/ToolheadSettings.vue  |  25 ++++
 .../widgets/bedmesh/BedMeshControls.vue       |   2 +-
 .../widgets/toolhead/ToolheadCard.vue         |  38 +++++-
 src/globals.ts                                |   8 +-
 src/locales/en.yaml                           |   5 +
 src/mixins/toolhead.ts                        |   4 +
 src/store/config/state.ts                     |   1 +
 src/store/config/types.ts                     |   1 +
 src/store/printer/actions.ts                  |   3 +
 src/store/printer/getters.ts                  |  68 +++++++++--
 src/store/printer/mutations.ts                |   4 +
 src/store/printer/state.ts                    |   1 +
 src/store/printer/types.ts                    |  27 +++++
 16 files changed, 288 insertions(+), 24 deletions(-)
 create mode 100644 src/components/common/ScrewsTiltAdjustDialog.vue

diff --git a/components.d.ts b/components.d.ts
index 0005c39471..d153981e3e 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -55,6 +55,7 @@ declare module 'vue' {
     RolloverLogsDialog: typeof import('./src/components/common/RolloverLogsDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    ScrewsTiltAdjustDialog: typeof import('./src/components/common/ScrewsTiltAdjustDialog.vue')['default']
     SocketDisconnected: typeof import('./src/components/common/SocketDisconnected.vue')['default']
     SystemCommands: typeof import('./src/components/common/SystemCommands.vue')['default']
     SystemControl: typeof import('./src/components/common/SystemControl.vue')['default']
diff --git a/src/components/common/BedScrewsAdjustDialog.vue b/src/components/common/BedScrewsAdjustDialog.vue
index aa7dace41d..f41967bf9a 100644
--- a/src/components/common/BedScrewsAdjustDialog.vue
+++ b/src/components/common/BedScrewsAdjustDialog.vue
@@ -91,15 +91,15 @@
 import { Component, Mixins, VModel, Watch } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import ToolheadMixin from '@/mixins/toolhead'
-import { startCase } from 'lodash-es'
+import type { BedScrews } from '@/store/printer/types'
 
 @Component({})
 export default class BedScrewsAdjustDialog extends Mixins(StateMixin, ToolheadMixin) {
   @VModel({ type: Boolean, default: false })
     open!: boolean
 
-  get bedScrews () {
-    return this.$store.getters['printer/getBedScrews']
+  get bedScrews (): BedScrews[] {
+    return this.$store.getters['printer/getBedScrews'] as BedScrews[]
   }
 
   get bedScrewsAdjust () {
@@ -115,13 +115,7 @@ export default class BedScrewsAdjustDialog extends Mixins(StateMixin, ToolheadMi
   }
 
   get currentScrewName () {
-    return startCase(this.bedScrews[this.currentScrewIndex].name || this.$t('app.general.label.screw_number', { index: this.currentScrewIndex + 1 }))
-  }
-
-  get currentScrewPosition () {
-    const [x, y] = this.bedScrews[this.currentScrewIndex][this.currentState]
-
-    return `${x}, ${y}`
+    return this.bedScrews[this.currentScrewIndex].prettyName
   }
 
   get acceptedScrews () {
diff --git a/src/components/common/ScrewsTiltAdjustDialog.vue b/src/components/common/ScrewsTiltAdjustDialog.vue
new file mode 100644
index 0000000000..cd461b4943
--- /dev/null
+++ b/src/components/common/ScrewsTiltAdjustDialog.vue
@@ -0,0 +1,110 @@
+<template>
+  <app-dialog
+    v-model="open"
+    :title="$t('app.tool.title.screws_tilt_adjust')"
+    max-width="500"
+    @save="retry"
+  >
+    <div class="overflow-y-auto">
+      <v-simple-table>
+        <thead>
+          <tr>
+            <th>{{ $t('app.general.label.name') }}</th>
+            <th class="text-right">
+              Z
+            </th>
+            <th>&nbsp;</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr
+            v-for="screw in screwsTiltAdjust.screws"
+            :key="screw.name"
+          >
+            <td>
+              {{ screw.prettyName }}<br>
+              <small class="secondary--text">{{ `X = ${screw.x}, Y = ${screw.y}` }}</small>
+            </td>
+            <td class="focus--text text-right">
+              {{ screw.z.toFixed(4) }}
+            </td>
+            <td class="text-right">
+              <v-chip
+                v-if="screw.is_base"
+                small
+                label
+              >
+                {{ $t('app.bedmesh.label.base') }}
+              </v-chip>
+              <v-chip
+                v-else-if="screw.adjust === '00:00'"
+                color="success"
+                small
+                label
+              >
+                <v-icon
+                  left
+                  small
+                >
+                  $success
+                </v-icon>
+                {{ screw.adjust }}
+              </v-chip>
+              <v-chip
+                v-else
+                color="error"
+                small
+                label
+              >
+                <v-icon
+                  left
+                  small
+                >
+                  {{ screw.sign === 'CW' ? '$zRotateClockwise' : '$zRotateCounterclockwise' }}
+                </v-icon>
+                {{ screw.adjust }}
+              </v-chip>
+            </td>
+          </tr>
+        </tbody>
+      </v-simple-table>
+    </div>
+
+    <template #actions>
+      <v-spacer />
+
+      <app-btn
+        color="primary"
+        type="submit"
+      >
+        {{ $t('app.general.btn.retry') }}
+      </app-btn>
+    </template>
+  </app-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, VModel } from 'vue-property-decorator'
+import StateMixin from '@/mixins/state'
+import ToolheadMixin from '@/mixins/toolhead'
+import type { ScrewsTiltAdjust } from '@/store/printer/types'
+
+@Component({})
+export default class ScrewsTiltAdjustDialog extends Mixins(StateMixin, ToolheadMixin) {
+  @VModel({ type: Boolean, default: false })
+    open!: boolean
+
+  get screwsTiltAdjust (): ScrewsTiltAdjust {
+    return this.$store.getters['printer/getScrewsTiltAdjust'] as ScrewsTiltAdjust
+  }
+
+  retry () {
+    this.sendGcode('SCREWS_TILT_CALCULATE', this.$waits.onBedScrewsCalculate)
+    this.open = false
+  }
+
+  destroyed () {
+    this.$store.commit('printer/setClearScrewsTiltAdjust')
+  }
+}
+</script>
diff --git a/src/components/settings/ToolheadSettings.vue b/src/components/settings/ToolheadSettings.vue
index 65f0986f77..8aece56160 100644
--- a/src/components/settings/ToolheadSettings.vue
+++ b/src/components/settings/ToolheadSettings.vue
@@ -281,6 +281,19 @@
 
       <v-divider />
 
+      <app-setting
+        :title="$t('app.setting.label.show_screws_tilt_adjust_dialog_automatically')"
+        :sub-title="$t('app.setting.tooltip.show_screws_tilt_adjust_dialog_automatically')"
+      >
+        <v-switch
+          v-model="showScrewsTiltAdjustDialogAutomatically"
+          hide-details
+          class="mt-0 mb-4"
+        />
+      </app-setting>
+
+      <v-divider />
+
       <template v-if="printerSupportsForceMove">
         <app-setting :title="$t('app.setting.label.force_move_toggle_warning')">
           <v-switch
@@ -559,6 +572,18 @@ export default class ToolHeadSettings extends Mixins(ToolheadMixin) {
     })
   }
 
+  get showScrewsTiltAdjustDialogAutomatically () {
+    return this.$store.state.config.uiSettings.general.showScrewsTiltAdjustDialogAutomatically
+  }
+
+  set showScrewsTiltAdjustDialogAutomatically (value: boolean) {
+    this.$store.dispatch('config/saveByPath', {
+      path: 'uiSettings.general.showScrewsTiltAdjustDialogAutomatically',
+      value,
+      server: true
+    })
+  }
+
   get forceMoveToggleWarning () {
     return this.$store.state.config.uiSettings.general.forceMoveToggleWarning
   }
diff --git a/src/components/widgets/bedmesh/BedMeshControls.vue b/src/components/widgets/bedmesh/BedMeshControls.vue
index 735f7b4741..e5fd5cc387 100644
--- a/src/components/widgets/bedmesh/BedMeshControls.vue
+++ b/src/components/widgets/bedmesh/BedMeshControls.vue
@@ -19,7 +19,7 @@
     </template>
 
     <template v-if="bedMeshProfiles.length > 0">
-      <v-simple-table class="no-hover">
+      <v-simple-table>
         <thead>
           <tr>
             <th>{{ $t('app.general.label.name') }}</th>
diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
index 81c14d1834..59031bb84b 100644
--- a/src/components/widgets/toolhead/ToolheadCard.vue
+++ b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -140,6 +140,11 @@
       v-if="bedScrewsAdjustDialogOpen"
       v-model="bedScrewsAdjustDialogOpen"
     />
+
+    <screws-tilt-adjust-dialog
+      v-if="screwsTiltAdjustDialogOpen"
+      v-model="screwsTiltAdjustDialogOpen"
+    />
   </collapsable-card>
 </template>
 
@@ -166,6 +171,7 @@ type Tool = {
 export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
   manualProbeDialogOpen = false
   bedScrewsAdjustDialogOpen = false
+  screwsTiltAdjustDialogOpen = false
 
   @Prop({ type: Boolean, default: false })
   readonly menuCollapsed!: boolean
@@ -355,26 +361,50 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
     return this.$store.state.config.uiSettings.general.showBedScrewsAdjustDialogAutomatically
   }
 
+  get showScrewsTiltAdjustDialogAutomatically () {
+    return this.$store.state.config.uiSettings.general.showScrewsTiltAdjustDialogAutomatically
+  }
+
   get forceMove () {
     return this.$store.state.config.uiSettings.toolhead.forceMove
   }
 
   @Watch('isManualProbeActive')
   onIsManualProbeActive (value: boolean) {
-    if (value && this.showManualProbeDialogAutomatically &&
-      this.klippyReady && !this.printerPrinting) {
+    if (
+      value &&
+      this.showManualProbeDialogAutomatically &&
+      this.klippyReady &&
+      !this.printerPrinting
+    ) {
       this.manualProbeDialogOpen = true
     }
   }
 
   @Watch('isBedScrewsAdjustActive')
   onIsBedScrewsAdjustActive (value: boolean) {
-    if (value && this.showBedScrewsAdjustDialogAutomatically &&
-      this.klippyReady && !this.printerPrinting) {
+    if (
+      value &&
+      this.showBedScrewsAdjustDialogAutomatically &&
+      this.klippyReady &&
+      !this.printerPrinting
+    ) {
       this.bedScrewsAdjustDialogOpen = true
     }
   }
 
+  @Watch('hasScrewsTiltAdjustResults')
+  onHasScrewsTiltAdjustResults (value: boolean) {
+    if (
+      value &&
+      this.showScrewsTiltAdjustDialogAutomatically &&
+      this.klippyReady &&
+      !this.printerPrinting
+    ) {
+      this.screwsTiltAdjustDialogOpen = true
+    }
+  }
+
   async toggleForceMove () {
     if (!this.forceMove && this.$store.state.config.uiSettings.general.forceMoveToggleWarning) {
       const result = await this.$confirm(
diff --git a/src/globals.ts b/src/globals.ts
index dfa611e372..5db80bd97d 100644
--- a/src/globals.ts
+++ b/src/globals.ts
@@ -147,7 +147,9 @@ import {
   mdiContentDuplicate,
   mdiArchiveLock,
   mdiFileImage,
-  mdiGauge
+  mdiGauge,
+  mdiRotateLeft,
+  mdiRotateRight
 } from '@mdi/js'
 
 const mdiFilament = 'M 12 2 C 11.811244 2.0027 11.62182 2.01009 11.433594 2.0234375 C 11.245368 2.0367892 11.058338 2.0560871 10.871094 2.0800781 C 10.528376 2.1223311 10.188076 2.1823072 9.8515625 2.2597656 C 9.4050859 2.3584685 8.9659029 2.4876777 8.5371094 2.6464844 C 8.2433457 2.7507726 7.9546177 2.8687402 7.671875 3 L 7.6699219 3 C 7.2200923 3.2179359 6.7872406 3.4692919 6.375 3.7519531 C 6.1149723 3.9281592 5.8633915 4.1165194 5.6210938 4.3164062 C 5.2734281 4.6063526 4.9458497 4.9195737 4.640625 5.2539062 C 4.4299712 5.4884886 4.2305306 5.7329027 4.0429688 5.9863281 C 4.0007188 6.0418801 3.9590487 6.0978726 3.9179688 6.1542969 C 3.7241339 6.4206091 3.543575 6.6963363 3.3769531 6.9804688 C 3.3651531 7.0019097 3.3534369 7.0233949 3.3417969 7.0449219 C 2.9828732 7.6642764 2.691488 8.3203821 2.4726562 9.0019531 C 2.3383154 9.4325109 2.233258 9.8716656 2.1582031 10.316406 C 2.1085032 10.625133 2.0733024 10.936022 2.0527344 11.248047 L 2.0527344 11.25 L 2.0527344 11.251953 L 2.0527344 11.253906 L 2.0527344 11.255859 C 2.0258944 11.502973 2.00832 11.751383 2 12 C 2.000879 12.252257 2.0113 12.504391 2.03125 12.755859 L 2.0332031 12.767578 C 2.0566631 13.076458 2.0944624 13.384082 2.1464844 13.689453 C 2.2214943 14.129536 2.3258985 14.564103 2.4589844 14.990234 C 2.5675343 15.334756 2.6946769 15.673142 2.8398438 16.003906 L 2.8457031 16.017578 L 2.8535156 16.03125 C 2.9986205 16.362102 3.1616911 16.684839 3.3417969 16.998047 L 3.34375 17 C 3.5265728 17.317394 3.7267926 17.624495 3.9433594 17.919922 C 4.1600882 18.215026 4.3928602 18.498004 4.640625 18.767578 C 4.9426097 19.096141 5.2662503 19.404121 5.609375 19.689453 C 5.8509948 19.889955 6.1019244 20.078968 6.3613281 20.255859 C 6.7778367 20.540458 7.2152833 20.793132 7.6699219 21.011719 L 7.671875 21.011719 C 7.9543247 21.147608 8.2431027 21.27014 8.5371094 21.378906 C 8.956542 21.533797 9.3858911 21.660384 9.8222656 21.757812 L 9.8242188 21.757812 C 10.165943 21.833832 10.511518 21.891861 10.859375 21.931641 C 10.885405 21.935041 10.91144 21.938206 10.9375 21.941406 C 11.290376 21.979776 11.645044 21.99934 12 22 C 12.188756 21.9973 12.37818 21.98991 12.566406 21.976562 C 12.754632 21.963215 12.941662 21.943912 13.128906 21.919922 C 13.471624 21.877672 13.811924 21.817693 14.148438 21.740234 C 14.594914 21.641534 15.034096 21.512323 15.462891 21.353516 C 15.756653 21.249229 16.045381 21.131261 16.328125 21 L 16.330078 21 C 16.779908 20.782064 17.21276 20.530708 17.625 20.248047 C 17.885029 20.07184 18.136608 19.883481 18.378906 19.683594 C 18.726573 19.393647 19.054149 19.080425 19.359375 18.746094 C 19.570029 18.511511 19.76947 18.267097 19.957031 18.013672 C 19.999281 17.958122 20.040951 17.902127 20.082031 17.845703 C 20.275866 17.57939 20.456425 17.303665 20.623047 17.019531 C 20.634847 16.998091 20.646563 16.976598 20.658203 16.955078 C 21.017127 16.335724 21.308511 15.679617 21.527344 14.998047 C 21.661685 14.567489 21.766742 14.128334 21.841797 13.683594 C 21.891497 13.374867 21.926698 13.063978 21.947266 12.751953 L 21.947266 12.75 L 21.947266 12.748047 L 21.947266 12.746094 L 21.947266 12.744141 C 21.974096 12.496824 21.99169 12.248617 22 12 C 21.999121 11.747743 21.9887 11.495609 21.96875 11.244141 L 21.966797 11.232422 C 21.943337 10.923542 21.905537 10.615918 21.853516 10.310547 C 21.778506 9.8704641 21.6741 9.4358974 21.541016 9.0097656 C 21.432464 8.6652447 21.305324 8.3268573 21.160156 7.9960938 L 21.154297 7.9824219 L 21.146484 7.96875 C 21.001384 7.6379017 20.838309 7.315161 20.658203 7.0019531 L 20.65625 7 C 20.47338 6.6826091 20.273207 6.375505 20.056641 6.0800781 C 19.839912 5.7849746 19.60714 5.5019958 19.359375 5.2324219 C 19.05739 4.903859 18.73375 4.5958783 18.390625 4.3105469 C 18.149005 4.1100449 17.898076 3.921033 17.638672 3.7441406 C 17.222163 3.459542 16.784717 3.2068671 16.330078 2.9882812 L 16.328125 2.9882812 C 16.045675 2.8523915 15.756897 2.72986 15.462891 2.6210938 C 15.043458 2.4662029 14.614109 2.3396166 14.177734 2.2421875 L 14.175781 2.2421875 C 13.834058 2.1661636 13.488482 2.1081404 13.140625 2.0683594 C 13.114595 2.0649994 13.08856 2.0617537 13.0625 2.0585938 C 12.709629 2.0202237 12.354956 2.0006604 12 2 z M 10.701172 4.25 L 10.957031 4.3984375 L 11.066406 4.4609375 L 11.132812 4.5 L 11.566406 4.75 L 11.566406 5.75 L 11.132812 6 L 10.875 6.1484375 C 10.874877 6.1490598 10.875123 6.1497684 10.875 6.1503906 L 10.701172 6.25 L 10.267578 6 L 9.8359375 5.75 L 9.8359375 4.75 L 10.103516 4.5957031 L 10.701172 4.25 z M 13.298828 4.25 L 14.164062 4.75 L 14.164062 5.75 L 13.298828 6.25 L 12.433594 5.75 L 12.433594 4.75 L 13.298828 4.25 z M 8.8398438 4.6757812 L 8.96875 4.75 L 8.96875 5.75 L 8.5371094 6 L 8.1035156 6.25 L 7.2382812 5.75 L 7.2382812 5.578125 C 7.7356888 5.2168041 8.2730923 4.9140239 8.8398438 4.6757812 z M 15.160156 4.6757812 C 15.726909 4.914025 16.264309 5.2168044 16.761719 5.578125 L 16.761719 5.75 L 16.103516 6.1308594 L 15.896484 6.25 L 15.03125 5.75 L 15.03125 4.75 L 15.160156 4.6757812 z M 6.8046875 6.5 L 7.6699219 7 L 7.6699219 8 L 6.8046875 8.5 L 6.7011719 8.4394531 L 5.9394531 8 L 5.9394531 7.75 L 5.9394531 7 L 6.8046875 6.5 z M 9.4023438 6.5 L 10.267578 7 L 10.267578 7.8398438 L 10.267578 8 L 10.140625 8.0742188 L 9.8339844 8.25 L 9.4023438 8.5 L 8.9707031 8.25 L 8.5371094 8 L 8.5371094 7 L 8.96875 6.75 L 9.4023438 6.5 z M 12 6.5 L 12.865234 7 L 12.865234 7.75 L 12.865234 8 L 12.744141 8.0703125 C 12.743508 8.0701923 12.74282 8.0704324 12.742188 8.0703125 C 12.497492 8.0239396 12.249054 8.0001594 12 8 C 11.754037 8.00282 11.508857 8.0283149 11.267578 8.0761719 L 11.134766 8 L 11.134766 7.25 L 11.134766 7 L 11.896484 6.5605469 L 12 6.5 z M 14.597656 6.5 L 15.029297 6.75 L 15.462891 7 L 15.462891 8 L 14.597656 8.5 L 14.166016 8.25 L 13.732422 8 L 13.732422 7 L 14.166016 6.75 L 14.597656 6.5 z M 17.195312 6.5 L 17.298828 6.5605469 L 18.060547 7 L 18.060547 7.25 L 18.060547 8 L 17.298828 8.4394531 L 17.195312 8.5 L 16.330078 8 L 16.330078 7 L 17.195312 6.5 z M 5.5058594 8.75 L 6.3710938 9.25 L 6.3710938 10.25 L 5.5058594 10.75 L 4.640625 10.25 L 4.640625 9.25 L 5.5058594 8.75 z M 8.1035156 8.75 L 8.96875 9.25 L 8.96875 9.390625 C 8.6470443 9.7691664 8.398667 10.204324 8.2363281 10.673828 L 8.1035156 10.75 L 7.5449219 10.427734 L 7.2382812 10.25 L 7.2382812 9.25 L 8.1035156 8.75 z M 15.896484 8.75 L 16.761719 9.25 L 16.761719 10.25 L 16.328125 10.5 L 15.896484 10.75 L 15.775391 10.679688 C 15.6258 10.253096 15.401287 9.8581752 15.119141 9.5058594 C 15.089259 9.4685462 15.062498 9.4288507 15.03125 9.3925781 L 15.03125 9.390625 L 15.03125 9.25 L 15.462891 9 L 15.896484 8.75 z M 18.494141 8.75 L 19.359375 9.25 L 19.359375 10.25 L 18.494141 10.75 L 18.287109 10.630859 L 17.628906 10.25 L 17.628906 9.25 L 18.494141 8.75 z M 12 10 C 13.104568 10 14 10.895432 14 12 C 14 13.035532 13.213589 13.887814 12.205078 13.990234 C 12.137844 13.997062 12.069035 14 12 14 C 11.792894 14 11.592174 13.968592 11.404297 13.910156 C 11.028542 13.793284 10.701584 13.567814 10.457031 13.271484 C 10.416272 13.222096 10.377738 13.172341 10.341797 13.119141 C 10.126148 12.799939 10 12.414213 10 12 C 10 11.930965 10.002938 11.862156 10.009766 11.794922 C 10.037078 11.525986 10.119032 11.273584 10.242188 11.046875 C 10.396132 10.763489 10.614858 10.521504 10.880859 10.341797 C 10.93406 10.305855 10.990198 10.272976 11.046875 10.242188 C 11.330261 10.088243 11.654823 10 12 10 z M 4.2070312 11 L 5.0722656 11.5 L 5.0722656 11.75 L 5.0722656 12.5 L 4.2070312 13 L 4.0722656 12.921875 C 4.0304257 12.616234 4.0063 12.308428 4 12 C 4.00315 11.845786 4.0113888 11.690819 4.0234375 11.537109 C 4.0354862 11.383399 4.0513406 11.230945 4.0722656 11.078125 L 4.2070312 11 z M 6.8046875 11 L 7.2363281 11.25 L 7.6699219 11.5 L 7.6699219 12.5 L 6.8046875 13 L 6.7011719 12.939453 L 5.9394531 12.5 L 5.9394531 11.5 L 6.7011719 11.060547 L 6.8046875 11 z M 17.195312 11 L 17.298828 11.060547 L 18.060547 11.5 L 18.060547 12.5 L 17.298828 12.939453 L 17.195312 13 L 16.763672 12.75 L 16.330078 12.5 L 16.330078 11.5 L 17.195312 11 z M 19.792969 11 L 19.927734 11.078125 C 19.969574 11.383766 19.9937 11.691572 20 12 C 19.9937 12.308428 19.969584 12.616234 19.927734 12.921875 L 19.792969 13 L 18.927734 12.5 L 18.927734 12.25 L 18.927734 11.5 L 19.792969 11 z M 5.5058594 13.25 L 5.7128906 13.369141 L 6.3710938 13.75 L 6.3710938 14.75 L 5.5058594 15.25 L 4.640625 14.75 L 4.640625 13.75 L 5.5058594 13.25 z M 8.1035156 13.25 L 8.2246094 13.320312 C 8.3742003 13.746904 8.5987134 14.141825 8.8808594 14.494141 C 8.9107409 14.531454 8.9375015 14.571149 8.96875 14.607422 C 8.9690848 14.607816 8.968415 14.608981 8.96875 14.609375 L 8.96875 14.75 L 8.5371094 15 L 8.1035156 15.25 L 7.2382812 14.75 L 7.2382812 13.75 L 7.671875 13.5 L 8.1035156 13.25 z M 15.896484 13.25 L 16.455078 13.572266 L 16.761719 13.75 L 16.761719 14.75 L 15.896484 15.25 L 15.03125 14.75 L 15.03125 14.609375 C 15.288819 14.306302 15.495308 13.965789 15.652344 13.601562 C 15.6928 13.511265 15.729958 13.419415 15.763672 13.326172 L 15.896484 13.25 z M 18.494141 13.25 L 19.359375 13.75 L 19.359375 14.75 L 18.494141 15.25 L 17.628906 14.75 L 17.628906 13.75 L 18.494141 13.25 z M 6.8046875 15.5 L 7.6699219 16 L 7.6699219 17 L 6.8046875 17.5 L 6.7011719 17.439453 L 5.9394531 17 L 5.9394531 16.75 L 5.9394531 16 L 6.7011719 15.560547 L 6.8046875 15.5 z M 9.4023438 15.5 L 9.8339844 15.75 L 10.267578 16 L 10.267578 17 L 9.8339844 17.25 L 9.4023438 17.5 L 8.9707031 17.25 L 8.5371094 17 L 8.5371094 16.25 L 8.5371094 16 L 8.96875 15.75 L 8.9707031 15.75 L 9.4023438 15.5 z M 14.597656 15.5 L 15.029297 15.75 L 15.462891 16 L 15.462891 17 L 15.03125 17.25 L 14.597656 17.5 L 13.732422 17 L 13.732422 16.160156 L 13.732422 16 L 13.859375 15.925781 L 14.166016 15.75 L 14.597656 15.5 z M 17.195312 15.5 L 17.298828 15.560547 L 18.060547 16 L 18.060547 16.25 L 18.060547 17 L 17.195312 17.5 L 16.330078 17 L 16.330078 16 L 17.195312 15.5 z M 12.732422 15.923828 L 12.865234 16 L 12.865234 16.75 L 12.865234 17 L 12.103516 17.439453 L 12 17.5 L 11.134766 17 L 11.134766 16 L 11.255859 15.929688 C 11.256492 15.929808 11.25718 15.929568 11.257812 15.929688 C 11.502508 15.976059 11.750946 15.99984 12 16 C 12.122981 15.9986 12.244987 15.991227 12.367188 15.978516 C 12.489388 15.965806 12.611782 15.947758 12.732422 15.923828 z M 8.1035156 17.75 L 8.96875 18.25 L 8.96875 19.25 L 8.8398438 19.324219 C 8.2730923 19.085975 7.7356888 18.783196 7.2382812 18.421875 L 7.2382812 18.25 L 7.8964844 17.869141 L 8.1035156 17.75 z M 10.701172 17.75 L 11.566406 18.25 L 11.566406 19.25 L 10.701172 19.75 L 9.8359375 19.25 L 9.8359375 18.25 L 10.701172 17.75 z M 13.298828 17.75 L 13.732422 18 L 14.164062 18.25 L 14.164062 19.25 L 13.896484 19.404297 L 13.298828 19.75 L 13.042969 19.601562 L 12.867188 19.5 L 12.433594 19.25 L 12.433594 18.25 L 12.867188 18 L 13.125 17.851562 C 13.125123 17.85094 13.124877 17.850232 13.125 17.849609 L 13.298828 17.75 z M 15.896484 17.75 L 16.761719 18.25 L 16.761719 18.421875 C 16.264309 18.783196 15.726909 19.085977 15.160156 19.324219 L 15.03125 19.25 L 15.03125 18.25 L 15.462891 18 L 15.896484 17.75 z'
@@ -394,7 +396,9 @@ export const Icons = Object.freeze({
   changeFilament: mdiFilamentChange,
   jobQueue: mdiTrayFull,
   enqueueJob: mdiTrayPlus,
-  sensors: mdiGauge
+  sensors: mdiGauge,
+  zRotateClockwise: mdiRotateRight,
+  zRotateCounterclockwise: mdiRotateLeft
 })
 
 export const Waits = Object.freeze({
diff --git a/src/locales/en.yaml b/src/locales/en.yaml
index 683e654e33..deb84738c4 100644
--- a/src/locales/en.yaml
+++ b/src/locales/en.yaml
@@ -2,6 +2,7 @@ app:
   bedmesh:
     label:
       active: active
+      base: base
       box_scale: Box scale
       flat_surface: Show flat plane
       mesh_matrix: Mesh matrix
@@ -193,6 +194,7 @@ app:
       restart_service_moonraker: Restart Moonraker
       resume: Resume
       retract: Retract
+      retry: Retry
       return_dashboard: Return to the dashboard
       save: Save
       save_as: Save As
@@ -599,6 +601,7 @@ app:
       force_move_toggle_warning: Require confirm when activating FORCE_MOVE
       show_manual_probe_dialog_automatically: Show Manual Probe dialog automatically
       show_bed_screws_adjust_dialog_automatically: Show Bed Screws Adjust dialog automatically
+      show_screws_tilt_adjust_dialog_automatically: Show Screws Tilt Adjust dialog automatically
     timer_options:
       duration: Duration only
       filament: Filament Estimation
@@ -620,6 +623,7 @@ app:
       gcode_coords: Use GCode position instead of toolhead position on dashboard
       show_manual_probe_dialog_automatically: Automatically shows helper dialog if running a Manual Probe tool
       show_bed_screws_adjust_dialog_automatically: Automatically shows helper dialog if running BED_SCREWS_ADJUST tool
+      show_screws_tilt_adjust_dialog_automatically: Automatically shows helper dialog if running SCREWS_TILT_CALCULATE tool
   socket:
     msg:
       connecting: Connecting to moonraker...
@@ -663,6 +667,7 @@ app:
     title:
       bed_screws_adjust: Bed Screws Adjust
       manual_probe: Manual Probe
+      screws_tilt_adjust: Screws Tilt Adjust
     tooltip:
       absolute_positioning: Absolute Positioning
       extruder_disabled: extruder disabled, below min_extrude_temp (%{min}<small>°C</small>)
diff --git a/src/mixins/toolhead.ts b/src/mixins/toolhead.ts
index b17159d67f..25f9c0e415 100644
--- a/src/mixins/toolhead.ts
+++ b/src/mixins/toolhead.ts
@@ -74,4 +74,8 @@ export default class ToolheadMixin extends Vue {
   get isBedScrewsAdjustActive (): boolean {
     return this.$store.getters['printer/getIsBedScrewsAdjustActive'] as boolean
   }
+
+  get hasScrewsTiltAdjustResults (): boolean {
+    return this.$store.getters['printer/getHasScrewsTiltAdjustResults'] as boolean
+  }
 }
diff --git a/src/store/config/state.ts b/src/store/config/state.ts
index 67aef71299..c98485ae65 100644
--- a/src/store/config/state.ts
+++ b/src/store/config/state.ts
@@ -55,6 +55,7 @@ export const defaultState = (): ConfigState => {
         topNavPowerToggle: null,
         showManualProbeDialogAutomatically: true,
         showBedScrewsAdjustDialogAutomatically: true,
+        showScrewsTiltAdjustDialogAutomatically: true,
         forceMoveToggleWarning: true,
         enableDiagnostics: false,
         thumbnailSize: 32
diff --git a/src/store/config/types.ts b/src/store/config/types.ts
index 38bac93170..55fd9baa02 100644
--- a/src/store/config/types.ts
+++ b/src/store/config/types.ts
@@ -88,6 +88,7 @@ export interface GeneralConfig {
   topNavPowerToggle: null | string;
   showManualProbeDialogAutomatically: boolean;
   showBedScrewsAdjustDialogAutomatically: boolean;
+  showScrewsTiltAdjustDialogAutomatically: boolean;
   forceMoveToggleWarning: boolean;
   enableDiagnostics: boolean;
   thumbnailSize: number;
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index 60cf8addb5..03d8131e50 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -99,6 +99,9 @@ export const actions: ActionTree<PrinterState, RootState> = {
   },
 
   async onPrinterObjectsSubscribe ({ commit, dispatch }, payload) {
+    if (payload?.status?.screws_tilt_adjust) {
+      delete payload.status.screws_tilt_adjust
+    }
     // Accept notifications, and commit the first subscribe.
     commit('socket/setAcceptNotifications', true, { root: true })
     await dispatch('onNotifyStatusUpdate', payload.status)
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index da39807007..b70d50ef3c 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -1,9 +1,10 @@
 import Vue from 'vue'
 import type { GetterTree } from 'vuex'
 import type { RootState } from '../types'
-import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, Probe, ExtruderStepper, Extruder, ExtruderConfig, ProbeName, Stepper } from './types'
+import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, Probe, ExtruderStepper, Extruder, ExtruderConfig, ProbeName, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews } from './types'
 import { get } from 'lodash-es'
 import getKlipperType from '@/util/get-klipper-type'
+import i18n from '@/plugins/i18n'
 
 export const getters: GetterTree<PrinterState, RootState> = {
 
@@ -722,25 +723,67 @@ export const getters: GetterTree<PrinterState, RootState> = {
 
   getBedScrews: (_, getters) => {
     const config = getters.getPrinterSettings('bed_screws')
-    const screws = []
+    const screws: BedScrews[] = []
 
     for (let index = 1; index <= 99; index++) {
-      const adjust = config[`screw${index}`]
+      const key = `screw${index}`
+      const coords = config[key]
 
-      if (!adjust) {
+      if (!coords) {
         break
       }
 
+      const fine = config[`screw${index}_fine_adjust`]
+      const name = config[`screw${index}_name`]
+      const prettyName = Vue.$filters.startCase(name || i18n.t('app.general.label.screw_number', { index: index + 1 }))
+
       screws.push({
-        adjust,
-        fine: config[`screw${index}_fine_adjust`],
-        name: config[`screw${index}_name`]
+        key,
+        name,
+        prettyName,
+        fine,
+        x: coords[0],
+        y: coords[1]
       })
     }
 
     return screws
   },
 
+  getScrewsTiltAdjust: (state, getters) => {
+    const config = getters.getPrinterSettings('screws_tilt_adjust')
+    const screws: ScrewsTiltAdjustScrew[] = []
+
+    const { results, ...rest } = state.printer.screws_tilt_adjust
+
+    for (let index = 1; index <= 99; index++) {
+      const key = `screw${index}`
+      const result = results?.[key]
+
+      if (!result) {
+        break
+      }
+
+      const coords = config[key]
+      const name = config[`${key}_name`]
+      const prettyName = Vue.$filters.startCase(name || i18n.t('app.general.label.screw_number', { index: index + 1 }))
+
+      screws.push({
+        key,
+        name,
+        prettyName,
+        ...result,
+        x: coords[0],
+        y: coords[1]
+      })
+    }
+
+    return {
+      ...rest,
+      screws
+    } as ScrewsTiltAdjust
+  },
+
   /**
    * Return a required setting from the printer.config object.
    */
@@ -844,5 +887,16 @@ export const getters: GetterTree<PrinterState, RootState> = {
 
   getIsBedScrewsAdjustActive: (state) => {
     return state.printer.bed_screws?.is_active || false
+  },
+
+  getHasScrewsTiltAdjustResults: (state) => {
+    const { error, max_deviation, results } = state.printer.screws_tilt_adjust ?? {}
+
+    return (
+      !error &&
+      max_deviation == null &&
+      results &&
+      Object.keys(results).length > 0
+    )
   }
 }
diff --git a/src/store/printer/mutations.ts b/src/store/printer/mutations.ts
index 63fe223306..b396d985e1 100644
--- a/src/store/printer/mutations.ts
+++ b/src/store/printer/mutations.ts
@@ -35,6 +35,10 @@ export const mutations: MutationTree<PrinterState> = {
     state.printer.endstops = {}
   },
 
+  setClearScrewsTiltAdjust (state) {
+    state.printer.screws_tilt_adjust = {}
+  },
+
   setResetCurrentFile (state) {
     const newState = defaultState().printer.current_file
     consola.debug('resetting current file', newState)
diff --git a/src/store/printer/state.ts b/src/store/printer/state.ts
index 5ba102fca1..90e0963423 100644
--- a/src/store/printer/state.ts
+++ b/src/store/printer/state.ts
@@ -113,6 +113,7 @@ export const defaultState = (): PrinterState => {
         current_screw: 0,
         accepted_screws: 0
       },
+      screws_tilt_adjust: {},
       fan: {
         speed: 0
       },
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
index ae185af33b..fc5e3673b2 100644
--- a/src/store/printer/types.ts
+++ b/src/store/printer/types.ts
@@ -159,6 +159,33 @@ export interface Probe {
 
 export type ProbeName = 'bltouch' | 'smart_effector' | 'probe'
 
+export interface BedScrews {
+  key: string;
+  name: string;
+  prettyName: string;
+  fine: number;
+  x: number;
+  y: number;
+}
+
+export interface ScrewsTiltAdjust {
+  error: boolean;
+  max_deviation?: number | null;
+  screws: ScrewsTiltAdjustScrew[]
+}
+
+export interface ScrewsTiltAdjustScrew {
+  key: string;
+  name: string;
+  prettyName: string;
+  x: number;
+  y: number;
+  z: number;
+  sign: 'CW' | 'CCW';
+  adjust: string;
+  is_base: boolean;
+}
+
 // printer.mcu[num]
 export interface KlipperMcu {
   last_stats: KlipperMcuStats;

From 264f1eefbcc6097e8e7bb9cefe86fb10604f47c6 Mon Sep 17 00:00:00 2001
From: Mathis Mensing <github@matmen.dev>
Date: Tue, 31 Oct 2023 21:56:36 +0100
Subject: [PATCH 2/5] feat: mark sub-6-minute adjustments as succeeded

Signed-off-by: Mathis Mensing <github@matmen.dev>
---
 src/components/common/ScrewsTiltAdjustDialog.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/common/ScrewsTiltAdjustDialog.vue b/src/components/common/ScrewsTiltAdjustDialog.vue
index cd461b4943..4fe1014460 100644
--- a/src/components/common/ScrewsTiltAdjustDialog.vue
+++ b/src/components/common/ScrewsTiltAdjustDialog.vue
@@ -37,7 +37,7 @@
                 {{ $t('app.bedmesh.label.base') }}
               </v-chip>
               <v-chip
-                v-else-if="screw.adjust === '00:00'"
+                v-else-if="getScrewAdjustMinutes(screw.adjust) < 6"
                 color="success"
                 small
                 label
@@ -46,7 +46,7 @@
                   left
                   small
                 >
-                  $success
+                  {{ screw.sign === 'CW' ? '$zRotateClockwise' : screw.sign === 'CCW' ? '$zRotateCounterclockwise' : '$success' }}
                 </v-icon>
                 {{ screw.adjust }}
               </v-chip>
@@ -106,5 +106,10 @@ export default class ScrewsTiltAdjustDialog extends Mixins(StateMixin, ToolheadM
   destroyed () {
     this.$store.commit('printer/setClearScrewsTiltAdjust')
   }
+
+  getScrewAdjustMinutes (value: string) {
+    const [hours, minutes] = value.split(':').map(v => parseInt(v))
+    return hours * 60 + minutes
+  }
 }
 </script>

From 49bb13f48d3b158820d9b26a22abad5cdc46634e Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Tue, 31 Oct 2023 21:19:59 +0000
Subject: [PATCH 3/5] refactor: minor adjustments

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 .../common/ScrewsTiltAdjustDialog.vue         | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/components/common/ScrewsTiltAdjustDialog.vue b/src/components/common/ScrewsTiltAdjustDialog.vue
index 4fe1014460..818ac7d031 100644
--- a/src/components/common/ScrewsTiltAdjustDialog.vue
+++ b/src/components/common/ScrewsTiltAdjustDialog.vue
@@ -36,23 +36,9 @@
               >
                 {{ $t('app.bedmesh.label.base') }}
               </v-chip>
-              <v-chip
-                v-else-if="getScrewAdjustMinutes(screw.adjust) < 6"
-                color="success"
-                small
-                label
-              >
-                <v-icon
-                  left
-                  small
-                >
-                  {{ screw.sign === 'CW' ? '$zRotateClockwise' : screw.sign === 'CCW' ? '$zRotateCounterclockwise' : '$success' }}
-                </v-icon>
-                {{ screw.adjust }}
-              </v-chip>
               <v-chip
                 v-else
-                color="error"
+                :color="getScrewAdjustMinutes(screw.adjust) < 6 ? 'success' : 'error'"
                 small
                 label
               >
@@ -60,7 +46,7 @@
                   left
                   small
                 >
-                  {{ screw.sign === 'CW' ? '$zRotateClockwise' : '$zRotateCounterclockwise' }}
+                  {{ screw.adjust === '00:00' ? '$success' : screw.sign === 'CW' ? '$zRotateClockwise' : '$zRotateCounterclockwise' }}
                 </v-icon>
                 {{ screw.adjust }}
               </v-chip>
@@ -108,7 +94,10 @@ export default class ScrewsTiltAdjustDialog extends Mixins(StateMixin, ToolheadM
   }
 
   getScrewAdjustMinutes (value: string) {
-    const [hours, minutes] = value.split(':').map(v => parseInt(v))
+    const [hours, minutes] = value
+      .split(':')
+      .map(Number)
+
     return hours * 60 + minutes
   }
 }

From 30cb5b0df02908dfaeaf18f745f699f2e6476a7c Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Tue, 31 Oct 2023 23:45:31 +0000
Subject: [PATCH 4/5] fix: close if no data (idle)

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 src/components/widgets/toolhead/ToolheadCard.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
index 59031bb84b..aea1c08830 100644
--- a/src/components/widgets/toolhead/ToolheadCard.vue
+++ b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -395,14 +395,12 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
 
   @Watch('hasScrewsTiltAdjustResults')
   onHasScrewsTiltAdjustResults (value: boolean) {
-    if (
+    this.screwsTiltAdjustDialogOpen = (
       value &&
       this.showScrewsTiltAdjustDialogAutomatically &&
       this.klippyReady &&
       !this.printerPrinting
-    ) {
-      this.screwsTiltAdjustDialogOpen = true
-    }
+    )
   }
 
   async toggleForceMove () {

From af21910a1a4ca2522235c63e8b05e555b2a43ded Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Tue, 31 Oct 2023 23:56:28 +0000
Subject: [PATCH 5/5] refactor: move adjust minutes calculation

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 src/components/common/ScrewsTiltAdjustDialog.vue | 12 ++----------
 src/store/printer/getters.ts                     |  5 +++++
 src/store/printer/types.ts                       |  1 +
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/common/ScrewsTiltAdjustDialog.vue b/src/components/common/ScrewsTiltAdjustDialog.vue
index 818ac7d031..8d643b457d 100644
--- a/src/components/common/ScrewsTiltAdjustDialog.vue
+++ b/src/components/common/ScrewsTiltAdjustDialog.vue
@@ -38,7 +38,7 @@
               </v-chip>
               <v-chip
                 v-else
-                :color="getScrewAdjustMinutes(screw.adjust) < 6 ? 'success' : 'error'"
+                :color="screw.adjustMinutes < 6 ? 'success' : 'error'"
                 small
                 label
               >
@@ -46,7 +46,7 @@
                   left
                   small
                 >
-                  {{ screw.adjust === '00:00' ? '$success' : screw.sign === 'CW' ? '$zRotateClockwise' : '$zRotateCounterclockwise' }}
+                  {{ screw.adjustMinutes === 0 ? '$success' : screw.sign === 'CW' ? '$zRotateClockwise' : '$zRotateCounterclockwise' }}
                 </v-icon>
                 {{ screw.adjust }}
               </v-chip>
@@ -92,13 +92,5 @@ export default class ScrewsTiltAdjustDialog extends Mixins(StateMixin, ToolheadM
   destroyed () {
     this.$store.commit('printer/setClearScrewsTiltAdjust')
   }
-
-  getScrewAdjustMinutes (value: string) {
-    const [hours, minutes] = value
-      .split(':')
-      .map(Number)
-
-    return hours * 60 + minutes
-  }
 }
 </script>
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index b70d50ef3c..5bd52f9a86 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -767,12 +767,17 @@ export const getters: GetterTree<PrinterState, RootState> = {
       const coords = config[key]
       const name = config[`${key}_name`]
       const prettyName = Vue.$filters.startCase(name || i18n.t('app.general.label.screw_number', { index: index + 1 }))
+      const [hours, minutes] = result.adjust
+        .split(':')
+        .map(Number)
+      const adjustMinutes = hours * 60 + minutes
 
       screws.push({
         key,
         name,
         prettyName,
         ...result,
+        adjustMinutes,
         x: coords[0],
         y: coords[1]
       })
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
index fc5e3673b2..c53139c1d5 100644
--- a/src/store/printer/types.ts
+++ b/src/store/printer/types.ts
@@ -178,6 +178,7 @@ export interface ScrewsTiltAdjustScrew {
   key: string;
   name: string;
   prettyName: string;
+  adjustMinutes: number;
   x: number;
   y: number;
   z: number;