Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds probe accuracy support #1365

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/components/widgets/toolhead/ToolheadCard.vue
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
})
}

Expand Down
1 change: 1 addition & 0 deletions src/globals.ts
Expand Up @@ -458,6 +458,7 @@ export const Waits = Object.freeze({
onTimelapseSaveFrame: 'onTimelapseSaveFrame',
onManualProbe: 'onManualProbe',
onProbeCalibrate: 'onProbeCalibrate',
onProbeAccuracy: 'onProbeAccuracy',
onZEndstopCalibrate: 'onZEndstopCalibrate',
onQueryEndstops: 'onQueryEndstops',
onQueryProbe: 'onQueryProbe',
Expand Down