From aed577271ff94c822e861d8f652f2bdf46b2aeb9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 17 Nov 2023 22:39:00 -0600 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A8=20Rotational=20move=20items=20?= =?UTF-8?q?(#26438)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 3 +++ Marlin/src/inc/Conditionals_post.h | 2 ++ Marlin/src/lcd/language/language_an.h | 1 + Marlin/src/lcd/language/language_bg.h | 1 + Marlin/src/lcd/language/language_ca.h | 1 + Marlin/src/lcd/language/language_cz.h | 1 + Marlin/src/lcd/language/language_da.h | 1 + Marlin/src/lcd/language/language_de.h | 1 + Marlin/src/lcd/language/language_en.h | 1 + Marlin/src/lcd/language/language_es.h | 1 + Marlin/src/lcd/language/language_eu.h | 1 + Marlin/src/lcd/language/language_fi.h | 1 + Marlin/src/lcd/language/language_fr.h | 1 + Marlin/src/lcd/language/language_fr_na.h | 1 + Marlin/src/lcd/language/language_gl.h | 1 + Marlin/src/lcd/language/language_hr.h | 1 + Marlin/src/lcd/language/language_hu.h | 1 + Marlin/src/lcd/language/language_it.h | 1 + Marlin/src/lcd/language/language_jp_kana.h | 1 + Marlin/src/lcd/language/language_nl.h | 1 + Marlin/src/lcd/language/language_pl.h | 1 + Marlin/src/lcd/language/language_pt.h | 1 + Marlin/src/lcd/language/language_pt_br.h | 1 + Marlin/src/lcd/language/language_ro.h | 1 + Marlin/src/lcd/language/language_ru.h | 1 + Marlin/src/lcd/language/language_sk.h | 1 + Marlin/src/lcd/language/language_sv.h | 1 + Marlin/src/lcd/language/language_tr.h | 1 + Marlin/src/lcd/language/language_uk.h | 1 + Marlin/src/lcd/language/language_vi.h | 1 + Marlin/src/lcd/language/language_zh_TW.h | 1 + Marlin/src/lcd/menu/menu_motion.cpp | 27 ++++++++++++++-------- Marlin/src/module/motion.h | 7 ++++++ 33 files changed, 59 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 13205acfdd36..275bcaa66926 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1533,6 +1533,9 @@ //#define MANUAL_MOVE_DISTANCE_IN 1.000, 0.500, 0.100, 0.010, 0.001 // (in) //#define MANUAL_MOVE_DISTANCE_IN 5.000, 1.000, 0.500, 0.100, 0.010, 0.001 // (in) + // Manual move distances for rotational axes + #define MANUAL_MOVE_DISTANCE_DEG 90, 45, 22.5, 5, 1 // (°) + // BACK menu items keep the highlight at the top //#define TURBO_BACK_MENU_ITEM diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index d172f6d858d9..002e5621d472 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -103,6 +103,8 @@ #if ANY(AXIS4_ROTATES, AXIS5_ROTATES, AXIS6_ROTATES, AXIS7_ROTATES, AXIS8_ROTATES, AXIS9_ROTATES) #define HAS_ROTATIONAL_AXES 1 +#else + #undef MANUAL_MOVE_DISTANCE_DEG #endif #if HAS_X_AXIS diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 110bac2c9abc..5e7d81d956de 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -88,6 +88,7 @@ namespace LanguageNarrow_an { LSTR MSG_MOVE_EN = _UxGT("Extrusor *"); LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mover $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mover $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocidat"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Base Z"); LSTR MSG_NOZZLE = _UxGT("Boquilla"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index f86cf08dff66..11df9cee3139 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -77,6 +77,7 @@ namespace LanguageNarrow_bg { LSTR MSG_MOVE_EN = _UxGT("Екструдер *"); LSTR MSG_MOVE_N_MM = _UxGT("Премести с $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Премести с $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Премести с $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Скорост"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bed Z"); LSTR MSG_NOZZLE = " " LCD_STR_THERMOMETER _UxGT(" Дюза"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 37f885540d4d..65ad2325da43 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -88,6 +88,7 @@ namespace LanguageNarrow_ca { LSTR MSG_MOVE_EN = _UxGT("Extrusor *"); LSTR MSG_MOVE_N_MM = _UxGT("Mou $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mou $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mou $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocitat"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Llit Z"); LSTR MSG_NOZZLE = _UxGT("Nozzle"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 5324d56ff243..25223155d61c 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -232,6 +232,7 @@ namespace LanguageNarrow_cz { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený"); LSTR MSG_MOVE_N_MM = _UxGT("Posunout o $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Posunout o $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Posunout o $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Rychlost"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Výška podl."); LSTR MSG_NOZZLE = _UxGT("Tryska"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 612e95e986e3..78806c7d50f9 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -79,6 +79,7 @@ namespace LanguageNarrow_da { LSTR MSG_MOVE_EN = _UxGT("Flyt *"); LSTR MSG_MOVE_N_MM = _UxGT("Flyt $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Flyt $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Flyt $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Hastighed"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Plade Z"); LSTR MSG_NOZZLE = _UxGT("Dyse"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index ea08f2191f0d..e9202718ce08 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -290,6 +290,7 @@ namespace LanguageNarrow_de { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend zu kalt"); LSTR MSG_MOVE_N_MM = _UxGT(" $ mm"); LSTR MSG_MOVE_N_IN = _UxGT(" $ in"); + LSTR MSG_MOVE_N_DEG = _UxGT(" $ ") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Geschw."); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bett Z"); LSTR MSG_NOZZLE = _UxGT("Düse"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 03625098ffab..d049630555c3 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -318,6 +318,7 @@ namespace LanguageNarrow_en { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend too cold"); LSTR MSG_MOVE_N_MM = _UxGT("Move $ mm"); LSTR MSG_MOVE_N_IN = _UxGT("Move $ in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Move $ ") LCD_STR_DEGREE; LSTR MSG_LIVE_MOVE = _UxGT("Live Move"); LSTR MSG_SPEED = _UxGT("Speed"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bed Z"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 147ce7abcfd7..34555b5443c3 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -230,6 +230,7 @@ namespace LanguageNarrow_es { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend muy frio"); LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mover $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mover $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocidad"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Cama Z"); LSTR MSG_NOZZLE = _UxGT("Boquilla"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 4ab4bd96dd49..b9edbd45bdb7 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -139,6 +139,7 @@ namespace LanguageNarrow_eu { LSTR MSG_MOVE_EN = _UxGT("Estrusorea *"); LSTR MSG_MOVE_N_MM = _UxGT("Mugitu $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mugitu $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mugitu $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Abiadura"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Z Ohea"); LSTR MSG_NOZZLE = _UxGT("Pita"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 466ac19fe0ac..75afc8279dde 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -74,6 +74,7 @@ namespace LanguageNarrow_fi { LSTR MSG_MOVE_EN = _UxGT("Extruder *"); LSTR MSG_MOVE_N_MM = _UxGT("Liikuta $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Liikuta $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Liikuta $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Nopeus"); LSTR MSG_NOZZLE = _UxGT("Suutin"); LSTR MSG_NOZZLE_N = _UxGT("Suutin ~"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 79c06b2eca03..ff81614b156c 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -234,6 +234,7 @@ namespace LanguageNarrow_fr { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Buse trop froide"); LSTR MSG_MOVE_N_MM = _UxGT("Déplacer $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Déplacer $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Déplacer $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Vitesse"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Lit Z"); LSTR MSG_NOZZLE = _UxGT("Buse"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index f125ce7f6b02..d2d165dd3863 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -234,6 +234,7 @@ namespace LanguageNarrow_fr_na { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Buse trop froide"); LSTR MSG_MOVE_N_MM = _UxGT("Deplacer $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Deplacer $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Deplacer $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Vitesse"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Lit Z"); LSTR MSG_NOZZLE = _UxGT("Buse"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index fa4d189de0ee..b647eabb8884 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -227,6 +227,7 @@ namespace LanguageNarrow_gl { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Bico moi frío"); LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mover $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mover $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocidade"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Cama Z"); LSTR MSG_NOZZLE = _UxGT("Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index f1e020efaf46..68fb062e313e 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -84,6 +84,7 @@ namespace LanguageNarrow_hr { LSTR MSG_MOVE_EN = _UxGT("Miči *"); LSTR MSG_MOVE_N_MM = _UxGT("Miči $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Miči $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Miči $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Brzina"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bed Z"); LSTR MSG_NOZZLE = _UxGT("Dizna"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 7d4e632bb887..771b3b66ff4c 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -262,6 +262,7 @@ namespace LanguageNarrow_hu { LSTR MSG_HOTEND_TOO_COLD = _UxGT("A fej túl hideg"); LSTR MSG_MOVE_N_MM = _UxGT("Mozgás $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mozgás $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mozgás $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Sebesség"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Z ágy"); LSTR MSG_NOZZLE = _UxGT("Fej"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 2c78a79a3d26..35bc50d0d203 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -311,6 +311,7 @@ namespace LanguageNarrow_it { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Ugello freddo"); LSTR MSG_MOVE_N_MM = _UxGT("Muovi di $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Muovi di $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Muovi di $") LCD_STR_DEGREE; LSTR MSG_LIVE_MOVE = _UxGT("Modalità Live"); LSTR MSG_SPEED = _UxGT("Velocità"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Piatto Z"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index a87fcf65090e..3ea82d630211 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -97,6 +97,7 @@ namespace LanguageNarrow_jp_kana { LSTR MSG_MOVE_EN = _UxGT("* エクストルーダー"); // "En" LSTR MSG_MOVE_N_MM = _UxGT("$mm イドウ"); // "Move $mm" LSTR MSG_MOVE_N_IN = _UxGT("$in イドウ"); // "Move $in" + LSTR MSG_MOVE_N_DEG = _UxGT("$" LCD_STR_DEGREE " イドウ"); // "Move $°" LSTR MSG_SPEED = _UxGT("ソクド"); // "Speed" LSTR MSG_MESH_Z_OFFSET = _UxGT("Zオフセット"); // "Bed Z" LSTR MSG_NOZZLE = _UxGT("ノズル"); // "Nozzle" diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 72a166851593..2f185066b90f 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -89,6 +89,7 @@ namespace LanguageNarrow_nl { LSTR MSG_MOVE_EN = _UxGT("Extruder *"); LSTR MSG_MOVE_N_MM = _UxGT("Verplaats $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Verplaats $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Verplaats $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Snelheid"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bed Z"); LSTR MSG_NOZZLE = _UxGT("Nozzle"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 5fbf0c040add..53f62b5bb338 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -241,6 +241,7 @@ namespace LanguageNarrow_pl { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Dysza za zimna"); LSTR MSG_MOVE_N_MM = _UxGT("Przesuń co $ mm"); LSTR MSG_MOVE_N_IN = _UxGT("Przesuń co $ in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Przesuń co $ ") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Predkość"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Stół Z"); LSTR MSG_NOZZLE = _UxGT("Dysza"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 2bf0b92a67db..989909e7e7af 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -83,6 +83,7 @@ namespace LanguageNarrow_pt { LSTR MSG_MOVE_EN = _UxGT("Mover Extrusor *"); LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mover $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mover $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocidade"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Base Z"); LSTR MSG_NOZZLE = " " LCD_STR_THERMOMETER _UxGT(" Bico"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 3dd4c1c9ee9f..58b592fd9036 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -213,6 +213,7 @@ namespace LanguageNarrow_pt_br { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Extrus. mto fria"); LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Mover $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Mover $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Velocidade"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Base Z"); LSTR MSG_NOZZLE = _UxGT("Bocal"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index e24da73a190a..e7f60dce9bed 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -226,6 +226,7 @@ namespace LanguageNarrow_ro { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Capat Prea Rece"); LSTR MSG_MOVE_N_MM = _UxGT("Move $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Move $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Move $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Speed"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bed Z"); LSTR MSG_NOZZLE = _UxGT("Nozzle"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index ad0e0d3c95d6..a16d38a85235 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -265,6 +265,7 @@ namespace LanguageNarrow_ru { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Сопло не нагрето"); LSTR MSG_MOVE_N_MM = _UxGT("Движение $мм"); LSTR MSG_MOVE_N_IN = _UxGT("Движение $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Движение $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Скорость"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Z стола"); LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE _UxGT("C"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index b90dfd038a42..f27e20d83462 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -307,6 +307,7 @@ namespace LanguageNarrow_sk { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený"); LSTR MSG_MOVE_N_MM = _UxGT("Posunúť o $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Posunúť o $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Posunúť o $") LCD_STR_DEGREE; LSTR MSG_LIVE_MOVE = _UxGT("Živý pohyb"); LSTR MSG_SPEED = _UxGT("Rýchlosť"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Výška podl."); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 5f74f299bf0c..9a4e712dcd77 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -253,6 +253,7 @@ namespace LanguageNarrow_sv { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Hetände för kall"); LSTR MSG_MOVE_N_MM = _UxGT("Flytta $mm"); LSTR MSG_MOVE_N_IN = _UxGT("Flytta $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Flytta $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Hastighet"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Bädd Z"); LSTR MSG_NOZZLE = _UxGT("Munstycke"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index cdff56f89b98..bc130bf37541 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -293,6 +293,7 @@ namespace LanguageNarrow_tr { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Nozul Çok Soğuk"); LSTR MSG_MOVE_N_MM = _UxGT("$mm"); LSTR MSG_MOVE_N_IN = _UxGT("$in"); + LSTR MSG_MOVE_N_DEG = _UxGT("$") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Hız"); LSTR MSG_BED_Z = _UxGT("Z Mesafesi"); LSTR MSG_NOZZLE = _UxGT("Nozul"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 4a5e14b6d4e5..d06171643c79 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -264,6 +264,7 @@ namespace LanguageNarrow_uk { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Сопло дуже холодне"); LSTR MSG_MOVE_N_MM = _UxGT("Рух $мм"); LSTR MSG_MOVE_N_IN = _UxGT("Рух $in"); + LSTR MSG_MOVE_N_DEG = _UxGT("Рух $") LCD_STR_DEGREE; LSTR MSG_SPEED = _UxGT("Швидкість"); LSTR MSG_MESH_Z_OFFSET = _UxGT("Z Столу"); LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE _UxGT("C"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 5006ad827fa7..e445413efe80 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -202,6 +202,7 @@ namespace LanguageNarrow_vi { LSTR MSG_HOTEND_TOO_COLD = _UxGT("Đầu nóng quá lạnh"); // Hotend too cold LSTR MSG_MOVE_N_MM = _UxGT("Di chuyển $mm"); // Move $mm LSTR MSG_MOVE_N_IN = _UxGT("Di chuyển $in"); // Move $in + LSTR MSG_MOVE_N_DEG = _UxGT("Di chuyển $") LCD_STR_DEGREE; // Move $° LSTR MSG_SPEED = _UxGT("Tốc độ"); // Speed LSTR MSG_MESH_Z_OFFSET = _UxGT("Z Bàn"); LSTR MSG_NOZZLE = _UxGT("Đầu phun"); // Nozzle diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 14f37079c740..df2a31b3fedb 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -222,6 +222,7 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_HOTEND_TOO_COLD = _UxGT("噴嘴溫度不夠"); // "Hotend too cold" LSTR MSG_MOVE_N_MM = _UxGT("移動 $ mm"); // "Move $mm" LSTR MSG_MOVE_N_IN = _UxGT("移動 $ in"); // "Move $in" + LSTR MSG_MOVE_N_DEG = _UxGT("移動 $ ") LCD_STR_DEGREE; // "Move $°" LSTR MSG_SPEED = _UxGT("速率"); // "Speed" LSTR MSG_MESH_Z_OFFSET = _UxGT("熱床Z"); // "Bed Z" LSTR MSG_NOZZLE = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴"); // "Nozzle" 噴嘴 diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 741b33b0845e..4aea30d998ec 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -152,23 +152,32 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int BACK_ITEM(MSG_MOVE_AXIS); - #ifndef EXTRUDE_MAXLENGTH - #define EXTRUDE_MAXLENGTH 50 + #define __LINEAR_LIMIT(D) ((D) < max_length(axis) / 2 + 1) + #if HAS_EXTRUDERS + #ifndef EXTRUDE_MAXLENGTH + #define EXTRUDE_MAXLENGTH 50 + #endif + #define _LINEAR_LIMIT(D) ((axis < E_AXIS) ? __LINEAR_LIMIT(D) : ((D) < (EXTRUDE_MAXLENGTH) / 2 + 1)) + #else + #define _LINEAR_LIMIT __LINEAR_LIMIT #endif - #define __MOVE_MM(T,D) if (axis < NUM_AXES /* Linear and rotational axes: */ \ - ? (D) > base_max_pos(axis) / 2 /* XYZIJKUVW limit to half axis length */ \ - : TERN0(HAS_EXTRUDERS, (D) <= (EXTRUDE_MAXLENGTH) / 2 + 1) /* E... limit to ~half max length (or 50mm) */ \ - ) SUBMENU_S(F(T), MSG_MOVE_N_MM, []{ _goto_manual_move(D); }); + #define __MOVE_SUB(L,T,D) if (rotational[axis] || _LINEAR_LIMIT(D)) SUBMENU_S(F(T), L, []{ _goto_manual_move(D); }) - if (parser.using_inch_units()) { + if (rotational[axis]) { + #ifdef MANUAL_MOVE_DISTANCE_DEG + #define _MOVE_DEG(D) __MOVE_SUB(MSG_MOVE_N_DEG, STRINGIFY(D), D); + MAP(_MOVE_DEG, MANUAL_MOVE_DISTANCE_DEG) + #endif + } + else if (parser.using_inch_units()) { #ifdef MANUAL_MOVE_DISTANCE_IN - #define _MOVE_IN(I) __MOVE_MM(STRINGIFY(I), IN_TO_MM(I)) + #define _MOVE_IN(I) __MOVE_SUB(MSG_MOVE_N_MM, STRINGIFY(I), IN_TO_MM(I)); MAP(_MOVE_IN, MANUAL_MOVE_DISTANCE_IN) #endif } else { #ifdef MANUAL_MOVE_DISTANCE_MM - #define _MOVE_MM(M) __MOVE_MM(STRINGIFY(M), M) + #define _MOVE_MM(M) __MOVE_SUB(MSG_MOVE_N_MM, STRINGIFY(M), M); MAP(_MOVE_MM, MANUAL_MOVE_DISTANCE_MM) #endif #if HAS_Z_AXIS diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 7d5d657ac735..ae9224dea4d4 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -142,6 +142,13 @@ XYZ_DEFS(float, base_home_pos, HOME_POS); XYZ_DEFS(float, max_length, MAX_LENGTH); XYZ_DEFS(int8_t, home_dir, HOME_DIR); +// Flags for rotational axes +constexpr AxisFlags rotational{0 LOGICAL_AXIS_GANG( + || 0, || 0, || 0, || 0, + || (ENABLED(AXIS4_ROTATES)< Date: Sun, 19 Nov 2023 00:22:58 +0000 Subject: [PATCH 2/3] [cron] Bump distribution date (2023-11-19) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index d16ec74078c4..fc4c3db7a927 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2023-11-18" +//#define STRING_DISTRIBUTION_DATE "2023-11-19" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 04849a624c98..efe2dfba6adf 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2023-11-18" + #define STRING_DISTRIBUTION_DATE "2023-11-19" #endif /** From f345f60f7386e8d04232e1a7b128a70f78b41b13 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 18 Nov 2023 23:49:44 -0600 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20Similar=20board=20name=20err?= =?UTF-8?q?ors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/pins/pins.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index d8fe329761e1..8e89eb90a7eb 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -934,41 +934,41 @@ #define BOARD_BTT_MANTA_M4P_V1_0 99927 #if MB(MKS_13) - #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration." + #error "BOARD_MKS_13 is now BOARD_MKS_GEN_13. Please update your configuration." #elif MB(TRIGORILLA) - #error "BOARD_TRIGORILLA has been renamed BOARD_TRIGORILLA_13. Please update your configuration." + #error "BOARD_TRIGORILLA is now BOARD_TRIGORILLA_13. Please update your configuration." #elif MB(RURAMPS4D) - #error "BOARD_RURAMPS4D has been renamed BOARD_RURAMPS4D_11. Please update your configuration." + #error "BOARD_RURAMPS4D is now BOARD_RURAMPS4D_11. Please update your configuration." #elif MB(FORMBOT_TREX2) - #error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration." + #error "FORMBOT_TREX2 is now BOARD_FORMBOT_TREX2PLUS. Please update your configuration." #elif MB(BIQU_SKR_V1_1) - #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration." + #error "BOARD_BIQU_SKR_V1_1 is now BOARD_BTT_SKR_V1_1. Please update your configuration." #elif MB(BIGTREE_SKR_V1_1) - #error "BOARD_BIGTREE_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration." + #error "BOARD_BIGTREE_SKR_V1_1 is now BOARD_BTT_SKR_V1_1. Please update your configuration." #elif MB(BIGTREE_SKR_V1_2) - #error "BOARD_BIGTREE_SKR_V1_2 has been renamed BOARD_BTT_SKR_V1_2. Please update your configuration." + #error "BOARD_BIGTREE_SKR_V1_2 is now BOARD_BTT_SKR_V1_2. Please update your configuration." #elif MB(BIGTREE_SKR_V1_3) - #error "BOARD_BIGTREE_SKR_V1_3 has been renamed BOARD_BTT_SKR_V1_3. Please update your configuration." + #error "BOARD_BIGTREE_SKR_V1_3 is now BOARD_BTT_SKR_V1_3. Please update your configuration." #elif MB(BIGTREE_SKR_V1_4) - #error "BOARD_BIGTREE_SKR_V1_4 has been renamed BOARD_BTT_SKR_V1_4. Please update your configuration." + #error "BOARD_BIGTREE_SKR_V1_4 is now BOARD_BTT_SKR_V1_4. Please update your configuration." #elif MB(BIGTREE_SKR_V1_4_TURBO) - #error "BOARD_BIGTREE_SKR_V1_4_TURBO has been renamed BOARD_BTT_SKR_V1_4_TURBO. Please update your configuration." + #error "BOARD_BIGTREE_SKR_V1_4_TURBO is now BOARD_BTT_SKR_V1_4_TURBO. Please update your configuration." #elif MB(BIGTREE_BTT002_V1_0) - #error "BOARD_BIGTREE_BTT002_V1_0 has been renamed BOARD_BTT_BTT002_V1_0. Please update your configuration." + #error "BOARD_BIGTREE_BTT002_V1_0 is now BOARD_BTT_BTT002_V1_0. Please update your configuration." #elif MB(BIGTREE_SKR_PRO_V1_1) - #error "BOARD_BIGTREE_SKR_PRO_V1_1 has been renamed BOARD_BTT_SKR_PRO_V1_1. Please update your configuration." + #error "BOARD_BIGTREE_SKR_PRO_V1_1 is now BOARD_BTT_SKR_PRO_V1_1. Please update your configuration." #elif MB(BIGTREE_SKR_MINI_V1_1) - #error "BOARD_BIGTREE_SKR_MINI_V1_1 has been renamed BOARD_BTT_SKR_MINI_V1_1. Please update your configuration." + #error "BOARD_BIGTREE_SKR_MINI_V1_1 is now BOARD_BTT_SKR_MINI_V1_1. Please update your configuration." #elif MB(BIGTREE_SKR_MINI_E3) - #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration." + #error "BOARD_BIGTREE_SKR_MINI_E3 is now BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration." #elif MB(BIGTREE_SKR_E3_DIP) - #error "BOARD_BIGTREE_SKR_E3_DIP has been renamed BOARD_BTT_SKR_E3_DIP. Please update your configuration." + #error "BOARD_BIGTREE_SKR_E3_DIP is now BOARD_BTT_SKR_E3_DIP. Please update your configuration." #elif MB(STM32F1R) - #error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration." + #error "BOARD_STM32F1R is now BOARD_STM32F103RE. Please update your configuration." #elif MB(STM32F103R) - #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration." + #error "BOARD_STM32F103R is now BOARD_STM32F103RE. Please update your configuration." #elif MOTHERBOARD == BOARD_ESP32 - #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration." + #error "BOARD_ESP32 is now BOARD_ESPRESSIF_ESP32. Please update your configuration." #elif MB(STEVAL) #error "BOARD_STEVAL_3DP001V1 (BOARD_STEVAL) is no longer supported in Marlin." #elif MB(RUMBA32)