Skip to content

feat: Allow extruder moves when force move is enabled #1402

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: Allow extruder moves when force move is enabled #1402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/components/widgets/toolhead/ExtruderMoves.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
</v-col>
<v-col cols="6">
<app-btn
:disabled="!klippyReady || !extruderReady || !valid"
:color="(forceMove) ? 'error' : 'primary'"
:disabled="!klippyReady || !(extruderReady || forceMove) || !valid"
block
@click="sendRetractGcode(extrudeLength, extrudeSpeed, $waits.onExtrude)"
@click="sendExtrudeGcode(-extrudeLength, extrudeSpeed, $waits.onExtrude)"
>
{{ $t('app.general.btn.retract') }}
<v-icon>$chevronUp</v-icon>
Expand Down Expand Up @@ -66,7 +67,8 @@
</v-col>
<v-col cols="6">
<app-btn
:disabled="!klippyReady || !extruderReady || !valid"
:color="(forceMove) ? 'error' : 'primary'"
:disabled="!klippyReady || !(extruderReady || forceMove) || !valid"
block
@click="sendExtrudeGcode(extrudeLength, extrudeSpeed, $waits.onExtrude)"
>
Expand Down Expand Up @@ -136,19 +138,19 @@ export default class ExtruderMoves extends Mixins(StateMixin, ToolheadMixin) {
return this.$rules.numberLessThanOrEqual(this.maxExtrudeSpeed)(value)
}

sendRetractGcode (amount: number, rate: number, wait?: string) {
if (this.valid) {
const gcode = `M83
G1 E-${amount} F${rate * 60}`
this.sendGcode(gcode, wait)
}
get forceMove () {
return this.$store.state.config.uiSettings.toolhead.forceMove
}

sendExtrudeGcode (amount: number, rate: number, wait?: string) {
if (this.valid) {
const gcode = `M83
G1 E${amount} F${rate * 60}`
this.sendGcode(gcode, wait)
if (this.forceMove) {
const extruderName = this.$store.state.printer.printer.toolhead.extruder
this.sendGcode(`FORCE_MOVE STEPPER=${extruderName} DISTANCE=${amount} VELOCITY=${rate}`, wait)
} else {
this.sendGcode(`M83
G1 E${amount} F${rate * 60}`, wait)
}
}
}

Expand Down