diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue index fa7a6591e6..86078a3933 100644 --- a/src/components/widgets/toolhead/ToolheadCard.vue +++ b/src/components/widgets/toolhead/ToolheadCard.vue @@ -39,64 +39,87 @@ > {{ $t('app.tool.tooltip.manual_probe') }} + - {{ $t('app.tool.tooltip.force_move') }} + BED_SCREWS_ADJUST + - {{ $t('app.tool.tooltip.motors_off') }} - - - {{ $t('app.tool.tooltip.bed_screws_adjust') }} - - - {{ $t('app.tool.tooltip.screws_tilt_calculate') }} + FORCE_MOVE + - {{ $t('app.tool.tooltip.z_tilt_adjust') }} + {{ $t('app.tool.tooltip.motors_off') }} - - {{ $t('app.tool.tooltip.quad_gantry_level') }} - + + + + + + $tools + + + + + {{ tool.name }} + + + + + @@ -120,6 +143,12 @@ import StateMixin from '@/mixins/state' import ToolheadMixin from '@/mixins/toolhead' import Toolhead from './Toolhead.vue' +type Tool = { + name: string, + disabled?: boolean, + wait?: string, +} + @Component({ components: { Toolhead @@ -136,15 +165,15 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) { return this.$store.getters['printer/getPrinterSettings']() } - get printerSupportsQgl (): boolean { + get printerSupportsQuadGantryLevel (): boolean { return 'quad_gantry_level' in this.printerSettings } - get printerSupportsZtilt (): boolean { + get printerSupportsZTiltAdjust (): boolean { return 'z_tilt' in this.printerSettings } - get printerSupportsBedScrews (): boolean { + get printerSupportsBedScrewsAdjust (): boolean { return 'bed_screws' in this.printerSettings } @@ -152,6 +181,102 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) { return 'screws_tilt_adjust' in this.printerSettings } + get printerSupportsBedTiltCalibrate (): boolean { + return 'bed_tilt' in this.printerSettings + } + + get printerSupportsDeltaCalibrate (): boolean { + return 'delta_calibrate' in this.printerSettings + } + + get printerSupportsProbeCalibrate (): boolean { + return 'probe' in this.printerSettings || 'bltouch' in this.printerSettings + } + + get printerSupportsZEndstopCalibrate (): boolean { + return ( + 'stepper_z' in this.printerSettings && + 'z_position_endstop' in this.printerSettings.stepper_z + ) + } + + get availableTools () { + const tools: Tool[] = [] + + if (this.printerSupportsBedScrewsAdjust) { + tools.push({ + name: 'BED_SCREWS_ADJUST', + disabled: !this.allHomed || this.isBedScrewsAdjustActive, + wait: this.$waits.onBedScrewsAdjust + }) + } + + if (this.printerSupportsBedTiltCalibrate) { + tools.push({ + name: 'BED_TILT_CALIBRATE', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onBedTiltCalibrate + }) + } + + if (this.printerSupportsDeltaCalibrate) { + tools.push({ + name: 'DELTA_CALIBRATE', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onDeltaCalibrate + }) + } + + tools.push({ + name: 'MANUAL_PROBE', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onManualProbe + }) + + if (this.printerSupportsProbeCalibrate) { + tools.push({ + name: 'PROBE_CALIBRATE', + disabled: !this.allHomed, + wait: this.$waits.onProbeCalibrate + }) + } + + if (this.printerSupportsQuadGantryLevel) { + tools.push({ + name: 'QUAD_GANTRY_LEVEL', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onQGL + }) + } + + if (this.printerSupportsBedScrewsCalculate) { + tools.push({ + name: 'SCREWS_TILT_CALCULATE', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onBedScrewsCalculate + }) + } + + if (this.printerSupportsZEndstopCalibrate) { + tools.push({ + name: 'Z_ENDSTOP_CALIBRATE', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onZEndstopCalibrate + }) + } + + if (this.printerSupportsZTiltAdjust) { + tools.push({ + name: 'Z_TILT_ADJUST', + disabled: !this.allHomed || this.isManualProbeActive, + wait: this.$waits.onZTilt + }) + } + + return tools + .sort((a, b) => a.name.localeCompare(b.name)) + } + get printerSupportsForceMove () { return ( (this.printerSettings.force_move?.enable_force_move ?? false) && @@ -191,14 +316,6 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) { } } - bedScrewsAdjust () { - if (this.isBedScrewsAdjustActive) { - this.bedScrewsAdjustDialogOpen = true - } else { - this.sendGcode('BED_SCREWS_ADJUST', this.$waits.onBedScrewsAdjust) - } - } - 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 4ed9a920c7..3370d92553 100644 --- a/src/globals.ts +++ b/src/globals.ts @@ -375,6 +375,8 @@ export const Waits = Object.freeze({ onZTilt: 'onZTilt', onBedScrewsAdjust: 'onBedScrewAdjust', onBedScrewsCalculate: 'onBedScrewsCalculate', + onBedTiltCalibrate: 'onBedTiltCalibrate', + onDeltaCalibrate: 'onDeltaCalibrate', onPrintPause: 'onPrintPause', onPrintCancel: 'onPrintCancel', onPrintResume: 'onPrintResume', @@ -406,6 +408,8 @@ export const Waits = Object.freeze({ onJobQueue: 'onJobQueue', onTimelapseSaveFrame: 'onTimelapseSaveFrame', onManualProbe: 'onManualProbe', + onProbeCalibrate: 'onProbeCalibrate', + onZEndstopCalibrate: 'onZEndstopCalibrate', onQueryEndstops: 'onQueryEndstops', onQueryProbe: 'onQueryProbe', onVersionRefresh: 'onVersionRefresh', diff --git a/src/locales/de.yaml b/src/locales/de.yaml index 0df8721db6..5181cbd3ce 100644 --- a/src/locales/de.yaml +++ b/src/locales/de.yaml @@ -607,20 +607,15 @@ app: home_y: 'Y' home_all: Alle tooltip: + absolute_positioning: Absolute Positionierung extruder_disabled: >- Extruder deaktiviert, da unter der min_extrude_temp (%{min}°C) home_xy: Home XY home_z: Home Z - motors_off: MOTOREN AUS - relative_positioning: Relative Positionierung - absolute_positioning: Absolute Positionierung - force_move: FORCE_MOVE - screws_tilt_calculate: Screws_Tilt_Calculate - z_tilt_adjust: Z_Tilt_Adjust - quad_gantry_level: QGL - bed_screws_adjust: BED_SCREWS_ADJUST manual_probe: Manuelles Probing + motors_off: Motoren Aus + relative_positioning: Relative Positionierung title: bed_screws_adjust: Bettschrauben einstellen manual_probe: Manuelles Probing diff --git a/src/locales/en.yaml b/src/locales/en.yaml index 4f5973f37c..25f1904af2 100644 --- a/src/locales/en.yaml +++ b/src/locales/en.yaml @@ -644,13 +644,9 @@ app: home_xy: Home XY home_z: Home Z manual_probe: Manual Probe - motors_off: MOTORS OFF - z_tilt_adjust: Z_Tilt_Adjust - quad_gantry_level: QGL + motors_off: Motors Off relative_positioning: Relative Positioning - screws_tilt_calculate: Screws_Tilt_Calculate - bed_screws_adjust: BED_SCREWS_ADJUST - force_move: FORCE_MOVE + tools: Tools label: stats_active_extruder: >- The active extruder configuration is set for diff --git a/src/locales/es.yaml b/src/locales/es.yaml index 69dc295716..7507deb65e 100644 --- a/src/locales/es.yaml +++ b/src/locales/es.yaml @@ -488,17 +488,13 @@ app: bed_screws_adjust: Ajustar tornillos de la cama tooltip: absolute_positioning: Posicionamiento Absoluto - bed_screws_adjust: BED_SCREWS_ADJUST extruder_disabled: >- Extrusor deshabilidado, por debajo de min_extrude_temp (%{min}°C) - force_move: FORCE_MOVE home_xy: Origen XY home_z: Origen Z - motors_off: APAGAR MOTORES + motors_off: Apagar Motores relative_positioning: Posicionamiento Relativo - screws_tilt_calculate: Screws_Tilt_Calculate - z_tilt_adjust: Z_Tilt_Adjust version: btn: check_for_updates: Buscar actualizaciones diff --git a/src/locales/hu.yaml b/src/locales/hu.yaml index 271762bb8d..8167bad4c4 100644 --- a/src/locales/hu.yaml +++ b/src/locales/hu.yaml @@ -635,13 +635,8 @@ app: home_xy: XY kezdőpont home_z: Z kezdőpont manual_probe: Kézi szonda - motors_off: MOTOROK KI - z_tilt_adjust: Z_Tilt_Adjust - quad_gantry_level: QGL + motors_off: Motorok Ki relative_positioning: Relatív pozicionálás - screws_tilt_calculate: Screws_Tilt_Calculate - bed_screws_adjust: BED_SCREWS_ADJUST - force_move: FORCE_MOVE label: stats_active_extruder: >- Az aktív extruder konfigurációja be van állítva diff --git a/src/locales/ja.yaml b/src/locales/ja.yaml index 31e923b3e9..c86d492c73 100644 --- a/src/locales/ja.yaml +++ b/src/locales/ja.yaml @@ -640,17 +640,12 @@ app: manual_probe: マニュアルプローブ tooltip: absolute_positioning: 相対位置 - bed_screws_adjust: ベッドスクリューの調整 extruder_disabled: '最小温度未満(%{min}°C)のためホットエンドが無効です。' - force_move: 強制移動 home_xy: Home XY home_z: Home Z manual_probe: マニュアルプローブ motors_off: モーターオフ - quad_gantry_level: QGL relative_positioning: 相対位置 - screws_tilt_calculate: ネジチルト計算 - z_tilt_adjust: Zチルト調整 version: btn: check_for_updates: アップデートを確認 diff --git a/src/locales/ru.yaml b/src/locales/ru.yaml index dbbe7c1154..1c70e0571d 100644 --- a/src/locales/ru.yaml +++ b/src/locales/ru.yaml @@ -601,13 +601,8 @@ app: home_xy: Домой XY home_z: Домой Z manual_probe: Ручная регулировка стола - motors_off: МОТОРЫ ВЫКЛ - z_tilt_adjust: Z Регулировка наклона - quad_gantry_level: QGL + motors_off: Моторы Выкл relative_positioning: Относительная позиция - screws_tilt_calculate: Расчет Наклона Винтами - bed_screws_adjust: РЕГУЛИРОВКА ВИНТОВ СТОЛА - force_move: Форс. перемещение label: stats_active_extruder: >- Активный экструдер настроен на diff --git a/src/locales/uk.yaml b/src/locales/uk.yaml index 3421a05fbc..7e42085ce6 100644 --- a/src/locales/uk.yaml +++ b/src/locales/uk.yaml @@ -661,12 +661,7 @@ app: home_z: Додому Z manual_probe: Manual Probe motors_off: Вимкнути мотори - z_tilt_adjust: Регулювання нахилу осі Z - quad_gantry_level: QGL relative_positioning: Відносне позиціонування - screws_tilt_calculate: Розрахунок нахилу гвинтів - bed_screws_adjust: Регулювання гвинтів столу - force_move: FORCE_MOVE label: stats_active_extruder: >- Конфігурація активного екструдера diff --git a/src/locales/zh-CN.yaml b/src/locales/zh-CN.yaml index 52473ed524..b448d27c1d 100644 --- a/src/locales/zh-CN.yaml +++ b/src/locales/zh-CN.yaml @@ -591,12 +591,7 @@ app: home_z: 归位 Z manual_probe: 手动探测 motors_off: 关闭电机 - z_tilt_adjust: Z轴倾斜调整 - quad_gantry_level: 龙门架调平 relative_positioning: 相对位置 - screws_tilt_calculate: 辅助调平螺丝 - bed_screws_adjust: 手动调平螺丝 - force_move: 强制移动 label: stats_active_extruder: '挤出机配置为耗材直径 %{filamentDiameter}mm,喷嘴直径 %{nozzleDiameter}mm' stats_volumetric_flow: '以 %{extrudeSpeed}mm/s 的速度,预估挤出耗材体积为 %{estimatedVolumetricFlow}mm³/s' diff --git a/src/locales/zh-HK.yaml b/src/locales/zh-HK.yaml index c1bdf4e5e2..f504463e05 100644 --- a/src/locales/zh-HK.yaml +++ b/src/locales/zh-HK.yaml @@ -582,11 +582,7 @@ app: home_z: 歸位 Z manual_probe: 手動探測 motors_off: 關閉電機 - z_tilt_adjust: Z軸傾斜調整 - quad_gantry_level: 龍門架調平 relative_positioning: 相對位置 - screws_tilt_calculate: 輔助調平螺絲 - bed_screws_adjust: 手動調平螺絲 label: stats_active_extruder: '擠出機配置為耗材直徑 %{filamentDiameter}mm,噴嘴直徑 %{nozzleDiameter}mm' stats_volumetric_flow: '以 %{extrudeSpeed}mm/s 的速度,預估擠出耗材體積為 %{estimatedVolumetricFlow}mm³/s'