From 18674376b880fd97fdc08c305edb7e07153ff5ca Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sat, 23 Aug 2025 13:16:06 +0200 Subject: [PATCH] Ensure mm/min in CNC mode --- src/i18n/de.json | 1 + src/i18n/en.json | 1 + src/i18n/es.json | 1 + src/i18n/fr.json | 1 + src/i18n/hu.json | 1 + src/i18n/ja.json | 1 + src/i18n/nl.json | 3 ++- src/i18n/pl.json | 1 + src/i18n/pt_br.json | 1 + src/i18n/ru.json | 1 + src/i18n/tr.json | 1 + src/i18n/uk.json | 1 + src/i18n/zh_cn.json | 1 + src/utils/display.ts | 11 ++++++++--- 14 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/i18n/de.json b/src/i18n/de.json index 4f311b8f9..63114e4ef 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -737,6 +737,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Einzelbettsteuerung", "groupTools": "Identische Werkzeuge gruppieren", "singleChamberControl": "Einkammersteuerung" diff --git a/src/i18n/en.json b/src/i18n/en.json index 8317a1877..cf98cf8fb 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -736,6 +736,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Single bed control", "groupTools": "Group identical tools", "singleChamberControl": "Single chamber control" diff --git a/src/i18n/es.json b/src/i18n/es.json index 247732963..72dceec57 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -737,6 +737,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Control de cama individual", "groupTools": "Agrupar herramientas idénticas", "singleChamberControl": "Control de cámara única" diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 3af4b9279..5187a10c1 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -737,6 +737,7 @@ "unitInches": "pouces", "unitMm": "millimètre", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Commande lit simple", "groupTools": "Regrouper les outils identiques", "singleChamberControl": "Commande à chambre unique" diff --git a/src/i18n/hu.json b/src/i18n/hu.json index 45859039c..b1b45e529 100644 --- a/src/i18n/hu.json +++ b/src/i18n/hu.json @@ -736,6 +736,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Csoportos asztal vezérlés", "groupTools": "Azonos szerszámok csoportosítása", "singleChamberControl": "Csoportos kamra vezérlés" diff --git a/src/i18n/ja.json b/src/i18n/ja.json index b802ae1da..511a600ed 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -737,6 +737,7 @@ "unitInches": "インチ", "unitMm": "んん", "unitMmSpeed": "mm/秒", + "unitMmPerMinSpeed": "mm/分", "singleBedControl": "シングルベッドコントロール", "groupTools": "同一のツールをグループ化する", "singleChamberControl": "シングルチャンバー制御" diff --git a/src/i18n/nl.json b/src/i18n/nl.json index 547a10cb2..e8682ace7 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -738,7 +738,8 @@ "unitInchSpeed": "ipm", "unitInches": "inches", "unitMm": "mm", - "unitMmSpeed": "mm/sec" + "unitMmSpeed": "mm/sec", + "unitMmPerMinSpeed": "mm/min" }, "settingsBehaviour": { "behaviourJobStart": "Schakel niet automatisch over naar Statuspaneel bij het starten van de taak", diff --git a/src/i18n/pl.json b/src/i18n/pl.json index 6b11e65d9..512d8abb3 100644 --- a/src/i18n/pl.json +++ b/src/i18n/pl.json @@ -737,6 +737,7 @@ "unitInches": "cale", "unitMm": "mm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Sterowanie pojedynczym łóżkiem", "groupTools": "Pogrupuj identyczne narzędzia", "singleChamberControl": "Sterowanie jednokomorowe" diff --git a/src/i18n/pt_br.json b/src/i18n/pt_br.json index 876bda153..0f6859ea1 100644 --- a/src/i18n/pt_br.json +++ b/src/i18n/pt_br.json @@ -737,6 +737,7 @@ "unitInches": "polegadas", "unitMm": "milímetros", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "Controle de cama de solteiro", "groupTools": "Agrupar ferramentas idênticas", "singleChamberControl": "Controle de câmara única" diff --git a/src/i18n/ru.json b/src/i18n/ru.json index f55adec7b..ed2e55019 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -737,6 +737,7 @@ "unitInches": "дюймы", "unitMm": "мм", "unitMmSpeed": "мм/с", + "unitMmPerMinSpeed": "мм/мин", "singleBedControl": "Раздельное управление столами", "groupTools": "Сгруппировать одинаковые инструменты", "singleChamberControl": "Раздельное управление термокамерами" diff --git a/src/i18n/tr.json b/src/i18n/tr.json index c2900da59..c05609cc7 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -737,6 +737,7 @@ "unitInches": "inç", "unitMm": "mm", "unitMmSpeed": "mm/sn", + "unitMmPerMinSpeed": "mm/dk", "singleBedControl": "Tek kişilik yatak kontrolü", "groupTools": "Grup özdeş araçlar", "singleChamberControl": "Tek bölmeli kontrol" diff --git a/src/i18n/uk.json b/src/i18n/uk.json index 8c54842e6..3286f85fe 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -736,6 +736,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/хв", "singleBedControl": "Контроль столом", "groupTools": "Група ідентичних інструментів", "singleChamberControl": "Контроль термокамерою" diff --git a/src/i18n/zh_cn.json b/src/i18n/zh_cn.json index 0354f8647..dead8a03c 100644 --- a/src/i18n/zh_cn.json +++ b/src/i18n/zh_cn.json @@ -736,6 +736,7 @@ "unitMm": "mm", "unitInchSpeed": "ipm", "unitMmSpeed": "mm/s", + "unitMmPerMinSpeed": "mm/min", "singleBedControl": "单个热床控制", "groupTools": "分组相同的工具", "singleChamberControl": "单个加热室控制" diff --git a/src/utils/display.ts b/src/utils/display.ts index 35c525ee8..90ab9592a 100644 --- a/src/utils/display.ts +++ b/src/utils/display.ts @@ -105,11 +105,16 @@ export function displaySize(bytes: number | null | undefined) { /** * Display a move speed * @param speed Speed in mm/s - * @returns Formatted move speed in mm/s or ipm + * @returns Formatted move speed in mm/s (or: mm/min in CNC-Mode) or ipm */ export function displayMoveSpeed(speed: number | null | undefined) { - if (typeof speed === "number" && store.state.settings.displayUnits === UnitOfMeasure.imperial) { - return display(speed * 60 / 25.4, 1, i18n.t("panel.settingsAppearance.unitInchSpeed")); + if (typeof speed === "number") { + if (store.state.settings.displayUnits === UnitOfMeasure.imperial) { + return display(speed * 60 / 25.4, 1, i18n.t("panel.settingsAppearance.unitInchSpeed")); + } + if (store.state.machine.model.state.machineMode === MachineMode.cnc) { + return display(speed * 60, 1, i18n.t("panel.settingsAppearance.unitMmPerMinSpeed")); + } } return display(speed, 1, i18n.t("panel.settingsAppearance.unitMmSpeed")); }