Skip to content

Commit

Permalink
feat: adjustable toolhead move distances (#590)
Browse files Browse the repository at this point in the history
Signed-off-by: Mathis Mensing <[email protected]>
Co-authored-by: Pedro Lamas <[email protected]>
  • Loading branch information
matmen and pedrolamas authored Mar 18, 2022
1 parent 08a44eb commit 7b115ec
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 50 deletions.
46 changes: 43 additions & 3 deletions src/components/settings/ToolheadSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
<app-setting :title="$t('app.setting.label.default_toolhead_move_length')">
<v-select
:value="defaultToolheadMoveLength"
:items="[0.1, 1.0, 10, 25, 50, 100]"
:rules="[rules.numRequired, rules.numMin]"
:items="toolheadMoveDistances"
:rules="[rules.numRequired]"
filled
dense
single-line
Expand Down Expand Up @@ -128,6 +128,28 @@

<v-divider />

<app-setting :title="$t('app.setting.label.toolhead_move_distances')">
<v-combobox
ref="toolheadMoveDistances"
v-model="toolheadMoveDistances"
filled
dense
hide-selected
hide-details="auto"
multiple
small-chips
append-icon=""
deletable-chips
:rules="[
v => v.length > 0 || $t('app.general.simple_form.error.min', { min: 1 }),
v => v.length <= 6 || $t('app.general.simple_form.error.max', { max: 6 }),
v => !v.some(isNaN) || $t('app.general.simple_form.error.arrayofnums')
]"
/>
</app-setting>

<v-divider />

<app-setting :title="$t('app.setting.label.z_adjust_values')">
<v-combobox
v-model="zAdjustValues"
Expand Down Expand Up @@ -164,13 +186,15 @@
</template>

<script lang="ts">
import { Component, Vue } from 'vue-property-decorator'
import { Component, Ref, Vue } from 'vue-property-decorator'
import { defaultState } from '@/store/config/index'
@Component({
components: {}
})
export default class ToolHeadSettings extends Vue {
@Ref('toolheadMoveDistances') readonly toolheadMoveDistancesElement!: any;
rules = {
numRequired: (v: number | string) => v !== '' || 'Required',
numMin: (v: number) => v >= 1 || 'Min 1'
Expand Down Expand Up @@ -248,6 +272,22 @@ export default class ToolHeadSettings extends Vue {
})
}
get toolheadMoveDistances () {
return this.$store.state.config.uiSettings.general.toolheadMoveDistances
}
set toolheadMoveDistances (value: (number | string)[]) {
if (!this.toolheadMoveDistancesElement.validate(true)) {
return
}
this.$store.dispatch('config/saveByPath', {
path: 'uiSettings.general.toolheadMoveDistances',
value: [...new Set(value.map(Number))].sort((a, b) => a - b),
server: true
})
}
get useGcodeCoords () {
return this.$store.state.config.uiSettings.general.useGcodeCoords
}
Expand Down
61 changes: 14 additions & 47 deletions src/components/widgets/toolhead/ToolheadMoves.vue
Original file line number Diff line number Diff line change
Expand Up @@ -166,57 +166,14 @@
dense
>
<app-btn
v-for="(distance, index) of toolheadMoveDistances"
:key="index"
small
:min-width="40"
:value="0.1"
:value="distance"
:disabled="!klippyReady"
>
0.1
</app-btn>
<app-btn
small
:min-width="40"
class="pa-0"
:value="1.0"
:disabled="!klippyReady"
>
1.0
</app-btn>
<app-btn
small
:min-width="40"
class="pa-0"
:value="10"
:disabled="!klippyReady"
>
10
</app-btn>
<app-btn
small
:min-width="40"
class="pa-0"
:value="25"
:disabled="!klippyReady"
>
25
</app-btn>
<app-btn
small
:min-width="40"
class="pa-0"
:value="50"
:disabled="!klippyReady"
>
50
</app-btn>
<app-btn
small
:min-width="40"
class="pa-0"
:value="100"
:disabled="!klippyReady"
>
100
{{ distance }}
</app-btn>
</v-btn-toggle>
</v-col>
Expand Down Expand Up @@ -244,6 +201,16 @@ export default class ToolheadMoves extends Mixins(StateMixin, ToolheadMixin) {
return this.kinematics !== 'delta'
}
get toolheadMoveDistances () {
const distances = this.$store.state.config.uiSettings.general.toolheadMoveDistances
if (distances.includes(this.toolheadMoveLength)) {
return distances
}
// safety for when no valid move length is present
return [this.toolheadMoveLength, ...distances].sort((a, b) => a - b)
}
get toolheadMoveLength () {
return (this.moveLength === '')
? this.$store.state.config.uiSettings.general.defaultToolheadMoveLength
Expand Down
1 change: 1 addition & 0 deletions src/locales/de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ app:
theme_preset: Community-Voreinstellung
thermal_preset_gcode: GCode
thermal_preset_name: Name des Voreinstellungsprofils
toolhead_move_distances: Bewegungsdistanzen des Druckkopfes
type: Art
z_adjust_values: Z-Werte anpassen
timer_options:
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ app:
theme_preset: Community preset
thermal_preset_gcode: GCode
thermal_preset_name: Preset Name
toolhead_move_distances: Toolhead distance values
type: Type
z_adjust_values: Z Adjust values
date_time_format: Date and Time format
Expand Down
1 change: 1 addition & 0 deletions src/store/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export const defaultState = (): ConfigState => {
defaultToolheadMoveLength: 1.0,
defaultToolheadXYSpeed: 130,
defaultToolheadZSpeed: 10,
toolheadMoveDistances: [0.1, 1, 10, 25, 50, 100],
useGcodeCoords: false,
zAdjustDistances: [0.005, 0.01, 0.025, 0.050],
enableVersionNotifications: true,
Expand Down
4 changes: 4 additions & 0 deletions src/store/config/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ export const mutations: MutationTree<ConfigState> = {
Vue.set(processed.general, 'zAdjustDistances', payload.general.zAdjustDistances)
}

if (payload.general && payload.general.toolheadMoveDistances) {
Vue.set(processed.general, 'toolheadMoveDistances', payload.general.toolheadMoveDistances)
}

if (payload.editor && payload.editor.autoEditExtensions) {
Vue.set(processed.editor, 'autoEditExtensions', payload.editor.autoEditExtensions)
}
Expand Down
1 change: 1 addition & 0 deletions src/store/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export interface GeneralConfig {
defaultToolheadMoveLength: number;
defaultToolheadXYSpeed: number;
defaultToolheadZSpeed: number;
toolheadMoveDistances: number[];
useGcodeCoords: boolean;
zAdjustDistances: number[];
enableVersionNotifications: boolean;
Expand Down

0 comments on commit 7b115ec

Please sign in to comment.