CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add fw_retract setting in timelapse setting menu

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej
2021-12-20 23:53:17 +01:00
parent 97ace01908
commit f4b393053d
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/components/settings/SettingsTimelapseTab.vue
View File

@@ -68,21 +68,27 @@
<v-text-field v-model="park_travel_speed" type="number" suffix="mm/s" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_travel_speed')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.RetractSpeed')" :sub-title="$t('Settings.TimelapseTab.RetractSpeedDescription')">
<v-text-field v-model="park_retract_speed" type="number" suffix="mm/s" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_retract_speed')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.RetractDistance')" :sub-title="$t('Settings.TimelapseTab.RetractDistanceDescription')">
<v-text-field v-model="park_retract_distance" type="number" suffix="mm" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_retract_distance')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.UnretractSpeed')" :sub-title="$t('Settings.TimelapseTab.UnretractSpeedDescription')">
<v-text-field v-model="park_extrude_speed" type="number" suffix="mm/s" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_extrude_speed')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.UnretractDistance')" :sub-title="$t('Settings.TimelapseTab.UnretractDistanceDescription')">
<v-text-field v-model="park_extrude_distance" type="number" suffix="mm" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_extrude_distance')" hide-spin-buttons></v-text-field>
<settings-row :title="$t('Settings.TimelapseTab.FwRetract')" :sub-title="$t('Settings.TimelapseTab.FwRetractDescription')" :dynamicSlotWidth="true">
<v-switch v-model="fw_retract" hide-details class="mt-0" :disabled="blockedsettings.includes('fw_retract')"></v-switch>
</settings-row>
<template v-if="!fw_retract">
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.RetractSpeed')" :sub-title="$t('Settings.TimelapseTab.RetractSpeedDescription')">
<v-text-field v-model="park_retract_speed" type="number" suffix="mm/s" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_retract_speed')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.RetractDistance')" :sub-title="$t('Settings.TimelapseTab.RetractDistanceDescription')">
<v-text-field v-model="park_retract_distance" type="number" suffix="mm" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_retract_distance')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.UnretractSpeed')" :sub-title="$t('Settings.TimelapseTab.UnretractSpeedDescription')">
<v-text-field v-model="park_extrude_speed" type="number" suffix="mm/s" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_extrude_speed')" hide-spin-buttons></v-text-field>
</settings-row>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.UnretractDistance')" :sub-title="$t('Settings.TimelapseTab.UnretractDistanceDescription')">
<v-text-field v-model="park_extrude_distance" type="number" suffix="mm" hide-details="auto" outlined dense :disabled="blockedsettings.includes('park_extrude_distance')" hide-spin-buttons></v-text-field>
</settings-row>
</template>
<v-divider class="my-2"></v-divider>
<settings-row :title="$t('Settings.TimelapseTab.ParkTime')" :sub-title="$t('Settings.TimelapseTab.ParkTimeDescription')">
<v-text-field v-model="park_time" type="number" suffix="s" hide-details="auto" step="0.1" outlined dense :disabled="blockedsettings.includes('park_time')"></v-text-field>
@@ -358,6 +364,14 @@ export default class SettingsTimelapseTab extends Mixins(BaseMixin) {
this.$store.dispatch('server/timelapse/saveSetting', { park_time: newVal })
}
get fw_retract() {
return this.$store.state.server.timelapse.settings.fw_retract
}
set fw_retract(newVal) {
this.$store.dispatch('server/timelapse/saveSetting', { fw_retract: newVal })
}
get constant_rate_factor() {
return this.$store.state.server.timelapse.settings.constant_rate_factor
}

2
src/locales/en.json
View File

@@ -675,6 +675,8 @@
"PosYDescription": "Park postion Y (absolute)",
"PosDZ": "Position Z",
"PosDZDescription": "Park postion Z (relative)",
"FwRetract": "FW Retract",
"FwRetractDescription": "Use firmware retraction in the timelapse macro",
"TravelSpeed": "Travel Speed",
"TravelSpeedDescription": "Travel speed while moving to the parking position and resuming",
"RetractSpeed": "Retract Speed",

1
src/store/server/timelapse/index.ts
View File

@@ -26,6 +26,7 @@ export const getDefaultState = (): ServerTimelapseState => {
park_extrude_speed: 15,
park_extrude_distance: 1,
park_time: 0.1,
fw_retract: false,
hyperlapse_cycle: 30,
constant_rate_factor: 23,

1
src/store/server/timelapse/types.ts
View File

@@ -31,6 +31,7 @@ export interface ServerTimelapseSettingsState {
park_extrude_speed: number
park_extrude_distance: number
park_time: number
fw_retract: boolean
hyperlapse_cycle: number
constant_rate_factor: number