diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h index 2c0eb7aa72..81a1754d5e 100644 --- a/Marlin/src/core/multi_language.h +++ b/Marlin/src/core/multi_language.h @@ -91,6 +91,7 @@ typedef const char Language_Str[]; #define LANG_CHARSIZE GET_TEXT(CHARSIZE) #define USE_WIDE_GLYPH (LANG_CHARSIZE > 2) +// The final "\0" is added invisibly by the compiler #define MSG_1_LINE(A) A "\0" "\0" #define MSG_2_LINE(A,B) A "\0" B "\0" #define MSG_3_LINE(A,B,C) A "\0" B "\0" C diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp index c6717268a6..014ccea1af 100644 --- a/Marlin/src/feature/babystep.cpp +++ b/Marlin/src/feature/babystep.cpp @@ -60,7 +60,7 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) { #if ENABLED(BD_SENSOR) void Babystep::set_mm(const AxisEnum axis, const_float_t mm) { - //if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return; + //if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axis_should_home(axis)) return; const int16_t distance = mm * planner.settings.axis_steps_per_mm[axis]; accum = distance; // Count up babysteps for the UI steps[BS_AXIS_IND(axis)] = distance; @@ -70,8 +70,12 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) { } #endif +bool Babystep::can_babystep(const AxisEnum axis) { + return (ENABLED(BABYSTEP_WITHOUT_HOMING) || !axis_should_home(axis)); +} + void Babystep::add_steps(const AxisEnum axis, const int16_t distance) { - if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return; + if (!can_babystep(axis)) return; accum += distance; // Count up babysteps for the UI steps[BS_AXIS_IND(axis)] += distance; diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h index 38a19a3b14..666a0ee8c5 100644 --- a/Marlin/src/feature/babystep.h +++ b/Marlin/src/feature/babystep.h @@ -59,6 +59,7 @@ public: } #endif + static bool can_babystep(const AxisEnum axis); static void add_steps(const AxisEnum axis, const int16_t distance); static void add_mm(const AxisEnum axis, const_float_t mm); diff --git a/Marlin/src/feature/mmu3/mmu2_progress_converter.cpp b/Marlin/src/feature/mmu3/mmu2_progress_converter.cpp index 0e8e258e53..b18f19e3bb 100644 --- a/Marlin/src/feature/mmu3/mmu2_progress_converter.cpp +++ b/Marlin/src/feature/mmu3/mmu2_progress_converter.cpp @@ -30,33 +30,30 @@ #include "../../core/language.h" #include "mmu2_progress_converter.h" -#ifdef __AVR__ - #include -#endif #include "mmu_hw/progress_codes.h" #include "mmu_hw/errors_list.h" namespace MMU3 { FSTR_P const progressTexts[] PROGMEM = { - GET_TEXT_F(MSG_PROGRESS_OK), - GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER), - GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER), + GET_TEXT_F(MSG_PROGRESS_OK), // TODO: Generic messages for Marlin + GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER), // reused below + GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER), // reused below GET_TEXT_F(MSG_PROGRESS_UNLOAD_FINDA), GET_TEXT_F(MSG_PROGRESS_UNLOAD_PULLEY), GET_TEXT_F(MSG_PROGRESS_FEED_FINDA), GET_TEXT_F(MSG_PROGRESS_FEED_EXTRUDER), GET_TEXT_F(MSG_PROGRESS_FEED_NOZZLE), GET_TEXT_F(MSG_PROGRESS_AVOID_GRIND), - GET_TEXT_F(MSG_FINISHING_MOVEMENTS), // reuse from messages.cpp + GET_TEXT_F(MSG_FINISHING_MOVEMENTS), GET_TEXT_F(MSG_PROGRESS_DISENGAGE_IDLER), // err disengaging idler is the same text GET_TEXT_F(MSG_PROGRESS_ENGAGE_IDLER), // engage dtto. GET_TEXT_F(MSG_PROGRESS_WAIT_USER), GET_TEXT_F(MSG_PROGRESS_ERR_INTERNAL), GET_TEXT_F(MSG_PROGRESS_ERR_HELP_FIL), GET_TEXT_F(MSG_PROGRESS_ERR_TMC), - GET_TEXT_F(MSG_UNLOADING_FILAMENT), // reuse from messages.cpp - GET_TEXT_F(MSG_LOADING_FILAMENT), // reuse from messages.cpp + GET_TEXT_F(MSG_UNLOADING_FILAMENT), + GET_TEXT_F(MSG_LOADING_FILAMENT), GET_TEXT_F(MSG_PROGRESS_SELECT_SLOT), GET_TEXT_F(MSG_PROGRESS_PREPARE_BLADE), GET_TEXT_F(MSG_PROGRESS_PUSH_FILAMENT), diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp index 56b4761e25..e15d5d8d15 100644 --- a/Marlin/src/gcode/calibrate/G28.cpp +++ b/Marlin/src/gcode/calibrate/G28.cpp @@ -315,7 +315,7 @@ void GcodeSuite::G28() { #else // !DELTA && !AXEL_TPARA - #define _UNSAFE(A) (homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(A##_AXIS)))) + #define _UNSAFE(A) TERN0(Z_SAFE_HOMING, homeZ && axis_should_home(_AXIS(A))) const bool homeZ = TERN0(HAS_Z_AXIS, parser.seen_test('Z')), NUM_AXIS_LIST_( // Other axes should be homed before Z safe-homing diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h index 31cc0bca36..78aa07b567 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h @@ -7,6 +7,10 @@ #include "langdata.h" +const u8g_fntpgm_uint8_t fontpage_344_146_146[45] U8G_FONT_SECTION("fontpage_344_146_146") = { + 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x92,0x92,0x00,0x09,0xFE,0x00, + 0x00,0x09,0x0B,0x16,0x0A,0x01,0xFE,0xF9,0x00,0x09,0x00,0x11,0x80,0x11,0x00,0x61, + 0x00,0x80,0x00,0x4A,0x00,0x4A,0x00,0x72,0x00,0x4D,0x00,0x74,0x80}; const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = { 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00, 0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0xF9,0x09,0x09,0x11,0x17,0x21,0x41,0x81,0x01, @@ -191,6 +195,10 @@ const u8g_fntpgm_uint8_t fontpage_377_248_248[45] U8G_FONT_SECTION("fontpage_377 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF8,0xF8,0x00,0x09,0xFE,0x00, 0x00,0x0A,0x0B,0x16,0x0A,0x00,0xFE,0x20,0x80,0x20,0x80,0x3F,0x00,0x20,0x80,0x3F, 0x00,0x04,0x00,0xFF,0xC0,0x00,0x00,0x20,0x00,0x20,0x00,0x3F,0x80}; +const u8g_fntpgm_uint8_t fontpage_380_140_140[41] U8G_FONT_SECTION("fontpage_380_140_140") = { + 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x8C,0x8C,0x00,0x09,0x00,0x00, + 0x00,0x0A,0x09,0x12,0x0A,0x00,0x00,0x20,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x20, + 0x80,0x3F,0x80,0x00,0x00,0x00,0x00,0xFF,0xC0}; const u8g_fntpgm_uint8_t fontpage_380_196_196[34] U8G_FONT_SECTION("fontpage_380_196_196") = { 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xC4,0xC4,0x00,0x09,0xFE,0x00, 0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0x89,0x89,0x89,0xF9,0x89,0x89,0x89,0xF9,0x01, @@ -329,6 +337,10 @@ const u8g_fntpgm_uint8_t fontpage_400_156_156[45] U8G_FONT_SECTION("fontpage_400 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0x9C,0x9C,0x00,0x09,0xFE,0x00, 0x00,0x09,0x0B,0x16,0x0A,0x00,0xFE,0x7A,0x80,0x0A,0x80,0x0A,0x80,0x16,0x80,0x12, 0x80,0x2A,0x80,0x4A,0x80,0x86,0x80,0x02,0x80,0x02,0x80,0x02,0x80}; +const u8g_fntpgm_uint8_t fontpage_400_240_240[41] U8G_FONT_SECTION("fontpage_400_240_240") = { + 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0x00,0x00, + 0x00,0x0A,0x09,0x12,0x0A,0x00,0x00,0x3F,0x00,0x01,0x00,0x02,0x00,0x0C,0x00,0x33, + 0x00,0x64,0x80,0x04,0x00,0x04,0x00,0xFF,0xC0}; const u8g_fntpgm_uint8_t fontpage_401_253_253[45] U8G_FONT_SECTION("fontpage_401_253_253") = { 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xFD,0xFD,0x00,0x09,0xFE,0x00, 0x00,0x0A,0x0B,0x16,0x0A,0x00,0xFE,0x3F,0x00,0x01,0x00,0x0E,0x00,0x71,0x80,0x00, @@ -439,6 +451,7 @@ const u8g_fntpgm_uint8_t fontpage_431_136_136[34] U8G_FONT_SECTION("fontpage_431 0x01,0x01}; static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = { + FONTDATA_ITEM(344, 146, 146, fontpage_344_146_146), // '값' -- '값' FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거' FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고' FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그' @@ -485,6 +498,7 @@ static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = { FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베' FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨' FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본' + FONTDATA_ITEM(380, 140, 140, fontpage_380_140_140), // '브' -- '브' FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비' FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사' FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽' @@ -518,6 +532,7 @@ static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = { FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전' FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정' FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제' + FONTDATA_ITEM(400, 240, 240, fontpage_400_240_240), // '조' -- '조' FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽' FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준' FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중' diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h index 60316a1479..ab2ccd024f 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h @@ -493,10 +493,12 @@ const u8g_fntpgm_uint8_t fontpage_183_171_171[45] U8G_FONT_SECTION("fontpage_183 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xAB,0xAB,0x00,0x0A,0xFF,0x00, 0x00,0x0A,0x0B,0x16,0x0C,0x01,0xFF,0x08,0x00,0xFF,0xC0,0x80,0x40,0x3F,0x00,0x21, 0x00,0x3F,0x00,0x00,0x00,0x7F,0x80,0x40,0x80,0x7F,0x80,0x40,0x80}; -const u8g_fntpgm_uint8_t fontpage_183_249_249[45] U8G_FONT_SECTION("fontpage_183_249_249") = { - 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF9,0xF9,0x00,0x0A,0xFF,0x00, - 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x00,0x80,0xF0,0x80,0x1F,0xE0,0x90,0x80,0x50, - 0x80,0x24,0x80,0x22,0x80,0x50,0x80,0x50,0x80,0x82,0x80,0x01,0x00}; +const u8g_fntpgm_uint8_t fontpage_183_248_249[73] U8G_FONT_SECTION("fontpage_183_248_249") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF8,0xF9,0x00,0x0A,0xFF,0x00, + 0x00,0x0A,0x0B,0x16,0x0C,0x01,0xFF,0x02,0x00,0x02,0x00,0x02,0x00,0xFF,0xC0,0x02, + 0x00,0x22,0x00,0x12,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x0E,0x00,0x0B,0x0B,0x16, + 0x0C,0x00,0xFF,0x00,0x80,0xF0,0x80,0x1F,0xE0,0x90,0x80,0x50,0x80,0x24,0x80,0x22, + 0x80,0x50,0x80,0x50,0x80,0x82,0x80,0x01,0x00}; const u8g_fntpgm_uint8_t fontpage_184_134_134[45] U8G_FONT_SECTION("fontpage_184_134_134") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x22,0x00,0x27,0xC0,0xA4,0x80,0x6B,0x00,0x22, @@ -509,6 +511,10 @@ const u8g_fntpgm_uint8_t fontpage_184_177_177[45] U8G_FONT_SECTION("fontpage_184 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB1,0xB1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x11,0x00,0xFD,0x40,0x01,0x20,0x7F,0xE0,0x4A, 0x80,0x7A,0x80,0x12,0x80,0x5A,0xA0,0x56,0xA0,0x92,0xA0,0x34,0x60}; +const u8g_fntpgm_uint8_t fontpage_184_186_186[45] U8G_FONT_SECTION("fontpage_184_186_186") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBA,0xBA,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x3F,0xC0,0x20,0x40,0x20,0x40,0x20,0x40,0x3F, + 0xC0,0x24,0x00,0x24,0x00,0x22,0x00,0x21,0x00,0x40,0x80,0x80,0x60}; const u8g_fntpgm_uint8_t fontpage_184_207_207[45] U8G_FONT_SECTION("fontpage_184_207_207") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xCF,0xCF,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x3F,0xE0,0x20,0x20,0x3F,0xE0,0x28,0x40,0x24, @@ -553,10 +559,6 @@ const u8g_fntpgm_uint8_t fontpage_190_128_128[45] U8G_FONT_SECTION("fontpage_190 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x7F,0xC0,0x11,0x00,0x11,0x00,0x11,0x00,0x11, 0x00,0xFF,0xE0,0x11,0x00,0x21,0x00,0x21,0x00,0x41,0x00,0x81,0x00}; -const u8g_fntpgm_uint8_t fontpage_190_131_131[45] U8G_FONT_SECTION("fontpage_190_131_131") = { - 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x0A,0xFF,0x00, - 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0xFF,0xE0,0x08,0x00,0x10,0x80,0x3F, - 0xC0,0x11,0x00,0xFF,0xE0,0x11,0x00,0x11,0x00,0x21,0x00,0x41,0x00}; const u8g_fntpgm_uint8_t fontpage_190_143_143[45] U8G_FONT_SECTION("fontpage_190_143_143") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8F,0x8F,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x02,0x80,0x02,0x40,0x02,0x00,0xFF,0xE0,0x02, @@ -797,6 +799,10 @@ const u8g_fntpgm_uint8_t fontpage_206_159_159[45] U8G_FONT_SECTION("fontpage_206 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9F,0x9F,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x49,0xE0,0xFD,0x20,0x49,0x20,0x79,0xE0,0x49, 0x20,0x79,0x20,0x49,0xE0,0xFD,0x20,0x01,0x20,0x49,0x20,0x86,0x60}; +const u8g_fntpgm_uint8_t fontpage_206_172_172[45] U8G_FONT_SECTION("fontpage_206_172_172") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xAC,0xAC,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x04,0x00,0xFF,0xE0,0x0E,0x00,0x15, + 0x00,0x15,0x00,0x24,0x80,0x44,0x40,0x9F,0x20,0x04,0x00,0x04,0x00}; const u8g_fntpgm_uint8_t fontpage_206_186_186[45] U8G_FONT_SECTION("fontpage_206_186_186") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBA,0xBA,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x20,0x00,0x27,0x80,0x24,0x80,0xFC,0x80,0x24, @@ -947,6 +953,10 @@ const u8g_fntpgm_uint8_t fontpage_224_239_239[45] U8G_FONT_SECTION("fontpage_224 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xEF,0xEF,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x10,0x00,0x17,0xE0,0x54,0x80,0x58,0x80,0x50, 0x80,0x90,0x80,0x10,0x80,0x10,0x80,0x28,0x80,0x44,0x80,0x81,0x80}; +const u8g_fntpgm_uint8_t fontpage_224_245_245[45] U8G_FONT_SECTION("fontpage_224_245_245") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF5,0xF5,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x3F,0x80,0x00,0x80,0x3F,0x80,0x00,0x80,0x3F, + 0x80,0x04,0x00,0x14,0x40,0x24,0x80,0x0A,0x00,0x11,0x00,0xE0,0xE0}; const u8g_fntpgm_uint8_t fontpage_225_185_185[45] U8G_FONT_SECTION("fontpage_225_185_185") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB9,0xB9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x04,0x00,0x07,0xC0,0x04,0x00,0x3F, @@ -955,10 +965,12 @@ const u8g_fntpgm_uint8_t fontpage_225_237_237[45] U8G_FONT_SECTION("fontpage_225 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xED,0xED,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x22,0x00,0xF7,0x80,0x22,0x80,0x32,0x80,0x66, 0x80,0xA3,0x80,0x24,0xA0,0x68,0x60,0x00,0x00,0x52,0x40,0x89,0x20}; -const u8g_fntpgm_uint8_t fontpage_228_199_199[45] U8G_FONT_SECTION("fontpage_228_199_199") = { - 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC7,0xC7,0x00,0x0A,0xFF,0x00, +const u8g_fntpgm_uint8_t fontpage_228_199_200[73] U8G_FONT_SECTION("fontpage_228_199_200") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC7,0xC8,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x21,0x00,0x21,0x00,0x3F,0xE0,0x20, - 0x00,0x20,0x00,0x3F,0x80,0x20,0x80,0x20,0x80,0x40,0x80,0x80,0x80}; + 0x00,0x20,0x00,0x3F,0x80,0x20,0x80,0x20,0x80,0x40,0x80,0x80,0x80,0x0B,0x0B,0x16, + 0x0C,0x00,0xFF,0x10,0xC0,0x57,0x00,0x54,0x00,0x7F,0xE0,0x46,0x40,0x45,0x40,0x75, + 0x40,0x54,0x80,0x54,0x80,0x95,0x40,0x9A,0x20}; const u8g_fntpgm_uint8_t fontpage_228_233_233[45] U8G_FONT_SECTION("fontpage_228_233_233") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xE9,0xE9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x22,0x00,0xA2,0x00,0xA7,0xE0,0xFA,0xA0,0xA2, @@ -983,6 +995,10 @@ const u8g_fntpgm_uint8_t fontpage_234_181_181[45] U8G_FONT_SECTION("fontpage_234 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB5,0xB5,0x00,0x0A,0xFF,0x00, 0x00,0x0A,0x0B,0x16,0x0C,0x01,0xFF,0x08,0x00,0x08,0x00,0xFF,0x80,0x88,0x80,0xFF, 0x80,0x88,0x80,0x88,0x80,0xFF,0x80,0x08,0x40,0x08,0x40,0x07,0xC0}; +const u8g_fntpgm_uint8_t fontpage_234_204_204[45] U8G_FONT_SECTION("fontpage_234_204_204") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xCC,0xCC,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x7F,0xC0,0x44,0x40,0x7F,0xC0,0x44,0x40,0x7F, + 0xC0,0x0A,0x00,0x31,0x80,0xD1,0x60,0x11,0x00,0x21,0x00,0x41,0x00}; const u8g_fntpgm_uint8_t fontpage_234_229_229[45] U8G_FONT_SECTION("fontpage_234_229_229") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xE5,0xE5,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x02,0x00,0xFB,0xC0,0xAE,0x40,0xA9,0x80,0xFA, @@ -1047,6 +1063,10 @@ const u8g_fntpgm_uint8_t fontpage_248_251_251[45] U8G_FONT_SECTION("fontpage_248 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFB,0xFB,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x24,0x80,0x15,0x00,0xFF,0xE0,0x15,0x00,0x24, 0x80,0x40,0x40,0x04,0x00,0xFF,0xE0,0x0A,0x00,0x11,0x00,0xE0,0xE0}; +const u8g_fntpgm_uint8_t fontpage_249_190_190[45] U8G_FONT_SECTION("fontpage_249_190_190") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBE,0xBE,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0xAF,0xE0,0x71,0x00,0x27,0xC0,0xF1, + 0x00,0x2F,0xE0,0x74,0x40,0x6F,0xC0,0xA4,0x40,0x27,0xC0,0x24,0x40}; const u8g_fntpgm_uint8_t fontpage_250_162_162[45] U8G_FONT_SECTION("fontpage_250_162_162") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA2,0xA2,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x7F,0xC0,0x04,0x00,0xFF,0xE0,0x91, @@ -1223,6 +1243,10 @@ const u8g_fntpgm_uint8_t fontpage_283_133_133[45] U8G_FONT_SECTION("fontpage_283 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x85,0x85,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x17,0xC0,0x11,0x40,0x7D,0x40,0x12,0xC0,0xFC, 0x00,0x13,0xC0,0x5E,0x40,0x52,0x40,0x73,0xC0,0x98,0x00,0x87,0xE0}; +const u8g_fntpgm_uint8_t fontpage_283_138_138[45] U8G_FONT_SECTION("fontpage_283_138_138") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8A,0x8A,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x10,0xC0,0x10,0xA0,0x7F,0xE0,0x12,0x80,0xFE, + 0xA0,0x12,0xA0,0x5E,0x40,0x52,0xA0,0x71,0x20,0x9A,0x00,0x87,0xE0}; const u8g_fntpgm_uint8_t fontpage_283_221_221[45] U8G_FONT_SECTION("fontpage_283_221_221") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xDD,0xDD,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x7B,0xE0,0x4A,0x00,0x4A,0x00,0x7B,0xE0,0x12, @@ -1293,6 +1317,10 @@ const u8g_fntpgm_uint8_t fontpage_288_137_137[45] U8G_FONT_SECTION("fontpage_288 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x89,0x89,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x45,0x00,0x25,0x00,0x27,0xC0,0x09,0x00,0xEF, 0xE0,0x22,0x80,0x22,0xA0,0x24,0xA0,0x28,0x60,0x50,0x00,0x8F,0xE0}; +const u8g_fntpgm_uint8_t fontpage_288_144_144[45] U8G_FONT_SECTION("fontpage_288_144_144") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x90,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x4F,0xE0,0x21,0x00,0x22,0x00,0x0D,0x20,0xE2, + 0xC0,0x2D,0x80,0x22,0xC0,0x2C,0xA0,0x23,0x00,0x50,0x00,0x8F,0xE0}; const u8g_fntpgm_uint8_t fontpage_288_159_159[45] U8G_FONT_SECTION("fontpage_288_159_159") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9F,0x9F,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x41,0x00,0x3F,0xE0,0x21,0x00,0x0F,0xE0,0xE9, @@ -1421,6 +1449,10 @@ const u8g_fntpgm_uint8_t fontpage_306_241_241[45] U8G_FONT_SECTION("fontpage_306 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x44,0x00,0x47,0xC0,0x7C,0x40,0x97,0x40,0xAD, 0x40,0x25,0x40,0x27,0x40,0x24,0xC0,0x2C,0x20,0x34,0x20,0x23,0xE0}; +const u8g_fntpgm_uint8_t fontpage_307_150_150[45] U8G_FONT_SECTION("fontpage_307_150_150") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x96,0x96,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x20,0x80,0x11,0x00,0xFF,0xE0,0x08,0x00,0x3F, + 0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x3F,0x80}; const u8g_fntpgm_uint8_t fontpage_308_236_236[45] U8G_FONT_SECTION("fontpage_308_236_236") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xEC,0xEC,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x7F,0x80,0x00,0x80,0x10,0x80,0x11,0x00,0x21, @@ -1429,6 +1461,10 @@ const u8g_fntpgm_uint8_t fontpage_308_241_241[45] U8G_FONT_SECTION("fontpage_308 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0xF3,0xE0,0x12,0x00,0x52,0x20,0x53,0x20,0x52, 0xA0,0x7A,0x40,0x0A,0x40,0xEA,0xA0,0x0B,0x20,0x0A,0x00,0x33,0xE0}; +const u8g_fntpgm_uint8_t fontpage_309_140_140[45] U8G_FONT_SECTION("fontpage_309_140_140") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8C,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0xF1,0x00,0x11,0x00,0x52,0x80,0x5C,0x60,0x53, + 0x80,0x78,0x00,0x0A,0x40,0x3D,0x40,0xCA,0x80,0x09,0x00,0x37,0xE0}; const u8g_fntpgm_uint8_t fontpage_309_216_216[45] U8G_FONT_SECTION("fontpage_309_216_216") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0xFF,0xE0,0x00,0x00,0x1F,0x00,0x11, @@ -1565,10 +1601,11 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定' FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客' FONTDATA_ITEM(183, 171, 171, fontpage_183_171_171), // '宫' -- '宫' - FONTDATA_ITEM(183, 249, 249, fontpage_183_249_249), // '对' -- '对' + FONTDATA_ITEM(183, 248, 249, fontpage_183_248_249), // '寸' -- '对' FONTDATA_ITEM(184, 134, 134, fontpage_184_134_134), // '将' -- '将' FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小' FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就' + FONTDATA_ITEM(184, 186, 186, fontpage_184_186_186), // '尺' -- '尺' FONTDATA_ITEM(184, 207, 207, fontpage_184_207_207), // '屏' -- '屏' FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工' FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差' @@ -1580,7 +1617,6 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(189, 159, 159, fontpage_189_159_159), // '废' -- '废' FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度' FONTDATA_ITEM(190, 128, 128, fontpage_190_128_128), // '开' -- '开' - FONTDATA_ITEM(190, 131, 131, fontpage_190_131_131), // '弃' -- '弃' FONTDATA_ITEM(190, 143, 143, fontpage_190_143_143), // '式' -- '式' FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引' FONTDATA_ITEM(190, 185, 185, fontpage_190_185_185), // '弹' -- '弹' @@ -1640,6 +1676,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最' FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有' FONTDATA_ITEM(206, 159, 159, fontpage_206_159_159), // '期' -- '期' + FONTDATA_ITEM(206, 172, 172, fontpage_206_172_172), // '本' -- '本' FONTDATA_ITEM(206, 186, 186, fontpage_206_186_186), // '机' -- '机' FONTDATA_ITEM(206, 192, 192, fontpage_206_192_192), // '杀' -- '杀' FONTDATA_ITEM(206, 223, 223, fontpage_206_223_223), // '束' -- '束' @@ -1677,15 +1714,17 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(222, 143, 143, fontpage_222_143_143), // '漏' -- '漏' FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激' FONTDATA_ITEM(224, 239, 239, fontpage_224_239_239), // '灯' -- '灯' + FONTDATA_ITEM(224, 245, 245, fontpage_224_245_245), // '灵' -- '灵' FONTDATA_ITEM(225, 185, 185, fontpage_225_185_185), // '点' -- '点' FONTDATA_ITEM(225, 237, 237, fontpage_225_237_237), // '热' -- '热' - FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片' + FONTDATA_ITEM(228, 199, 200, fontpage_228_199_200), // '片' -- '版' FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物' FONTDATA_ITEM(228, 249, 249, fontpage_228_249_249), // '特' -- '特' FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率' FONTDATA_ITEM(231, 175, 175, fontpage_231_175_175), // '环' -- '环' FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用' FONTDATA_ITEM(234, 181, 181, fontpage_234_181_181), // '电' -- '电' + FONTDATA_ITEM(234, 204, 204, fontpage_234_204_204), // '界' -- '界' FONTDATA_ITEM(234, 229, 229, fontpage_234_229_229), // '略' -- '略' FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白' FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的' @@ -1702,6 +1741,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等' FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱' FONTDATA_ITEM(248, 251, 251, fontpage_248_251_251), // '类' -- '类' + FONTDATA_ITEM(249, 190, 190, fontpage_249_190_190), // '精' -- '精' FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索' FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫' FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红' @@ -1746,6 +1786,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(282, 170, 170, fontpage_282_170_170), // '贪' -- '贪' FONTDATA_ITEM(282, 247, 247, fontpage_282_247_247), // '起' -- '起' FONTDATA_ITEM(283, 133, 133, fontpage_283_133_133), // '超' -- '超' + FONTDATA_ITEM(283, 138, 138, fontpage_283_138_138), // '越' -- '越' FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距' FONTDATA_ITEM(286, 236, 236, fontpage_286_236_236), // '转' -- '转' FONTDATA_ITEM(286, 239, 239, fontpage_286_239_239), // '软' -- '软' @@ -1763,6 +1804,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(287, 247, 247, fontpage_287_247_247), // '迷' -- '迷' FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退' FONTDATA_ITEM(288, 137, 137, fontpage_288_137_137), // '选' -- '选' + FONTDATA_ITEM(288, 144, 144, fontpage_288_144_144), // '逐' -- '逐' FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速' FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部' FONTDATA_ITEM(290, 205, 205, fontpage_290_205_205), // '配' -- '配' @@ -1795,8 +1837,10 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(305, 157, 157, fontpage_305_157_157), // '额' -- '额' FONTDATA_ITEM(305, 206, 206, fontpage_305_206_206), // '风' -- '风' FONTDATA_ITEM(306, 241, 241, fontpage_306_241_241), // '饱' -- '饱' + FONTDATA_ITEM(307, 150, 150, fontpage_307_150_150), // '首' -- '首' FONTDATA_ITEM(308, 236, 236, fontpage_308_236_236), // '马' -- '马' FONTDATA_ITEM(308, 241, 241, fontpage_308_241_241), // '驱' -- '驱' + FONTDATA_ITEM(309, 140, 140, fontpage_309_140_140), // '验' -- '验' FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高' FONTDATA_ITEM(317, 196, 196, fontpage_317_196_196), // '黄' -- '黄' FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點' diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h index c132a0de70..65ef7bf7df 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h @@ -387,6 +387,10 @@ const u8g_fntpgm_uint8_t fontpage_183_185_185[45] U8G_FONT_SECTION("fontpage_183 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB9,0xB9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0xFF,0xE0,0x91,0x20,0x24,0x80,0x4A, 0x40,0x11,0x00,0x20,0x80,0xDF,0x60,0x11,0x00,0x11,0x00,0x1F,0x00}; +const u8g_fntpgm_uint8_t fontpage_183_248_248[45] U8G_FONT_SECTION("fontpage_183_248_248") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF8,0xF8,0x00,0x0A,0xFF,0x00, + 0x00,0x0A,0x0B,0x16,0x0C,0x01,0xFF,0x02,0x00,0x02,0x00,0x02,0x00,0xFF,0xC0,0x02, + 0x00,0x22,0x00,0x12,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x0E,0x00}; const u8g_fntpgm_uint8_t fontpage_184_141_141[45] U8G_FONT_SECTION("fontpage_184_141_141") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8D,0x8D,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x28,0x40,0xAA,0x40,0x6C,0x40,0xFF,0xE0,0x28, @@ -399,6 +403,10 @@ const u8g_fntpgm_uint8_t fontpage_184_177_177[45] U8G_FONT_SECTION("fontpage_184 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB1,0xB1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x11,0x00,0xFD,0x40,0x01,0x20,0x7F,0xE0,0x4A, 0x80,0x7A,0x80,0x12,0x80,0x5A,0xA0,0x56,0xA0,0x92,0xA0,0x34,0x60}; +const u8g_fntpgm_uint8_t fontpage_184_186_186[45] U8G_FONT_SECTION("fontpage_184_186_186") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBA,0xBA,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x3F,0xC0,0x20,0x40,0x20,0x40,0x20,0x40,0x3F, + 0xC0,0x24,0x00,0x24,0x00,0x22,0x00,0x21,0x00,0x40,0x80,0x80,0x60}; const u8g_fntpgm_uint8_t fontpage_187_229_229[41] U8G_FONT_SECTION("fontpage_187_229_229") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xE5,0xE5,0x00,0x09,0x00,0x00, 0x00,0x0B,0x09,0x12,0x0C,0x00,0x00,0x7F,0xC0,0x04,0x00,0x04,0x00,0x04,0x00,0x04, @@ -641,6 +649,10 @@ const u8g_fntpgm_uint8_t fontpage_206_137_137[45] U8G_FONT_SECTION("fontpage_206 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x89,0x89,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x08,0x00,0xFF,0xE0,0x10,0x00,0x1F,0x80,0x30, 0x80,0x5F,0x80,0x90,0x80,0x1F,0x80,0x10,0x80,0x10,0x80,0x11,0x80}; +const u8g_fntpgm_uint8_t fontpage_206_172_172[45] U8G_FONT_SECTION("fontpage_206_172_172") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xAC,0xAC,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x04,0x00,0xFF,0xE0,0x0E,0x00,0x15, + 0x00,0x15,0x00,0x24,0x80,0x44,0x40,0x9F,0x20,0x04,0x00,0x04,0x00}; const u8g_fntpgm_uint8_t fontpage_206_255_255[45] U8G_FONT_SECTION("fontpage_206_255_255") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x20,0xC0,0x27,0x00,0xFC,0x00,0x24,0x00,0x27, @@ -751,10 +763,12 @@ const u8g_fntpgm_uint8_t fontpage_227_200_200[45] U8G_FONT_SECTION("fontpage_227 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC8,0xC8,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x2F,0xA0,0x2B,0x40,0xAC,0x80,0xB7,0xC0,0xA8, 0x20,0x37,0xC0,0x24,0x40,0x27,0xC0,0x52,0x80,0x49,0x00,0x8F,0xE0}; -const u8g_fntpgm_uint8_t fontpage_228_199_199[45] U8G_FONT_SECTION("fontpage_228_199_199") = { - 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC7,0xC7,0x00,0x0A,0xFF,0x00, +const u8g_fntpgm_uint8_t fontpage_228_199_200[73] U8G_FONT_SECTION("fontpage_228_199_200") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC7,0xC8,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x21,0x00,0x21,0x00,0x3F,0xE0,0x20, - 0x00,0x20,0x00,0x3F,0x80,0x20,0x80,0x20,0x80,0x40,0x80,0x80,0x80}; + 0x00,0x20,0x00,0x3F,0x80,0x20,0x80,0x20,0x80,0x40,0x80,0x80,0x80,0x0B,0x0B,0x16, + 0x0C,0x00,0xFF,0x10,0xC0,0x57,0x00,0x54,0x00,0x7F,0xE0,0x46,0x40,0x45,0x40,0x75, + 0x40,0x54,0x80,0x54,0x80,0x95,0x40,0x9A,0x20}; const u8g_fntpgm_uint8_t fontpage_228_233_233[45] U8G_FONT_SECTION("fontpage_228_233_233") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xE9,0xE9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x22,0x00,0xA2,0x00,0xA7,0xE0,0xFA,0xA0,0xA2, @@ -1037,6 +1051,10 @@ const u8g_fntpgm_uint8_t fontpage_288_128_128[45] U8G_FONT_SECTION("fontpage_288 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x8F,0xC0,0x48,0x40,0x4F,0xC0,0x08,0x40,0xCF, 0xC0,0x48,0x00,0x4B,0x40,0x48,0x80,0x4E,0x40,0xB0,0x00,0x8F,0xE0}; +const u8g_fntpgm_uint8_t fontpage_288_144_144[45] U8G_FONT_SECTION("fontpage_288_144_144") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x90,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x4F,0xE0,0x21,0x00,0x22,0x00,0x0D,0x20,0xE2, + 0xC0,0x2D,0x80,0x22,0xC0,0x2C,0xA0,0x23,0x00,0x50,0x00,0x8F,0xE0}; const u8g_fntpgm_uint8_t fontpage_288_159_159[45] U8G_FONT_SECTION("fontpage_288_159_159") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9F,0x9F,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x41,0x00,0x3F,0xE0,0x21,0x00,0x0F,0xE0,0xE9, @@ -1311,9 +1329,11 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定' FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客' FONTDATA_ITEM(183, 185, 185, fontpage_183_185_185), // '容' -- '容' + FONTDATA_ITEM(183, 248, 248, fontpage_183_248_248), // '寸' -- '寸' FONTDATA_ITEM(184, 141, 141, fontpage_184_141_141), // '對' -- '對' FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小' FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就' + FONTDATA_ITEM(184, 186, 186, fontpage_184_186_186), // '尺' -- '尺' FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工' FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差' FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已' @@ -1374,6 +1394,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更' FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最' FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有' + FONTDATA_ITEM(206, 172, 172, fontpage_206_172_172), // '本' -- '本' FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板' FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱' FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校' @@ -1401,7 +1422,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(226, 161, 161, fontpage_226_161_161), // '無' -- '無' FONTDATA_ITEM(227, 177, 177, fontpage_227_177_177), // '熱' -- '熱' FONTDATA_ITEM(227, 200, 200, fontpage_227_200_200), // '燈' -- '燈' - FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片' + FONTDATA_ITEM(228, 199, 200, fontpage_228_199_200), // '片' -- '版' FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物' FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率' FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用' @@ -1472,6 +1493,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近' FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返' FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退' + FONTDATA_ITEM(288, 144, 144, fontpage_288_144_144), // '逐' -- '逐' FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速' FONTDATA_ITEM(288, 163, 163, fontpage_288_163_163), // '連' -- '連' FONTDATA_ITEM(288, 178, 178, fontpage_288_178_178), // '進' -- '進' diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp index 8e71da82c6..8311fae6a1 100644 --- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp @@ -4140,7 +4140,7 @@ FSTR_P JyersDWIN::getMenuTitle(const uint8_t menu) { case ID_Move: return GET_TEXT_F(MSG_MOVE_AXIS); case ID_ManualLevel: return GET_TEXT_F(MSG_BED_TRAMMING_MANUAL); #if HAS_ZOFFSET_ITEM - case ID_ZOffset: return GET_TEXT_F(MSG_ZPROBE_ZOFFSET); + case ID_ZOffset: return liveadjust ? GET_TEXT_F(MSG_BABYSTEP_PROBE_Z) : GET_TEXT_F(MSG_ZPROBE_ZOFFSET); #endif #if HAS_PREHEAT case ID_Preheat: return F("Preheat"); diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 633f756c8f..dc8c70248d 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3400,7 +3400,7 @@ void drawTuneMenu() { fanSpeedItem = EDIT_ITEM(ICON_FanSpeed, MSG_FAN_SPEED, onDrawFanSpeed, setFanSpeed, &thermalManager.fan_speed[0]); #endif #if ALL(HAS_ZOFFSET_ITEM, HAS_BED_PROBE, BABYSTEP_ZPROBE_OFFSET, BABYSTEPPING) - EDIT_ITEM(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawZOffset, setZOffset, &BABY_Z_VAR); + EDIT_ITEM(ICON_Zoffset, MSG_BABYSTEP_PROBE_Z, onDrawZOffset, setZOffset, &BABY_Z_VAR); #elif ALL(HAS_ZOFFSET_ITEM, MESH_BED_LEVELING, BABYSTEPPING) EDIT_ITEM(ICON_Zoffset, MSG_HOME_OFFSET_Z, onDrawPFloat2Menu, setZOffset, &BABY_Z_VAR); #endif @@ -4028,7 +4028,7 @@ void drawMaxAccelMenu() { BACK_ITEM(drawPrepareMenu); MENU_ITEM(ICON_Homing, MSG_AUTO_HOME, onDrawMenuItem, autoHome); MENU_ITEM(ICON_AxisD, MSG_MOVE_NOZZLE_TO_BED, onDrawMenuItem, setMoveZto0); - EDIT_ITEM(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawPFloat2Menu, setZOffset, &BABY_Z_VAR); + EDIT_ITEM(ICON_Zoffset, MSG_BABYSTEP_PROBE_Z, onDrawPFloat2Menu, setZOffset, &BABY_Z_VAR); } updateMenu(zOffsetWizMenu); if (!axis_is_trusted(Z_AXIS)) LCD_MESSAGE_F("WARNING: Z position unknown, move Z to home"); diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/z_offset_screen.cpp index c192860f4a..b59406c729 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/z_offset_screen.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/z_offset_screen.cpp @@ -36,7 +36,7 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) { widgets_t w(what); w.precision(2, BaseNumericAdjustmentScreen::DEFAULT_MIDRANGE).units(GET_TEXT_F(MSG_UNITS_MM)); - w.heading( GET_TEXT_F(MSG_ZPROBE_ZOFFSET)); + w.heading( GET_TEXT_F(MSG_BABYSTEP_PROBE_Z)); w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm()); w.increments(); w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting()); diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 5e7d81d956..a84f816ffb 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -78,6 +78,7 @@ namespace LanguageNarrow_an { LSTR MSG_EXTRUDE = _UxGT("Extruir"); LSTR MSG_RETRACT = _UxGT("Retraer"); LSTR MSG_MOVE_AXIS = _UxGT("Mover Eixes"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sondar y Nivelar"); LSTR MSG_BED_LEVELING = _UxGT("Nivelar base"); LSTR MSG_LEVEL_BED = _UxGT("Nivelar base"); LSTR MSG_MOVE_X = _UxGT("Mover X"); @@ -159,6 +160,7 @@ namespace LanguageNarrow_an { LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Desfase Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Probe Z con pas"); LSTR MSG_BABYSTEP_X = _UxGT("Micropaso X"); LSTR MSG_BABYSTEP_Y = _UxGT("Micropaso Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Micropaso Z"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 11df9cee31..5c10cefb8e 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -67,6 +67,7 @@ namespace LanguageNarrow_bg { LSTR MSG_EXTRUDE = _UxGT("Екструзия"); LSTR MSG_RETRACT = _UxGT("Откат"); LSTR MSG_MOVE_AXIS = _UxGT("Движение по ос"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Нивелиране"); LSTR MSG_BED_LEVELING = _UxGT("Нивелиране"); LSTR MSG_LEVEL_BED = _UxGT("Нивелиране"); LSTR MSG_MOVE_X = _UxGT("Движение по X"); @@ -142,6 +143,7 @@ namespace LanguageNarrow_bg { LSTR MSG_CHANGE_MEDIA = _UxGT("Смяна SD-Карта"); LSTR MSG_ZPROBE_OUT = _UxGT("Z-сондата е извадена"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Отстояние"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Промяна на Z"); LSTR MSG_BABYSTEP_X = _UxGT("Министъпка X"); LSTR MSG_BABYSTEP_Y = _UxGT("Министъпка Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Министъпка Z"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 65ad2325da..54bfa38bbd 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -75,6 +75,7 @@ namespace LanguageNarrow_ca { LSTR MSG_EXTRUDE = _UxGT("Extrudeix"); LSTR MSG_RETRACT = _UxGT("Retreu"); LSTR MSG_MOVE_AXIS = _UxGT("Mou eixos"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sonda i anivella"); LSTR MSG_BED_LEVELING = _UxGT("Anivella llit"); LSTR MSG_LEVEL_BED = _UxGT("Anivella llit"); @@ -150,6 +151,7 @@ namespace LanguageNarrow_ca { LSTR MSG_BLTOUCH_RESET = _UxGT("Reinicia BLTouch"); LSTR MSG_HOME_FIRST = _UxGT("Home %s primer"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Decalatge Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Pas a pas el Z"); LSTR MSG_BABYSTEP_X = _UxGT("Micropas X"); LSTR MSG_BABYSTEP_Y = _UxGT("Micropas Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Micropas Z"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 89f1a4ab2a..2ee9451d09 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -102,6 +102,7 @@ namespace LanguageNarrow_cz { LSTR MSG_EXTRUDE = _UxGT("Vytlačit (extr.)"); LSTR MSG_RETRACT = _UxGT("Zatlačit (retr.)"); LSTR MSG_MOVE_AXIS = _UxGT("Posunout osy"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Měření a vyrovnání"); LSTR MSG_BED_LEVELING = _UxGT("Vyrovnat podložku"); LSTR MSG_LEVEL_BED = _UxGT("Vyrovnat podložku"); LSTR MSG_BED_TRAMMING = _UxGT("Vyrovnat rohy"); @@ -135,13 +136,10 @@ namespace LanguageNarrow_cz { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Změřte"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Odstraňte a změřte"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Přesun na další"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Aktivovat UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Deaktivovat UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Teplota podložky"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Teplota podložky"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Teplota hotendu"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Teplota hotendu"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Úprava sítě bodů"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Upravit vlastní síť"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Doladit síť bodů"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě"); @@ -387,6 +385,7 @@ namespace LanguageNarrow_cz { LSTR MSG_MANUAL_STOW = _UxGT("Zasunout Z-sondu"); LSTR MSG_HOME_FIRST = _UxGT("Domů %s první"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z ofset"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Krok a Z offset"); LSTR MSG_BABYSTEP_X = _UxGT("Babystep X"); LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 78806c7d50..c348db0918 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -69,6 +69,7 @@ namespace LanguageNarrow_da { LSTR MSG_SWITCH_PS_OFF = _UxGT("Slå strøm fra"); LSTR MSG_EXTRUDE = _UxGT("Extruder"); LSTR MSG_MOVE_AXIS = _UxGT("Flyt akser"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Probe og nivellér"); LSTR MSG_BED_LEVELING = _UxGT("Juster bed"); LSTR MSG_LEVEL_BED = _UxGT("Juster bed"); LSTR MSG_MOVE_X = _UxGT("Flyt X"); @@ -136,6 +137,7 @@ namespace LanguageNarrow_da { LSTR MSG_ZPROBE_OUT = _UxGT("Probe udenfor plade"); LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Selv-Test"); LSTR MSG_HOME_FIRST = _UxGT("Home %s først"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Justér Z trin"); LSTR MSG_ERR_HEATING_FAILED = _UxGT("Opvarmning fejlet"); LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Fejl: reserve temp"); LSTR MSG_ERR_THERMAL_RUNAWAY = _UxGT("Temp løber løbsk"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 828a44bf52..f33d7fb097 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -132,6 +132,7 @@ namespace LanguageNarrow_de { LSTR MSG_EXTRUDE = _UxGT("Extrudieren"); LSTR MSG_RETRACT = _UxGT("Einzug"); LSTR MSG_MOVE_AXIS = _UxGT("Achsen bewegen"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sonden nivellieren"); LSTR MSG_BED_LEVELING = _UxGT("Bett-Nivellierung"); LSTR MSG_LEVEL_BED = _UxGT("Bett nivellieren"); LSTR MSG_BED_TRAMMING = _UxGT("Bett ausrichten"); @@ -186,13 +187,10 @@ namespace LanguageNarrow_de { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Messen"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Entfernen & messen"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Nächster Punkt..."); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("UBL aktivieren"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("UBL deaktivieren"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Betttemperatur"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Betttemperatur"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Hotend-Temp."); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hotend-Temp."); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Netz bearbeiten"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Eigenes Netz bearb."); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Feineinstellung..."); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet"); @@ -527,6 +525,7 @@ namespace LanguageNarrow_de { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Sondenversatz X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Sondenversatz Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Sondenversatz Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Z Offset mit Pas"); LSTR MSG_ZPROBE_MARGIN = _UxGT("Sondenrand"); LSTR MSG_Z_FEED_RATE = _UxGT("Z-Vorschub"); LSTR MSG_ENABLE_HS_MODE = _UxGT("HS-Modus aktivieren"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 428cfce23e..bcc7696b9d 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -87,6 +87,7 @@ namespace LanguageNarrow_el { LSTR MSG_EXTRUDE = _UxGT("Εξώθηση"); LSTR MSG_RETRACT = _UxGT("Ανάσυρση"); LSTR MSG_MOVE_AXIS = _UxGT("Μετακίνηση άξονα"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Ανιχνευτής/ισοπέδωση"); LSTR MSG_BED_LEVELING = _UxGT("Επιπεδοποίηση κλίνης"); LSTR MSG_LEVEL_BED = _UxGT("Επιπεδοποίηση κλίνης"); LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X"); @@ -185,6 +186,7 @@ namespace LanguageNarrow_el { LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πρώτα"); LSTR MSG_XYZ_UNHOMED = _UxGT("Επαναφορά ΧΥΖ πρώτα"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Μετατόπιση Ζ"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Βήμα Z ρύθμιση"); LSTR MSG_BABYSTEP_X = _UxGT("Μικρό βήμα Χ"); LSTR MSG_BABYSTEP_Y = _UxGT("Μικρό βήμα Υ"); LSTR MSG_BABYSTEP_Z = _UxGT("Μικρό βήμα Ζ"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index af8274b483..87f56455bd 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -76,6 +76,7 @@ namespace LanguageNarrow_el_gr { LSTR MSG_EXTRUDE = _UxGT("Εξώθηση"); LSTR MSG_RETRACT = _UxGT("Ανάσυρση"); LSTR MSG_MOVE_AXIS = _UxGT("Μετακίνηση άξονα"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Ανιχνευτής/ισοπέδωση"); LSTR MSG_BED_LEVELING = _UxGT("Επιπεδοποίηση κλίνης"); LSTR MSG_LEVEL_BED = _UxGT("Επιπεδοποίηση κλίνης"); LSTR MSG_MOVE_X = _UxGT("Μετακίνηση X"); @@ -175,6 +176,7 @@ namespace LanguageNarrow_el_gr { LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πριν από Ζ"); LSTR MSG_XYZ_UNHOMED = _UxGT("Επαναφορά ΧΥΖ πρώτα"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Μετατόπιση Ζ"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Βήμα Z ρύθμιση"); LSTR MSG_BABYSTEP_X = _UxGT("Μικρό βήμα Χ"); LSTR MSG_BABYSTEP_Y = _UxGT("Μικρό βήμα Υ"); LSTR MSG_BABYSTEP_Z = _UxGT("Μικρό βήμα Ζ"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 286c386a44..1ac1218c81 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -181,6 +181,7 @@ namespace LanguageNarrow_en { LSTR MSG_EXTRUDE = _UxGT("Extrude"); LSTR MSG_RETRACT = _UxGT("Retract"); LSTR MSG_MOVE_AXIS = _UxGT("Move Axis"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Probe and Level"); LSTR MSG_BED_LEVELING = _UxGT("Bed Leveling"); LSTR MSG_LEVEL_BED = _UxGT("Level Bed"); LSTR MSG_BED_TRAMMING = _UxGT("Bed Tramming"); @@ -239,13 +240,10 @@ namespace LanguageNarrow_en { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Measure"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Remove & Measure Bed"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Moving to next"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activate UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Deactivate UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Bed Temp"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Bed Temp"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Hotend Temp"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hotend Temp"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Mesh Edit"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Edit Custom Mesh"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Fine Tuning Mesh"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); @@ -639,6 +637,7 @@ namespace LanguageNarrow_en { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Probe X Offset"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Probe Y Offset"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Probe Z Offset"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Babystep Probe Z"); LSTR MSG_ZPROBE_MARGIN = _UxGT("Probe Margin"); LSTR MSG_ZOFFSET = _UxGT("Z Offset"); LSTR MSG_Z_FEED_RATE = _UxGT("Z Feed Rate"); @@ -711,22 +710,6 @@ namespace LanguageNarrow_en { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Light Brightness"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("INCORRECT PRINTER"); - LSTR MSG_COLORS_GET = _UxGT("Get Color"); // ProUI - LSTR MSG_COLORS_SELECT = _UxGT("Select Colors"); // ProUI - LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied"); // ProUI - LSTR MSG_COLORS_RED = _UxGT("Red"); // ProUI / JyersUI - LSTR MSG_COLORS_GREEN = _UxGT("Green"); // ProUI / JyersUI - LSTR MSG_COLORS_BLUE = _UxGT("Blue"); // ProUI / JyersUI - LSTR MSG_COLORS_WHITE = _UxGT("White"); // ProUI - LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI - LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound"); // ProUI - LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen"); // ProUI - LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,"); // ProUI - LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); // ProUI - LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait for reboot."); // ProUI - LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); // ProUI - LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); // ProUI - LSTR MSG_INFO_PRINT_COUNT = _UxGT("Prints"); LSTR MSG_INFO_PRINT_TIME = _UxGT("Total"); LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest"); @@ -757,6 +740,24 @@ namespace LanguageNarrow_en { LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing Failed"); LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing Failed"); + // Ender-3 V2 DWIN - ProUI / JyersUI + LSTR MSG_COLORS_GET = _UxGT("Get Color"); // ProUI + LSTR MSG_COLORS_SELECT = _UxGT("Select Colors"); // ProUI + LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied"); // ProUI + LSTR MSG_COLORS_RED = _UxGT("Red"); // ProUI / JyersUI + LSTR MSG_COLORS_GREEN = _UxGT("Green"); // ProUI / JyersUI + LSTR MSG_COLORS_BLUE = _UxGT("Blue"); // ProUI / JyersUI + LSTR MSG_COLORS_WHITE = _UxGT("White"); // ProUI + LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI + LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound"); // ProUI + LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen"); // ProUI + LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,"); // ProUI + LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); // ProUI + LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait for reboot."); // ProUI + LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); // ProUI + LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); // ProUI + + // Prusa MMU 2 LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER = _UxGT("CHOOSE FILAMENT"); LSTR MSG_MMU2_MENU = _UxGT("MMU"); LSTR MSG_KILL_MMU2_FIRMWARE = _UxGT("Update MMU Firmware!"); @@ -788,9 +789,7 @@ namespace LanguageNarrow_en { LSTR MSG_MMU_CUTTER_MODE_ENABLE = _UxGT("Enable"); LSTR MSG_MMU_CUTTER_MODE_ALWAYS = _UxGT("Always"); LSTR MSG_MMU_SPOOL_JOIN = _UxGT("Spool Join"); - LSTR MSG_MMU_STEALTH = _UxGT("Stealth Mode"); - LSTR MSG_MMU_FAIL_STATS = _UxGT("Fail stats"); LSTR MSG_MMU_STATISTICS = _UxGT("Statistics"); LSTR MSG_MMU_RESET_FAIL_STATS = _UxGT("Reset Fail Stats"); LSTR MSG_MMU_RESET_STATS = _UxGT("Reset All Stats"); @@ -807,6 +806,7 @@ namespace LanguageNarrow_en { LSTR MSG_MMU_POWER_FAILS = _UxGT("MMU power fails"); LSTR MSG_MMU_MATERIAL_CHANGES = _UxGT("Material changes"); + // Mixing Extruder (e.g., Geeetech A10M / A20M) LSTR MSG_MIX = _UxGT("Mix"); LSTR MSG_MIX_COMPONENT_N = _UxGT("Component {"); LSTR MSG_MIXER = _UxGT("Mixer"); @@ -826,15 +826,18 @@ namespace LanguageNarrow_en { LSTR MSG_START_Z = _UxGT("Start Z:"); LSTR MSG_END_Z = _UxGT(" End Z:"); + // Games Menu LSTR MSG_GAMES = _UxGT("Games"); LSTR MSG_BRICKOUT = _UxGT("Brickout"); LSTR MSG_INVADERS = _UxGT("Invaders"); LSTR MSG_SNAKE = _UxGT("Sn4k3"); LSTR MSG_MAZE = _UxGT("Maze"); + // Direct Stepping LSTR MSG_BAD_PAGE = _UxGT("Bad page index"); LSTR MSG_BAD_PAGE_SPEED = _UxGT("Bad page speed"); + // Password Lock LSTR MSG_EDIT_PASSWORD = _UxGT("Edit Password"); LSTR MSG_LOGIN_REQUIRED = _UxGT("Login Required"); LSTR MSG_PASSWORD_SETTINGS = _UxGT("Password Settings"); @@ -1036,156 +1039,16 @@ namespace LanguageNarrow_en { LSTR MSG_BTN_DISABLE_MMU = _UxGT("Disable"); LSTR MSG_BTN_MORE = _UxGT("More Info"); - LSTR MSG_ALWAYS = _UxGT("Always"); - LSTR MSG_BABYSTEP_Z_NOT_SET = _UxGT("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); - LSTR MSG_BED_DONE = _UxGT("Bed done"); - LSTR MSG_BED_LEVELING_FAILED_POINT_LOW = _UxGT("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); - LSTR MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED = _UxGT("XYZ calibration failed. Please consult the manual."); - LSTR MSG_BELT_STATUS = _UxGT("Belt status"); - LSTR MSG_CANCEL = _UxGT(">Cancel"); - LSTR MSG_CALIBRATE_Z_AUTO = _UxGT("Calibrating Z"); - LSTR MSG_CARD_MENU = _UxGT("Print from SD"); - LSTR MSG_CHECKING_X = _UxGT("Checking X axis"); - LSTR MSG_CHECKING_Y = _UxGT("Checking Y axis"); - LSTR MSG_COMMUNITY_MADE = _UxGT("Community made"); - LSTR MSG_CONFIRM_NOZZLE_CLEAN = _UxGT("Please clean the nozzle for calibration. Click when done."); - LSTR MSG_CRASH = _UxGT("Crash"); - LSTR MSG_CRASH_DETECTED = _UxGT("Crash detected."); - LSTR MSG_CRASHDETECT = _UxGT("Crash det."); + // Prusa MMU LSTR MSG_DONE = _UxGT("Done"); - LSTR MSG_EXTRUDER = _UxGT("Extruder"); - LSTR MSG_FANS_CHECK = _UxGT("Fans check"); - LSTR MSG_FIL_RUNOUTS = _UxGT("Fil. runouts"); - LSTR MSG_HOTEND_FAN_SPEED = _UxGT("Hotend fan:"); - LSTR MSG_PRINT_FAN_SPEED = _UxGT("Print fan:"); - LSTR MSG_FILAMENT_CLEAN = _UxGT("Filament extruding & with correct color?"); - LSTR MSG_FILAMENT_LOADED = _UxGT("Is filament loaded?"); - LSTR MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 = _UxGT("Searching bed calibration point"); LSTR MSG_FINISHING_MOVEMENTS = _UxGT("Finishing movements"); - LSTR MSG_FOLLOW_CALIBRATION_FLOW = _UxGT("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); - LSTR MSG_FOLLOW_Z_CALIBRATION_FLOW = _UxGT("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); - LSTR MSG_FSENSOR_RUNOUT = _UxGT("F. runout"); - LSTR MSG_FSENSOR_AUTOLOAD = _UxGT("F. autoload"); - LSTR MSG_FSENSOR_JAM_DETECTION = _UxGT("F. jam detect"); - LSTR MSG_FSENSOR = _UxGT("Fil. sensor"); - LSTR MSG_HEATING_COMPLETE = _UxGT("Heating done."); - LSTR MSG_HOMEYZ = _UxGT("Calibrate Z"); - LSTR MSG_SELECT_FILAMENT = _UxGT("Select filament:"); - LSTR MSG_LAST_PRINT = _UxGT("Last print"); - LSTR MSG_LAST_PRINT_FAILURES = _UxGT("Last print failures"); - LSTR MSG_PRELOAD_TO_MMU = _UxGT("Preload to MMU"); - LSTR MSG_LOAD_FILAMENT = _UxGT("Load filament"); - LSTR MSG_LOADING_TEST = _UxGT("Loading Test"); LSTR MSG_LOADING_FILAMENT = _UxGT("Loading filament"); + LSTR MSG_UNLOADING_FILAMENT = _UxGT("Unloading filament"); LSTR MSG_TESTING_FILAMENT = _UxGT("Testing filament"); LSTR MSG_EJECT_FROM_MMU = _UxGT("Eject from MMU"); LSTR MSG_CUT_FILAMENT = _UxGT("Cut filament"); - LSTR MSG_SHEET = _UxGT("Sheet"); - LSTR MSG_STEEL_SHEETS = _UxGT("Steel sheets"); - LSTR MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 = _UxGT("Measuring reference height of calibration point"); - LSTR MSG_CALIBRATION = _UxGT("Calibration"); - LSTR MSG_PAPER = _UxGT("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); - LSTR MSG_PLACE_STEEL_SHEET = _UxGT("Please place steel sheet on heatbed."); - LSTR MSG_POWER_FAILURES = _UxGT("Power failures"); - LSTR MSG_PREHEAT_NOZZLE = _UxGT("Preheat the nozzle!"); - LSTR MSG_PRESS_TO_UNLOAD = _UxGT("Please press the knob to unload filament"); - LSTR MSG_PULL_OUT_FILAMENT = _UxGT("Please pull out filament immediately"); - LSTR MSG_RECOVER_PRINT = _UxGT("Blackout occurred. Recover print?"); - LSTR MSG_REMOVE_STEEL_SHEET = _UxGT("Please remove steel sheet from heatbed."); - LSTR MSG_RESET = _UxGT("Reset"); - LSTR MSG_RESUMING_PRINT = _UxGT("Resuming print"); - LSTR MSG_SELFTEST_PART_FAN = _UxGT("Front print fan?"); - LSTR MSG_SELFTEST_HOTEND_FAN = _UxGT("Left hotend fan?"); - LSTR MSG_SELFTEST_FAILED = _UxGT("Selftest failed"); - LSTR MSG_SELFTEST_FAN = _UxGT("Fan test"); - LSTR MSG_SELFTEST_FAN_NO = _UxGT("Not spinning"); - LSTR MSG_SELFTEST_FAN_YES = _UxGT("Spinning"); - LSTR MSG_SELFTEST_CHECK_BED = _UxGT("Checking bed"); - LSTR MSG_SELFTEST_CHECK_FSENSOR = _UxGT("Checking sensors"); - LSTR MSG_SELFTEST_MOTOR = _UxGT("Motor"); - LSTR MSG_SELFTEST_FILAMENT_SENSOR = _UxGT("Filament sensor"); - LSTR MSG_SELFTEST_WIRINGERROR = _UxGT("Wiring error"); - LSTR MSG_SETTINGS = _UxGT("Settings"); - LSTR MSG_SET_READY = _UxGT("Set Ready"); - LSTR MSG_SET_NOT_READY = _UxGT("Set not Ready"); - LSTR MSG_SELECT_LANGUAGE = _UxGT("Select language"); - LSTR MSG_SORTING_FILES = _UxGT("Sorting files"); - LSTR MSG_TOTAL = _UxGT("Total"); - LSTR MSG_MATERIAL_CHANGES = _UxGT("Material changes"); - LSTR MSG_TOTAL_FAILURES = _UxGT("Total failures"); - LSTR MSG_HW_SETUP = _UxGT("HW Setup"); - LSTR MSG_MODE = _UxGT("Mode"); - LSTR MSG_HIGH_POWER = _UxGT("High power"); - LSTR MSG_AUTO_POWER = _UxGT("Auto power"); - LSTR MSG_SILENT = _UxGT("Silent"); - LSTR MSG_NORMAL = _UxGT("Normal"); - LSTR MSG_STEALTH = _UxGT("Stealth"); - LSTR MSG_STEEL_SHEET_CHECK = _UxGT("Is steel sheet on heatbed?"); - LSTR MSG_PINDA_CALIBRATION = _UxGT("PINDA cal."); - LSTR MSG_PINDA_CALIBRATION_DONE = _UxGT("PINDA calibration is finished and active. It can be disabled in menu Settings->PINDA cal."); - LSTR MSG_UNLOAD_FILAMENT = _UxGT("Unload filament"); - LSTR MSG_UNLOADING_FILAMENT = _UxGT("Unloading filament"); - LSTR MSG_WIZARD_CALIBRATION_FAILED = _UxGT("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); - LSTR MSG_WIZARD_DONE = _UxGT("All done. Happy printing!"); - LSTR MSG_WIZARD_HEATING = _UxGT("Preheating nozzle. Please wait."); - LSTR MSG_WIZARD_QUIT = _UxGT("You can always resume the Wizard from Calibration -> Wizard."); - LSTR MSG_WIZARD_WELCOME = _UxGT("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"); - LSTR MSG_WIZARD_WELCOME_SHIPPING = _UxGT("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); - LSTR MSG_V2_CALIBRATION = _UxGT("First layer cal."); LSTR MSG_OFF = _UxGT("Off"); LSTR MSG_ON = _UxGT("On"); - LSTR MSG_NA = _UxGT("N/A"); - LSTR MSG_NONE = _UxGT("None"); - LSTR MSG_WARN = _UxGT("Warn"); - LSTR MSG_STRICT = _UxGT("Strict"); - LSTR MSG_MODEL = _UxGT("Model"); - LSTR MSG_GCODE_DIFF_PRINTER_CONTINUE = _UxGT("G-code sliced for a different printer type. Continue?"); - LSTR MSG_GCODE_DIFF_PRINTER_CANCELLED = _UxGT("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); - LSTR MSG_GCODE_NEWER_FIRMWARE_CONTINUE = _UxGT("G-code sliced for a newer firmware. Continue?"); - LSTR MSG_GCODE_NEWER_FIRMWARE_CANCELLED = _UxGT("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."); - LSTR MSG_GCODE_DIFF_CONTINUE = _UxGT("G-code sliced for a different level. Continue?"); - LSTR MSG_GCODE_DIFF_CANCELLED = _UxGT("G-code sliced for a different level. Please re-slice the model again. Print cancelled."); - LSTR MSG_NOZZLE_DIFFERS_CONTINUE = _UxGT("Nozzle diameter differs from the G-code. Continue?"); - LSTR MSG_NOZZLE_DIFFERS_CANCELLED = _UxGT("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); - LSTR MSG_NOZZLE_DIAMETER = _UxGT("Nozzle d."); - LSTR MSG_MMU_MODE = _UxGT("MMU Mode"); - LSTR MSG_SORT = _UxGT("Sort"); - LSTR MSG_SORT_TIME = _UxGT("Time"); - LSTR MSG_SORT_ALPHA = _UxGT("Alphabet"); - LSTR MSG_RPI_PORT = _UxGT("RPi port"); - LSTR MSG_SOUND_LOUD = _UxGT("Loud"); - LSTR MSG_SOUND_ONCE = _UxGT("Once"); - LSTR MSG_SOUND_BLIND = _UxGT("Assist"); - LSTR MSG_MESH = _UxGT("Mesh"); - LSTR MSG_MESH_BED_LEVELING = _UxGT("Mesh Bed Leveling"); - LSTR MSG_Z_PROBE_NR = _UxGT("Z-probe nr."); - LSTR MSG_MAGNETS_COMP = _UxGT("Magnets comp."); - LSTR MSG_FS_ACTION = _UxGT("FS Action"); - LSTR MSG_CONTINUE_SHORT = _UxGT("Cont."); - LSTR MSG_PAUSE = _UxGT("Pause"); - LSTR MSG_BL_HIGH = _UxGT("Level Bright"); - LSTR MSG_BL_LOW = _UxGT("Level Dimmed"); - LSTR MSG_BRIGHT = _UxGT("Bright"); - LSTR MSG_DIM = _UxGT("Dim"); - LSTR MSG_AUTO = _UxGT("Auto"); - #if FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG - // Beware - The space at the beginning is necessary since it is reused in LCD menu items which are to be with a space - LSTR MSG_IR_04_OR_NEWER = _UxGT(" 0.4 or newer"); - LSTR MSG_IR_03_OR_OLDER = _UxGT(" 0.3 or older"); - LSTR MSG_IR_UNKNOWN = _UxGT("unknown state"); - #endif - LSTR MSG_PAUSED_THERMAL_ERROR = _UxGT("PAUSED THERMAL ERROR"); - #if ENABLED(THERMAL_MODEL) - LSTR MSG_THERMAL_ANOMALY = _UxGT("THERMAL ANOMALY"); - LSTR MSG_TM_NOT_CAL = _UxGT("Thermal model not calibrated yet."); - LSTR MSG_TM_ACK_ERROR = _UxGT("Clear TM error"); - #endif - LSTR MSG_LOAD_ALL = _UxGT("Load All"); - LSTR MSG_NOZZLE_CNG_MENU = _UxGT("Nozzle change"); - LSTR MSG_NOZZLE_CNG_READ_HELP = _UxGT("For a Nozzle change please read\nprusa.io/nozzle-mk3s"); - LSTR MSG_NOZZLE_CNG_CHANGED = _UxGT("Hotend at 280C! Nozzle changed and tightened to specs?"); - LSTR MSG_REPRINT = _UxGT("Reprint"); - LSTR MSG_PROGRESS_OK = _UxGT("OK"); LSTR MSG_PROGRESS_ENGAGE_IDLER = _UxGT("Engaging idler"); LSTR MSG_PROGRESS_DISENGAGE_IDLER = _UxGT("Disengaging idler"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 5bee09b242..2441cb98b2 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -102,6 +102,7 @@ namespace LanguageNarrow_es { LSTR MSG_EXTRUDE = _UxGT("Extruir"); LSTR MSG_RETRACT = _UxGT("Retraer"); LSTR MSG_MOVE_AXIS = _UxGT("Mover ejes"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sondear y Nivelar"); LSTR MSG_BED_LEVELING = _UxGT("Nivelando Cama"); LSTR MSG_LEVEL_BED = _UxGT("Nivelar Cama"); LSTR MSG_BED_TRAMMING = _UxGT("Recorrido Cama"); @@ -133,13 +134,10 @@ namespace LanguageNarrow_es { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Medir"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Retirar y Medir Cama"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Mover al Siguente"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activar UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Desactivar UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temp. Cama"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temp. Cama perso."); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temp. Fusor"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temp. Fusor perso."); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Editar Mallado"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Edit. Mallado perso."); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Ajuste fino Mallado"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado"); @@ -397,6 +395,7 @@ namespace LanguageNarrow_es { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desf. Sonda X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Desf. Sonda Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Desf. Sonda Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Ajuste Z al paso"); LSTR MSG_BABYSTEP_X = _UxGT("Micropaso X"); LSTR MSG_BABYSTEP_Y = _UxGT("Micropaso Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Micropaso Z"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 1c2cf8fb86..86cffd27c9 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -79,6 +79,7 @@ namespace LanguageNarrow_eu { LSTR MSG_EXTRUDE = _UxGT("Estruitu"); LSTR MSG_RETRACT = _UxGT("Atzera eragin"); LSTR MSG_MOVE_AXIS = _UxGT("Ardatzak mugitu"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Proba eta Berdindu"); LSTR MSG_BED_LEVELING = _UxGT("Ohe berdinketa"); LSTR MSG_LEVEL_BED = _UxGT("Ohea berdindu"); LSTR MSG_BED_TRAMMING = _UxGT("Ertzak berdindu"); @@ -89,13 +90,10 @@ namespace LanguageNarrow_eu { LSTR MSG_UBL_TOOLS = _UxGT("UBL Tresnak"); LSTR MSG_UBL_MANUAL_MESH = _UxGT("Sarea eskuz sortu"); LSTR MSG_UBL_BC_INSERT2 = _UxGT("Neurtu"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("UBL aktibatu"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("UBL desaktibatu"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Ohearen tenperatura"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Bed Temp"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Mutur beroaren tenp."); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hotend Temp"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); LSTR MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); LSTR MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); @@ -231,6 +229,7 @@ namespace LanguageNarrow_eu { LSTR MSG_BLTOUCH_STOW = _UxGT("BLTouch igo/jaso"); LSTR MSG_HOME_FIRST = _UxGT("Etxera %s lehenengo"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Konpentsatu"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Z pausoz egokitu"); LSTR MSG_BABYSTEP_X = _UxGT("Mikro-urratsa X"); LSTR MSG_BABYSTEP_Y = _UxGT("Mikro-urratsa Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Mikro-urratsa Z"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 75afc8279d..e6de9369b1 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -66,6 +66,8 @@ namespace LanguageNarrow_fi { LSTR MSG_EXTRUDE = _UxGT("Pursota"); LSTR MSG_RETRACT = _UxGT("Vedä takaisin"); LSTR MSG_MOVE_AXIS = _UxGT("Liikuta akseleita"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Tutki ja tasoita"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Säädä Z askeltamalla"); LSTR MSG_MOVE_X = _UxGT("Liikuta X"); LSTR MSG_MOVE_Y = _UxGT("Liikuta Y"); LSTR MSG_MOVE_Z = _UxGT("Liikuta Z"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 029e9744a0..11821f6876 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -103,6 +103,7 @@ namespace LanguageNarrow_fr { LSTR MSG_EXTRUDE = _UxGT("Extrusion"); LSTR MSG_RETRACT = _UxGT("Rétractation"); LSTR MSG_MOVE_AXIS = _UxGT("Déplacer un axe"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Mesure et Niv."); LSTR MSG_BED_LEVELING = _UxGT("Régler Niv. lit"); LSTR MSG_LEVEL_BED = _UxGT("Niveau du lit"); LSTR MSG_BED_TRAMMING = _UxGT("Niveau des coins"); @@ -144,13 +145,10 @@ namespace LanguageNarrow_fr { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Mesure"); LSTR MSG_UBL_BC_REMOVE = _UxGT("ôter et mesurer lit"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Aller au suivant"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activer l'UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Désactiver l'UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Température lit"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Température lit"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Température buse"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Température buse"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Modifier grille"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Modif. grille perso"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); @@ -422,6 +420,7 @@ namespace LanguageNarrow_fr { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Décalage X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Décalage Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Décalage Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Babystep sonde Z"); LSTR MSG_BABYSTEP_X = _UxGT("Babystep X"); LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index 8fb7b68026..307d1562e4 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -103,6 +103,7 @@ namespace LanguageNarrow_fr_na { LSTR MSG_EXTRUDE = _UxGT("Extrusion"); LSTR MSG_RETRACT = _UxGT("Retractation"); LSTR MSG_MOVE_AXIS = _UxGT("Deplacer un axe"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Calibrage auto"); LSTR MSG_BED_LEVELING = _UxGT("Regler Niv. lit"); LSTR MSG_LEVEL_BED = _UxGT("Niveau du lit"); LSTR MSG_BED_TRAMMING = _UxGT("Niveau des coins"); @@ -144,13 +145,10 @@ namespace LanguageNarrow_fr_na { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Mesure"); LSTR MSG_UBL_BC_REMOVE = _UxGT("oter et mesurer lit"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Aller au suivant"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activer l'UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Desactiver l'UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temperature lit"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temperature lit"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temperature buse"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temperature buse"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Modifier grille"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Modif. grille perso"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Reglage fin"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); @@ -422,6 +420,7 @@ namespace LanguageNarrow_fr_na { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Decalage X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Decalage Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Decalage Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Babystep sonde Z"); LSTR MSG_BABYSTEP_X = _UxGT("Babystep X"); LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index ebcf384c5c..09e32e6828 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -99,6 +99,7 @@ namespace LanguageNarrow_gl { LSTR MSG_EXTRUDE = _UxGT("Extruír"); LSTR MSG_RETRACT = _UxGT("Retraer"); LSTR MSG_MOVE_AXIS = _UxGT("Mover eixe"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Probar e Nivelar"); LSTR MSG_BED_LEVELING = _UxGT("Nivelando Cama"); LSTR MSG_LEVEL_BED = _UxGT("Nivelar Cama"); LSTR MSG_BED_TRAMMING = _UxGT("Nivelar Cantos"); @@ -130,13 +131,10 @@ namespace LanguageNarrow_gl { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Medir"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Quitar e Medir Cama"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Mover ao Seguinte"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activar UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Desactivar UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temp Cama"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temp Cama"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temp Bico"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temp Bico"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Editar Malla"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Edit. Malla Person."); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Axuste Fino da Malla"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla"); @@ -412,6 +410,7 @@ namespace LanguageNarrow_gl { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desfase Sonda X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Desfase Sonda Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Desfase Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Micropaso Sonda-Z"); LSTR MSG_BABYSTEP_X = _UxGT("Micropaso X"); LSTR MSG_BABYSTEP_Y = _UxGT("Micropaso Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Micropaso Z"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 68fb062e31..ced6d3f25b 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -74,8 +74,10 @@ namespace LanguageNarrow_hr { LSTR MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); LSTR MSG_SWITCH_PS_OFF = _UxGT("Isključi napajanje"); LSTR MSG_MOVE_AXIS = _UxGT("Miči os"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Probe i Nivelacija"); LSTR MSG_BED_LEVELING = _UxGT("Niveliraj bed"); LSTR MSG_LEVEL_BED = _UxGT("Niveliraj bed"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Korak Z offset"); LSTR MSG_MOVE_X = _UxGT("Miči X"); LSTR MSG_MOVE_Y = _UxGT("Miči Y"); LSTR MSG_MOVE_Z = _UxGT("Miči Z"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index f7e98ff8e5..0eb2a5b003 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -123,6 +123,7 @@ namespace LanguageNarrow_hu { LSTR MSG_EXTRUDE = _UxGT("Adagol"); LSTR MSG_RETRACT = _UxGT("Visszahúz"); LSTR MSG_MOVE_AXIS = _UxGT("Tengelyek mozgatása"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Érintés/szintezés"); LSTR MSG_BED_LEVELING = _UxGT("Ágy szintezés"); LSTR MSG_LEVEL_BED = _UxGT("Ágy szintezése"); LSTR MSG_BED_TRAMMING = _UxGT("Sarok szint"); @@ -161,13 +162,10 @@ namespace LanguageNarrow_hu { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Mérés"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Üres ágyat mérj"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Továbblépés"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("UBL aktívál"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("UBL deaktívál"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Ágy höfok"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Egyéni ágy höfok"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Fejhöfok"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Egyéni fejhöfok"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Háló szerkesztés"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Egyéni háló szerkesztés"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Finomított háló"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló kész"); @@ -463,6 +461,7 @@ namespace LanguageNarrow_hu { LSTR MSG_ZPROBE_XOFFSET = _UxGT("X szonda eltolás"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y szonda eltolás"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z szonda eltolás"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Z lépés állítás"); LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Fej az ágyhoz"); LSTR MSG_BABYSTEP_X = _UxGT("Mikrolépés X"); LSTR MSG_BABYSTEP_Y = _UxGT("Mikrolépés Y"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 4d7f1fdc4d..1678837ff3 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -151,6 +151,7 @@ namespace LanguageNarrow_it { LSTR MSG_EXTRUDE = _UxGT("Estrudi"); LSTR MSG_RETRACT = _UxGT("Ritrai"); LSTR MSG_MOVE_AXIS = _UxGT("Muovi asse"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sonda e livella"); LSTR MSG_BED_LEVELING = _UxGT("Livellamento piatto"); LSTR MSG_LEVEL_BED = _UxGT("Livella piatto"); LSTR MSG_BED_TRAMMING = _UxGT("Tarat.fine piatto"); @@ -206,13 +207,10 @@ namespace LanguageNarrow_it { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Misura"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Rimuovi e mis.piatto"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Spostamento succes."); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Attiva UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Disattiva UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temp. piatto"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temp. piatto"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temp. ugello"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temp. ugello"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Modifica mesh"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Modif.mesh personal."); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Ritocca mesh"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.mesh fatta"); @@ -588,6 +586,7 @@ namespace LanguageNarrow_it { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Offset X sonda"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Offset Y sonda"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Offset Z sonda"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Babystep sonda Z"); LSTR MSG_ZPROBE_MARGIN = _UxGT("Margine sonda"); LSTR MSG_Z_FEED_RATE = _UxGT("Velocità Z"); LSTR MSG_ENABLE_HS_MODE = _UxGT("Abilita modo HS"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 3ea82d6302..c3c5194940 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -84,6 +84,7 @@ namespace LanguageNarrow_jp_kana { LSTR MSG_EXTRUDE = _UxGT("オシダシ"); // "Extrude" LSTR MSG_RETRACT = _UxGT("ヒキコミセッテイ"); // "Retract" LSTR MSG_MOVE_AXIS = _UxGT("ジクイドウ"); // "Move axis" + LSTR MSG_PROBE_AND_LEVEL = _UxGT("プローブ アンド レベリング"); // "Probe and Level" LSTR MSG_BED_LEVELING = _UxGT("ベッドレベリング"); // "Bed leveling" LSTR MSG_LEVEL_BED = _UxGT("ベッドレベリング"); // "Level bed" @@ -174,6 +175,7 @@ namespace LanguageNarrow_jp_kana { LSTR MSG_BLTOUCH_RESET = _UxGT("BLTouch リセット"); // "Reset BLTouch" LSTR MSG_HOME_FIRST = _UxGT("サキニ %s ヲフッキサセテクダサイ"); // "Home ... first" LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Zオフセット"); // "Z Offset" + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("プローブZオフセット"); // "Babystep Probe Z" LSTR MSG_BABYSTEP_X = _UxGT("Xジク ビドウ"); // "Babystep X" LSTR MSG_BABYSTEP_Y = _UxGT("Yジク ビドウ"); // "Babystep Y" LSTR MSG_BABYSTEP_Z = _UxGT("Zジク ビドウ"); // "Babystep Z" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index ee53819741..f1eece315c 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -72,6 +72,8 @@ namespace LanguageNarrow_ko_KR { LSTR MSG_EXTRUDE = _UxGT("밀어내기"); LSTR MSG_RETRACT = _UxGT("당기기"); LSTR MSG_MOVE_AXIS = _UxGT("축 이동"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("프로브 & 레벨링"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Z 값 조정"); LSTR MSG_BED_LEVELING = _UxGT("베드 레벨링"); LSTR MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("미러 사본"); LSTR MSG_UBL_DOING_G29 = _UxGT("오토레벨링 하기"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 2f185066b9..8b8f018bf4 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -76,6 +76,7 @@ namespace LanguageNarrow_nl { LSTR MSG_EXTRUDE = _UxGT("Extrude"); LSTR MSG_RETRACT = _UxGT("Retract"); LSTR MSG_MOVE_AXIS = _UxGT("As verplaatsen"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Z probe & Level"); LSTR MSG_BED_LEVELING = _UxGT("Bed Leveling"); LSTR MSG_LEVEL_BED = _UxGT("Level bed"); @@ -152,6 +153,7 @@ namespace LanguageNarrow_nl { LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch"); LSTR MSG_HOME_FIRST = _UxGT("Home %s Eerst"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Offset"); // accepted English term in Dutch + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Babystep Probe Z"); LSTR MSG_BABYSTEP_X = _UxGT("Babystap X"); LSTR MSG_BABYSTEP_Y = _UxGT("Babystap Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Babystap Z"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index c96da22b60..b7bda0f584 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -112,6 +112,7 @@ namespace LanguageNarrow_pl { LSTR MSG_EXTRUDE = _UxGT("Ekstruzja"); LSTR MSG_RETRACT = _UxGT("Wycofanie"); LSTR MSG_MOVE_AXIS = _UxGT("Ruch osi"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sonda/poziomowanie"); LSTR MSG_BED_LEVELING = _UxGT("Poziomowanie stołu"); LSTR MSG_LEVEL_BED = _UxGT("Wypoziomuj stół"); LSTR MSG_BED_TRAMMING = _UxGT("Narożniki poziomowania"); @@ -143,13 +144,10 @@ namespace LanguageNarrow_pl { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Zmierz"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Usuń & Zmierz Stół"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Przesuwanie do następnego"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Aktywacja UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Dezaktywacja UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temperatura stołu"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temperatura stołu"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temperatura dyszy"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temperatura dyszy"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Edycja siatki"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Edycja własnej siatki"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Dostrajanie siatki"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati"); @@ -369,6 +367,7 @@ namespace LanguageNarrow_pl { LSTR MSG_BLTOUCH_MODE_CHANGE = _UxGT("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?"); LSTR MSG_HOME_FIRST = _UxGT("Najpierw Home %s"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Offset Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Krok Z offsetu"); LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Przesuń dyszę do stołu"); LSTR MSG_BABYSTEP_TOTAL = _UxGT("Łącznie"); LSTR MSG_ENDSTOP_ABORT = _UxGT("Błąd krańcówki"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 989909e7e7..036ca297db 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -75,6 +75,7 @@ namespace LanguageNarrow_pt { LSTR MSG_EXTRUDE = _UxGT("Extrudir"); LSTR MSG_RETRACT = _UxGT("Retrair"); LSTR MSG_MOVE_AXIS = _UxGT("Mover eixo"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Calibrar e nivelar"); LSTR MSG_MOVE_X = _UxGT("Mover X"); LSTR MSG_MOVE_Y = _UxGT("Mover Y"); LSTR MSG_MOVE_Z = _UxGT("Mover Z"); @@ -145,6 +146,7 @@ namespace LanguageNarrow_pt { LSTR MSG_CHANGE_MEDIA = _UxGT("Trocar cartão SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Sensor fora/base"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Desvio Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Passo Z ajuste"); LSTR MSG_ENDSTOP_ABORT = _UxGT("Fim de curso"); LSTR MSG_ERR_HEATING_FAILED = _UxGT("Aquecimento falhou"); LSTR MSG_ERR_MAXTEMP = _UxGT("Err: T Máxima"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 17c6ada026..23c49a5a55 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -91,6 +91,7 @@ namespace LanguageNarrow_pt_br { LSTR MSG_EXTRUDE = _UxGT("Extrusar"); LSTR MSG_RETRACT = _UxGT("Retrair"); LSTR MSG_MOVE_AXIS = _UxGT("Mover eixo"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sondar e Nivelar"); LSTR MSG_BED_LEVELING = _UxGT("Nivelação Mesa"); LSTR MSG_LEVEL_BED = _UxGT("Nivelar Mesa"); LSTR MSG_BED_TRAMMING = _UxGT("Nivelar Cantos"); @@ -119,13 +120,10 @@ namespace LanguageNarrow_pt_br { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Medir"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Remover e calibrar"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Movendo para Próximo"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Ativar UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Desativar UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Temp. Mesa"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Temp. Mesa"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Temp. Extrusora"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Temp. Extrusora"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Editar Malha"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Editar Malha Custom"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Ajuste Fino da Malha"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição"); @@ -340,6 +338,7 @@ namespace LanguageNarrow_pt_br { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Compensar Sonda em X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Compensar Sonda em Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Compensar Sonda em Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Passo Z ajuste"); LSTR MSG_BABYSTEP_X = _UxGT("Passinho X"); LSTR MSG_BABYSTEP_Y = _UxGT("Passinho Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Passinho Z"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 81f44fe65a..47336a204f 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -98,6 +98,7 @@ namespace LanguageNarrow_ro { LSTR MSG_EXTRUDE = _UxGT("Extrudeaza"); LSTR MSG_RETRACT = _UxGT("Retracteaza"); LSTR MSG_MOVE_AXIS = _UxGT("Muta Axa"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Probare si Nivelare"); LSTR MSG_BED_LEVELING = _UxGT("Nivelarea Patului"); LSTR MSG_LEVEL_BED = _UxGT("Niveleaza Patul"); LSTR MSG_BED_TRAMMING = _UxGT("Niveleaza Colturile"); @@ -129,13 +130,10 @@ namespace LanguageNarrow_ro { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Measure"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Remove & Measure Bed"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Moving to next"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Activate UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Deactivate UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Bed Temp"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Bed Temp"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Hotend Temp"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hotend Temp"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Mesh Edit"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Edit Custom Mesh"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Fine Tuning Mesh"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); @@ -419,6 +417,7 @@ namespace LanguageNarrow_ro { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Probe X Offset"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Probe Y Offset"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Probe Z Offset"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Pas Z ajustare"); LSTR MSG_BABYSTEP_X = _UxGT("Babystep X"); LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 430a686019..6f5d61f4f7 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -119,6 +119,7 @@ namespace LanguageNarrow_ru { LSTR MSG_EXTRUDE = _UxGT("Выдавить"); LSTR MSG_RETRACT = _UxGT("Втянуть"); LSTR MSG_MOVE_AXIS = _UxGT("Движение по осям"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Проба/выравнивание"); LSTR MSG_BED_LEVELING = _UxGT("Выравнивание стола"); LSTR MSG_LEVEL_BED = _UxGT("Выровнять стол"); LSTR MSG_BED_TRAMMING = _UxGT("Выровнять углы"); @@ -161,9 +162,6 @@ namespace LanguageNarrow_ru { LSTR MSG_UBL_MESH_WIZARD = _UxGT("Мастер сеток UBL"); LSTR MSG_UBL_BC_INSERT2 = _UxGT("Измерение"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Двигаемся дальше"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Активировать UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Деактивировать UBL"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Редактор сеток"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Править свою сетку"); LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE _UxGT("C"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE _UxGT("C"); @@ -467,6 +465,7 @@ namespace LanguageNarrow_ru { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Смещение X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Смещение Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Смещение Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Шаг Z смещения"); LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Двиг. сопло к столу"); LSTR MSG_BABYSTEP_X = _UxGT("Микрошаг X"); LSTR MSG_BABYSTEP_Y = _UxGT("Микрошаг Y"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 9746329015..eaff99589b 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -148,6 +148,7 @@ namespace LanguageNarrow_sk { LSTR MSG_EXTRUDE = _UxGT("Vytlačiť (extr.)"); LSTR MSG_RETRACT = _UxGT("Vytiahnuť (retr.)"); LSTR MSG_MOVE_AXIS = _UxGT("Posunúť osy"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sonda a vyrovnanie"); LSTR MSG_BED_LEVELING = _UxGT("Vyrovnanie podložky"); LSTR MSG_LEVEL_BED = _UxGT("Vyrovnať podložku"); LSTR MSG_BED_TRAMMING = _UxGT("Vyrovnať rohy"); @@ -202,13 +203,10 @@ namespace LanguageNarrow_sk { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Zmerajte"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Odstráňte a zmerajte"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Presun na ďalší"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Aktivovať UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Deaktivovať UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Teplota podložky"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Teplota podložky"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Teplota hotendu"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Teplota hotendu"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Úprava siete bodov"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Upraviť vlastnú sieť"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Doladiť sieť bodov"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete"); @@ -569,6 +567,7 @@ namespace LanguageNarrow_sk { LSTR MSG_ZPROBE_XOFFSET = _UxGT("X ofset"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y ofset"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z ofset"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Krok Z posuň"); LSTR MSG_ZPROBE_MARGIN = _UxGT("Hranica sondy"); LSTR MSG_Z_FEED_RATE = _UxGT("Rýchl. posunu Z"); LSTR MSG_ENABLE_HS_MODE = _UxGT("Povoliť rež. HS"); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 4023d13521..287a4dc190 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -115,6 +115,7 @@ namespace LanguageNarrow_sv { LSTR MSG_EXTRUDE = _UxGT("Extrudera"); LSTR MSG_RETRACT = _UxGT("Dra tillbaka"); LSTR MSG_MOVE_AXIS = _UxGT("Flytta Axel"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Sond och Nivellera"); LSTR MSG_BED_LEVELING = _UxGT("Bädd Nivellering"); LSTR MSG_LEVEL_BED = _UxGT("Nivellera Bädd"); LSTR MSG_BED_TRAMMING = _UxGT("Bädd Justering"); @@ -152,13 +153,10 @@ namespace LanguageNarrow_sv { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Mät"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Ta bort & Mät bädd"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Flyttar till nästa"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Aktivera UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Avaktivera UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Bädd Temp"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Bädd Temp"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Hetände Temp"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hetände Temp"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Nät Redigera"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Redigera Anpassat Nät"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Finjustera Nät"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Färdig Redigera Nät"); @@ -449,6 +447,7 @@ namespace LanguageNarrow_sv { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Sond X Offset"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Sond Y Offset"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Sond Z Offset"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Steg Z justering"); LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Flytta Munstycke till Bädd"); LSTR MSG_BABYSTEP_X = _UxGT("Småsteg X"); LSTR MSG_BABYSTEP_Y = _UxGT("Småsteg Y"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 6b50ddfd3b..37ed299573 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -150,6 +150,7 @@ namespace LanguageNarrow_tr { LSTR MSG_EXTRUDE = _UxGT("Ekstrüzyon"); LSTR MSG_RETRACT = _UxGT("Geri Çek"); LSTR MSG_MOVE_AXIS = _UxGT("Eksen Hareketleri"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Prob ve Seviyeleme"); LSTR MSG_BED_LEVELING = _UxGT("Tabla Seviyeleme"); LSTR MSG_LEVEL_BED = _UxGT("Tablayı Seviyele"); LSTR MSG_BED_TRAMMING = _UxGT("Tabla Hizalama"); @@ -205,13 +206,10 @@ namespace LanguageNarrow_tr { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Ölçüm"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Tablayı Kaldır & Ölç"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Sonrakine Git"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("UBL'i Aktifleştir"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("UBL'i Pasifleştir"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Tabla Sıcaklığı"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Tabla Sıcaklığı"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Nozul Sıcaklığı"); LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Nozul Sıcaklığı"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Mesh Düzenleme"); LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Özel Mesh Düzenleme"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("İnce Ayar Mesh"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam"); @@ -588,6 +586,7 @@ namespace LanguageNarrow_tr { LSTR MSG_ZPROBE_XOFFSET = _UxGT("X Prob Ofseti"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y Prob Ofseti"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Prob Ofseti"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Z ayarı adımsal"); LSTR MSG_ZPROBE_MARGIN = _UxGT("Prob Payı"); LSTR MSG_Z_FEED_RATE = _UxGT("Z İlerleme Hızı"); LSTR MSG_ENABLE_HS_MODE = _UxGT("HS modunu aç"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 5010aff703..01ec6161a9 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -117,6 +117,7 @@ namespace LanguageNarrow_uk { LSTR MSG_EXTRUDE = _UxGT("Екструзія"); LSTR MSG_RETRACT = _UxGT("Втягування"); LSTR MSG_MOVE_AXIS = _UxGT("Рух по осям"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Проба/вирівнювання"); LSTR MSG_BED_LEVELING = _UxGT("Вирівнювання столу"); LSTR MSG_LEVEL_BED = _UxGT("Вирівняти стіл"); LSTR MSG_BED_TRAMMING = _UxGT("Вирівняти кути"); @@ -159,8 +160,6 @@ namespace LanguageNarrow_uk { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Вимірювання"); LSTR MSG_UBL_BC_REMOVE = _UxGT("Видали і вимір. стіл"); LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Рух до наступної"); - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Активувати UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Деактивувати UBL"); LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE _UxGT("C"); LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE _UxGT("C"); LSTR MSG_UBL_SET_TEMP_HOTEND = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE _UxGT("C"); @@ -168,7 +167,6 @@ namespace LanguageNarrow_uk { LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Редагувати свою"); LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Точне редаг. сітки"); LSTR MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Будувати свою"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Редагування сітки"); LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); LSTR MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); LSTR MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку ($)"); @@ -477,6 +475,7 @@ namespace LanguageNarrow_uk { LSTR MSG_ZPROBE_XOFFSET = _UxGT("Зміщення по X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Зміщення по Y"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Зміщення по Z"); + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Крок Z зміщення"); LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Рухати сопло до столу"); LSTR MSG_BABYSTEP_X = _UxGT("Мікрокрок X"); LSTR MSG_BABYSTEP_Y = _UxGT("Мікрокрок Y"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index c952416ec8..cc5befe557 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -87,6 +87,7 @@ namespace LanguageNarrow_vi { LSTR MSG_EXTRUDE = _UxGT("Ép đùn"); // Extrude LSTR MSG_RETRACT = _UxGT("Rút lại"); // Retract LSTR MSG_MOVE_AXIS = _UxGT("Di chuyển trục"); // Move axis + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Chạm và san lấp"); // Probe and Level LSTR MSG_BED_LEVELING = _UxGT("San Lấp Bàn"); // Bed Leveling LSTR MSG_LEVEL_BED = _UxGT("Làm bằng mặt bàn"); // Level bed LSTR MSG_BED_TRAMMING = _UxGT("Làm bằng góc bàn"); // Level corners @@ -112,13 +113,10 @@ namespace LanguageNarrow_vi { LSTR MSG_UBL_BC_INSERT2 = _UxGT("Đo"); // Measure LSTR MSG_UBL_BC_REMOVE = _UxGT("Tháo và đo bàn"); // Remove & measure bed LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Chuyển sang tiếp theo"); // Moving to next - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Bật UBL"); - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Tắt UBL"); LSTR MSG_UBL_SET_TEMP_BED = _UxGT("Nhiệt độ bàn"); // Bed Temp LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Bed Temp"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("Nhiệt độ đầu phun"); // Hotend Temp LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Hotend Temp"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("Chỉnh sửa lưới"); // Mesh Edit LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Chỉnh sửa lưới tự chọn"); // Edit Custom Mesh LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Chỉnh lưới chính xác"); // Fine tuning mesh LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sửa xong lưới"); // Done Editing Mesh @@ -322,8 +320,9 @@ namespace LanguageNarrow_vi { LSTR MSG_BLTOUCH_STOW = _UxGT("Cất BLTouch"); // Stow BLTouch LSTR MSG_MANUAL_DEPLOY = _UxGT("Đem Đầu Dò-Z"); // Deploy Z-Probe LSTR MSG_MANUAL_STOW = _UxGT("Cất Đầu Dò-Z"); // Stow Z-Probe - LSTR MSG_HOME_FIRST = _UxGT("Về nhà %s Trước"); + LSTR MSG_HOME_FIRST = _UxGT("Về nhà %s Trước"); // Home %s first LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Đầu Dò Bù Đắp Z"); // Probe Z Offset + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("Điều chỉnh Z từng"); // Babystep Probe Z LSTR MSG_BABYSTEP_X = _UxGT("Nhít X"); // Babystep X LSTR MSG_BABYSTEP_Y = _UxGT("Nhít Y"); LSTR MSG_BABYSTEP_Z = _UxGT("Nhít Z"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 75d81f2c9a..f4f7d8539c 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -101,6 +101,7 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_EXTRUDE = _UxGT("挤出"); // "Extrude" LSTR MSG_RETRACT = _UxGT("回抽"); // "Retract" LSTR MSG_MOVE_AXIS = _UxGT("移动轴"); // "Move axis" + LSTR MSG_PROBE_AND_LEVEL = _UxGT("探测并调平"); // "Probe and Level" LSTR MSG_BED_LEVELING = _UxGT("调平热床"); // "Bed leveling" LSTR MSG_LEVEL_BED = _UxGT("调平热床"); // "Level bed" LSTR MSG_BED_TRAMMING = _UxGT("调平边角"); // "Bed Tramming" @@ -137,13 +138,10 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_UBL_BC_INSERT2 = _UxGT("测量"); // "Measure" LSTR MSG_UBL_BC_REMOVE = _UxGT("移除并测量热床"); // "Remove & measure bed" LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("移动到下一个"); // "Moving to next" - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("激活UBL"); // "Activate UBL" - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("关闭UBL"); // "Deactivate UBL" LSTR MSG_UBL_SET_TEMP_BED = _UxGT("热床温度"); // "Bed Temp" LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("热床温度"); LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("热端温度"); // "Hotend Temp" LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("热端温度"); - LSTR MSG_UBL_MESH_EDIT = _UxGT("网格编辑"); // "Mesh Edit" LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("编辑客户网格"); // "Edit Custom Mesh" LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("细调网格"); // "Fine Tuning Mesh" LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh" @@ -429,6 +427,7 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_ZPROBE_XOFFSET = _UxGT("探针X偏移"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("探针Y偏移"); LSTR MSG_ZPROBE_ZOFFSET = _UxGT("探针Z偏移"); // "Z Offset" + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("逐步调整Z"); // "Babystep Probe Z" LSTR MSG_BABYSTEP_X = _UxGT("微量调整X轴"); // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts LSTR MSG_BABYSTEP_Y = _UxGT("微量调整Y轴"); // "Babystep Y" LSTR MSG_BABYSTEP_Z = _UxGT("微量调整Z轴"); // "Babystep Z" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index e47704da7e..b8c8443e65 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -94,6 +94,7 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_EXTRUDE = _UxGT("擠出"); // "Extrude" LSTR MSG_RETRACT = _UxGT("回縮"); // "Retract" LSTR MSG_MOVE_AXIS = _UxGT("移動軸"); // "Move axis" + LSTR MSG_PROBE_AND_LEVEL = _UxGT("探測和調平"); // "Probe and Level" LSTR MSG_BED_LEVELING = _UxGT("調平熱床"); // "Bed leveling" LSTR MSG_LEVEL_BED = _UxGT("調平熱床"); // "Level bed" LSTR MSG_BED_TRAMMING = _UxGT("調平邊角"); // "Bed Tramming" @@ -125,13 +126,10 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_UBL_BC_INSERT2 = _UxGT("測量"); // "Measure" LSTR MSG_UBL_BC_REMOVE = _UxGT("移除並測量熱床"); // "Remove & measure bed" LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("移動到下一個"); // "Moving to next" - LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("啟動UBL"); // "Activate UBL" - LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("關閉UBL"); // "Deactivate UBL" LSTR MSG_UBL_SET_TEMP_BED = _UxGT("置設熱床溫度"); // "Bed Temp" LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("置設熱床溫度"); // "Bed Temp" LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("置設噴嘴溫度"); // "Hotend Temp" LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("熱端溫度"); // "Hotend Temp" - LSTR MSG_UBL_MESH_EDIT = _UxGT("網格編輯"); // "Mesh Edit" LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("編輯客戶網格"); // "Edit Custom Mesh" LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("細調網格"); // "Fine Tuning Mesh" LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("完成編輯網格"); // "Done Editing Mesh" @@ -364,10 +362,11 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_BLTOUCH_DEPLOY = _UxGT("部署BLTouch"); // "Deploy BLTouch" LSTR MSG_HOME_FIRST = _UxGT("歸位 %s 先"); // "Home ... first" - LSTR MSG_ZPROBE_OFFSETS = _UxGT("探針偏移"); //Probe Offsets - LSTR MSG_ZPROBE_XOFFSET = _UxGT("探針X偏移量"); //Probe X Offset - LSTR MSG_ZPROBE_YOFFSET = _UxGT("探針Y偏移量"); //Probe Y Offset - LSTR MSG_ZPROBE_ZOFFSET = _UxGT("探針Z偏移量"); //Probe Z Offset + LSTR MSG_ZPROBE_OFFSETS = _UxGT("探針偏移"); // "Probe Offsets" + LSTR MSG_ZPROBE_XOFFSET = _UxGT("探針X偏移量"); // "Probe X Offset" + LSTR MSG_ZPROBE_YOFFSET = _UxGT("探針Y偏移量"); // "Probe Y Offset" + LSTR MSG_ZPROBE_ZOFFSET = _UxGT("探針Z偏移量"); // "Probe Z Offset" + LSTR MSG_BABYSTEP_PROBE_Z = _UxGT("逐步調整Z"); // "Babystep Probe Z" LSTR MSG_BABYSTEP_X = _UxGT("微量調整X軸"); // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts LSTR MSG_BABYSTEP_Y = _UxGT("微量調整Y軸"); // "Babystep Y" LSTR MSG_BABYSTEP_Z = _UxGT("微量調整Z軸"); // "Babystep Z" diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp index a85feb5683..a48c040ecd 100644 --- a/Marlin/src/lcd/menu/menu.cpp +++ b/Marlin/src/lcd/menu/menu.cpp @@ -318,7 +318,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) { } if (ui.should_draw()) { if (do_probe) { - MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z)); + MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_BABYSTEP_PROBE_Z), BABYSTEP_TO_STR(probe.offset.z)); TERN_(BABYSTEP_GFX_OVERLAY, ui.zoffset_overlay(probe.offset.z)); } else { diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index 903c857f59..e1072f3ee4 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -608,29 +608,6 @@ void menu_backlash(); #endif - // M851 - Z Probe Offsets - #if HAS_BED_PROBE - void menu_probe_offsets() { - START_MENU(); - BACK_ITEM(MSG_ADVANCED_SETTINGS); - #if HAS_PROBE_XY_OFFSET - EDIT_ITEM(float31sign, MSG_ZPROBE_XOFFSET, &probe.offset.x, PROBE_OFFSET_XMIN, PROBE_OFFSET_XMAX); - EDIT_ITEM(float31sign, MSG_ZPROBE_YOFFSET, &probe.offset.y, PROBE_OFFSET_YMIN, PROBE_OFFSET_YMAX); - #endif - EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); - - #if ENABLED(PROBE_OFFSET_WIZARD) - SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard); - #endif - - #if ENABLED(X_AXIS_TWIST_COMPENSATION) - SUBMENU(MSG_XATC, xatc_wizard_continue); - #endif - - END_MENU(); - } - #endif - #endif // !SLIM_LCD_MENUS #if ENABLED(EDITABLE_STEPS_PER_UNIT) @@ -712,11 +689,6 @@ void menu_advanced_settings() { ); #endif - // M851 - Z Probe Offsets - #if HAS_BED_PROBE - if (!is_busy) SUBMENU(MSG_ZPROBE_OFFSETS, menu_probe_offsets); - #endif - #endif // !SLIM_LCD_MENUS // M92 - Steps Per mm diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index bd5ed492a1..dd3a3016a1 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -342,7 +342,7 @@ void menu_advanced_settings(); START_MENU(); BACK_ITEM(MSG_CONFIGURATION); GCODES_ITEM(MSG_TOUCHMI_INIT, F("M851 Z0\nG28\nG1 F200 Z0")); - SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); + SUBMENU(MSG_BABYSTEP_PROBE_Z, lcd_babystep_zoffset); GCODES_ITEM(MSG_TOUCHMI_SAVE, F("M500\nG1 F200 Z10")); GCODES_ITEM(MSG_TOUCHMI_ZTEST, F("G28\nG1 F200 Z0")); END_MENU(); @@ -562,12 +562,6 @@ void menu_configuration() { SUBMENU(MSG_ADVANCED_SETTINGS, menu_advanced_settings); - #if ENABLED(BABYSTEP_ZPROBE_OFFSET) - SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); - #elif HAS_BED_PROBE - EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); - #endif - // // Set Fan Controller speed // diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 218e37740a..ed15a54fd6 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -72,6 +72,10 @@ void menu_motion(); void menu_temperature(); void menu_configuration(); +#if HAS_LEVELING || HAS_BED_PROBE + void menu_probe_level(); +#endif + #if HAS_POWER_MONITOR void menu_power_monitor(); #endif @@ -333,6 +337,10 @@ void menu_main() { #endif SUBMENU(MSG_MOTION, menu_motion); + + #if HAS_LEVELING || HAS_BED_PROBE + SUBMENU(MSG_PROBE_AND_LEVEL, menu_probe_level); + #endif } #if HAS_CUTTER diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 0e7543921d..5f2717cf84 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -39,11 +39,6 @@ #include "../../module/delta.h" #endif -#if HAS_LEVELING - #include "../../module/planner.h" - #include "../../feature/bedlevel/bedlevel.h" -#endif - // Always show configurable options regardless of FT Motion active //#define FT_MOTION_NO_MENU_TOGGLE @@ -313,16 +308,6 @@ void menu_move() { } #endif -#if ENABLED(AUTO_BED_LEVELING_UBL) - void _lcd_ubl_level_bed(); -#elif ENABLED(LCD_BED_LEVELING) - void menu_bed_leveling(); -#endif - -#if ENABLED(ASSISTED_TRAMMING_WIZARD) - void goto_tramming_wizard(); -#endif - #if ENABLED(FT_MOTION_MENU) #include "../../module/ft_motion.h" @@ -568,72 +553,6 @@ void menu_motion() { GCODES_ITEM(MSG_MANUAL_PENDOWN, F("M280 P0 S50")); #endif - // - // Level Bed - // - #if ENABLED(AUTO_BED_LEVELING_UBL) - - SUBMENU(MSG_UBL_LEVELING, _lcd_ubl_level_bed); - - #elif ENABLED(LCD_BED_LEVELING) - - if (!g29_in_progress) - SUBMENU(MSG_BED_LEVELING, menu_bed_leveling); - - #elif HAS_LEVELING && DISABLED(SLIM_LCD_MENUS) - - #if DISABLED(PROBE_MANUALLY) - GCODES_ITEM(MSG_LEVEL_BED, F("G29N")); - #endif - - if (all_axes_homed() && leveling_is_valid()) { - bool show_state = planner.leveling_active; - EDIT_ITEM(bool, MSG_BED_LEVELING, &show_state, _lcd_toggle_bed_leveling); - } - - #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) - editable.decimal = planner.z_fade_height; - EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); }); - #endif - - #endif - - // - // Assisted Bed Tramming - // - #if ENABLED(ASSISTED_TRAMMING_WIZARD) - SUBMENU(MSG_TRAMMING_WIZARD, goto_tramming_wizard); - #endif - - // - // Bed Tramming Submenu - // - #if ENABLED(LCD_BED_TRAMMING) && DISABLED(LCD_BED_LEVELING) - SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming); - #endif - - // - // Auto Z-Align - // - #if ANY(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION) - GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34")); - #endif - - // - // Probe Deploy/Stow - // - #if ENABLED(PROBE_DEPLOY_STOW_MENU) - GCODES_ITEM(MSG_MANUAL_DEPLOY, F("M401")); - GCODES_ITEM(MSG_MANUAL_STOW, F("M402")); - #endif - - // - // Probe Repeatability Test - // - #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) - GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10")); - #endif - // // Auto-calibration with Object // diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_probe_level.cpp similarity index 57% rename from Marlin/src/lcd/menu/menu_bed_leveling.cpp rename to Marlin/src/lcd/menu/menu_probe_level.cpp index 6a100de598..9376ada37e 100644 --- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp +++ b/Marlin/src/lcd/menu/menu_probe_level.cpp @@ -21,21 +21,29 @@ */ // -// Bed Leveling Menus +// Probe and Level (Calibrate?) Menu // #include "../../inc/MarlinConfigPre.h" -#if ENABLED(LCD_BED_LEVELING) +#if HAS_MARLINUI_MENU && (HAS_LEVELING || HAS_BED_PROBE) #include "menu_item.h" -#include "../../module/planner.h" + #include "../../feature/bedlevel/bedlevel.h" -#if HAS_BED_PROBE && DISABLED(BABYSTEP_ZPROBE_OFFSET) +#if HAS_LEVELING + #include "../../module/planner.h" // for leveling_active, z_fade_height +#endif + +#if HAS_BED_PROBE #include "../../module/probe.h" #endif +#if ENABLED(BABYSTEP_ZPROBE_OFFSET) + #include "../../feature/babystep.h" +#endif + #if HAS_GRAPHICAL_TFT #include "../tft/tft.h" #if ENABLED(TOUCH_SCREEN) @@ -43,7 +51,7 @@ #endif #endif -#if ANY(PROBE_MANUALLY, MESH_BED_LEVELING) +#if ENABLED(LCD_BED_LEVELING) && ANY(PROBE_MANUALLY, MESH_BED_LEVELING) #include "../../module/motion.h" #include "../../gcode/queue.h" @@ -201,7 +209,7 @@ queue.inject_P(G28_STR); } -#endif // PROBE_MANUALLY || MESH_BED_LEVELING +#endif // LCD_BED_LEVELING && (PROBE_MANUALLY || MESH_BED_LEVELING) #if ENABLED(MESH_EDIT_MENU) @@ -222,94 +230,184 @@ #endif // MESH_EDIT_MENU -/** - * Step 1: Bed Level entry-point - * - * << Motion - * Auto Home (if homing needed) - * Leveling On/Off (if data exists, and homed) - * Fade Height: --- (Req: ENABLE_LEVELING_FADE_HEIGHT) - * Mesh Z Offset: --- (Req: MESH_BED_LEVELING) - * Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET) - * Level Bed > - * Bed Tramming > (if homed) - * Load Settings (Req: EEPROM_SETTINGS) - * Save Settings (Req: EEPROM_SETTINGS) - */ -void menu_bed_leveling() { - const bool is_homed = all_axes_trusted(), - is_valid = leveling_is_valid(); +#if ENABLED(AUTO_BED_LEVELING_UBL) + void _lcd_ubl_level_bed(); +#endif + +#if ENABLED(ASSISTED_TRAMMING_WIZARD) + void goto_tramming_wizard(); +#endif + +// Include a sub-menu when there's manual probing + +void menu_probe_level() { + const bool can_babystep_z = TERN0(BABYSTEP_ZPROBE_OFFSET, babystep.can_babystep(Z_AXIS)); + + #if HAS_LEVELING + const bool is_homed = all_axes_homed(), + is_valid = leveling_is_valid(); + #endif + + #if NONE(PROBE_MANUALLY, MESH_BED_LEVELING) + const bool is_trusted = all_axes_trusted(); + #endif START_MENU(); - BACK_ITEM(MSG_MOTION); - // Auto Home if not using manual probing - #if NONE(PROBE_MANUALLY, MESH_BED_LEVELING) - if (!is_homed) GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR)); - #endif + // + // ^ Main + // + BACK_ITEM(MSG_MAIN_MENU); - // Level Bed - #if ANY(PROBE_MANUALLY, MESH_BED_LEVELING) - // Manual leveling uses a guided procedure - SUBMENU(MSG_LEVEL_BED, _lcd_level_bed_continue); - #else - // Automatic leveling can just run the G-code - GCODES_ITEM(MSG_LEVEL_BED, is_homed ? F("G29") : F("G29N")); - #endif + if (!g29_in_progress) { - #if ENABLED(MESH_EDIT_MENU) - if (is_valid) SUBMENU(MSG_EDIT_MESH, menu_edit_mesh); - #endif + // Auto Home if not using manual probing + #if NONE(PROBE_MANUALLY, MESH_BED_LEVELING) + if (!is_trusted) GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR)); + #endif - // Homed and leveling is valid? Then leveling can be toggled. - if (is_homed && is_valid) { - bool show_state = planner.leveling_active; - EDIT_ITEM(bool, MSG_BED_LEVELING, &show_state, _lcd_toggle_bed_leveling); - } + #if HAS_LEVELING + + // Homed and leveling is valid? Then leveling can be toggled. + if (is_homed && is_valid) { + bool show_state = planner.leveling_active; + EDIT_ITEM(bool, MSG_BED_LEVELING, &show_state, _lcd_toggle_bed_leveling); + } + + // + // Level Bed + // + #if ENABLED(AUTO_BED_LEVELING_UBL) + // UBL uses a guided procedure + SUBMENU(MSG_UBL_LEVELING, _lcd_ubl_level_bed); + #elif ANY(PROBE_MANUALLY, MESH_BED_LEVELING) + #if ENABLED(LCD_BED_LEVELING) + // Manual leveling uses a guided procedure + SUBMENU(MSG_LEVEL_BED, _lcd_level_bed_continue); + #endif + #else + // Automatic leveling can just run the G-code + GCODES_ITEM(MSG_LEVEL_BED, is_homed ? F("G29") : F("G29N")); + #endif + + // + // Edit Mesh (non-UBL) + // + #if ENABLED(MESH_EDIT_MENU) + if (is_valid) SUBMENU(MSG_EDIT_MESH, menu_edit_mesh); + #endif + + // + // Mesh Bed Leveling Z-Offset + // + #if ENABLED(MESH_BED_LEVELING) + #if WITHIN(PROBE_OFFSET_ZMIN, -9, 9) + #define LCD_Z_OFFSET_TYPE float43 // Values from -9.000 to +9.000 + #else + #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99 + #endif + EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_MESH_Z_OFFSET, &bedlevel.z_offset, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); + #endif + + #endif + + } // no G29 in progress // Z Fade Height - #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) + #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(SLIM_LCD_MENUS) // Shadow for editing the fade height editable.decimal = planner.z_fade_height; EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); }); #endif - // - // Mesh Bed Leveling Z-Offset - // - #if ENABLED(MESH_BED_LEVELING) - #if WITHIN(PROBE_OFFSET_ZMIN, -9, 9) - #define LCD_Z_OFFSET_TYPE float43 // Values from -9.000 to +9.000 - #else - #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99 + if (!g29_in_progress) { + // + // Probe Deploy/Stow + // + #if ENABLED(PROBE_DEPLOY_STOW_MENU) + GCODES_ITEM(MSG_MANUAL_DEPLOY, F("M401")); + GCODES_ITEM(MSG_MANUAL_STOW, F("M402")); #endif - EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_MESH_Z_OFFSET, &bedlevel.z_offset, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); - #endif - #if ENABLED(BABYSTEP_ZPROBE_OFFSET) - SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); - #elif HAS_BED_PROBE - EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); - #endif + // Tare the probe on-demand + #if ENABLED(PROBE_TARE_MENU) + ACTION_ITEM(MSG_TARE_PROBE, probe.tare); + #endif - #if ENABLED(PROBE_OFFSET_WIZARD) - SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard); - #endif + // + // Probe XY Offsets + // + #if HAS_PROBE_XY_OFFSET + EDIT_ITEM(float31sign, MSG_ZPROBE_XOFFSET, &probe.offset.x, PROBE_OFFSET_XMIN, PROBE_OFFSET_XMAX); + EDIT_ITEM(float31sign, MSG_ZPROBE_YOFFSET, &probe.offset.y, PROBE_OFFSET_YMIN, PROBE_OFFSET_YMAX); + #endif - // Tare the probe on-demand - #if ENABLED(PROBE_TARE_MENU) - ACTION_ITEM(MSG_TARE_PROBE, probe.tare); - #endif + // + // Probe Z Offset - Babystep or Edit + // + if (can_babystep_z) { + #if ENABLED(BABYSTEP_ZPROBE_OFFSET) + SUBMENU(MSG_BABYSTEP_PROBE_Z, lcd_babystep_zoffset); + #endif + } + else { + #if HAS_BED_PROBE + EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX); + #endif + } - #if ENABLED(LCD_BED_TRAMMING) - SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming); - #endif + // + // Probe Z Offset Wizard + // + #if ENABLED(PROBE_OFFSET_WIZARD) + SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard); + #endif + + // + // Probe Repeatability Test + // + #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) + GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10")); + #endif + + // + // Assisted Bed Tramming + // + #if ENABLED(ASSISTED_TRAMMING_WIZARD) + SUBMENU(MSG_TRAMMING_WIZARD, goto_tramming_wizard); + #endif + + // + // Bed Tramming Submenu + // + #if ENABLED(LCD_BED_TRAMMING) + SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming); + #endif + + // + // Auto Z-Align + // + #if ANY(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION) + GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34")); + #endif + + // + // Twist Compensation + // + #if ENABLED(X_AXIS_TWIST_COMPENSATION) + SUBMENU(MSG_XATC, xatc_wizard_continue); + #endif + + // + // Store to EEPROM + // + #if ENABLED(EEPROM_SETTINGS) + ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings); + #endif + + } - #if ENABLED(EEPROM_SETTINGS) - ACTION_ITEM(MSG_LOAD_EEPROM, ui.load_settings); - ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings); - #endif END_MENU(); } -#endif // LCD_BED_LEVELING +#endif // HAS_MARLINUI_MENU && (HAS_LEVELING || HAS_BED_PROBE) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 3b9f0f3983..63ad34a70b 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -632,10 +632,11 @@ void _menu_ubl_tools() { * UBL System submenu * * << Motion - * - Manually Build Mesh >> - * - Activate UBL >> - * - Deactivate UBL >> + * - Activate / Deactivate UBL + * - Edit Fade Height * - Step-By-Step UBL >> + * - Mesh Wizard >> + * - Mesh Edit >> * - Mesh Storage >> * - Output Map >> * - UBL Tools >> @@ -644,21 +645,24 @@ void _menu_ubl_tools() { void _lcd_ubl_level_bed() { START_MENU(); BACK_ITEM(MSG_MOTION); - if (planner.leveling_active) - GCODES_ITEM(MSG_UBL_DEACTIVATE_MESH, F("G29D")); - else - GCODES_ITEM(MSG_UBL_ACTIVATE_MESH, F("G29A")); + + bool show_state = planner.leveling_active; + EDIT_ITEM(bool, MSG_BED_LEVELING, &show_state, _lcd_toggle_bed_leveling); + #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) editable.decimal = planner.z_fade_height; EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); }); #endif + #if ENABLED(G26_MESH_VALIDATION) SUBMENU(MSG_UBL_STEP_BY_STEP_MENU, _lcd_ubl_step_by_step); #endif + #if ENABLED(UBL_MESH_WIZARD) SUBMENU(MSG_UBL_MESH_WIZARD, _menu_ubl_mesh_wizard); #endif - ACTION_ITEM(MSG_UBL_MESH_EDIT, _ubl_goto_map_screen); + + ACTION_ITEM(MSG_MESH_EDITOR, _ubl_goto_map_screen); SUBMENU(MSG_UBL_STORAGE_MESH_MENU, _lcd_ubl_storage_mesh); SUBMENU(MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map); SUBMENU(MSG_UBL_TOOLS, _menu_ubl_tools); diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 420b18f32a..ef3a1026e0 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -471,7 +471,7 @@ inline void set_all_homed() { TERN_(HAS_ENDSTOPS, axes inline bool axis_was_homed(const AxisEnum axis) { return TEST(axes_homed, axis); } inline bool axis_is_trusted(const AxisEnum axis) { return TEST(axes_trusted, axis); } -inline bool axis_should_home(const AxisEnum axis) { return (axes_should_home() & _BV(axis)) != 0; } +inline bool axis_should_home(const AxisEnum axis) { return axes_should_home(_BV(axis)) != 0; } inline bool no_axes_homed() { return !axes_homed; } inline bool all_axes_homed() { return main_axes_mask == (axes_homed & main_axes_mask); } inline bool homing_needed() { return !all_axes_homed(); } diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py index 71b1153f82..7c94ef0a4a 100644 --- a/buildroot/share/PlatformIO/scripts/chitu_crypt.py +++ b/buildroot/share/PlatformIO/scripts/chitu_crypt.py @@ -34,7 +34,7 @@ if pioutil.is_pio_build(): for loop_counter in range(0, block_size): # meant to make sure different bits of the key are used. - xor_seed = int(loop_counter / key_length) + xor_seed = loop_counter // key_length # IP is a scratch register / R12 ip = loop_counter - (key_length * xor_seed) @@ -83,7 +83,7 @@ if pioutil.is_pio_build(): output_file.write(struct.pack(" 0 ? bdf_capital_A_height : bdf_capital_1_height; - fprintf(out_fp, "/*\n"); - fprintf(out_fp, " Fontname: %s\n", bdf_font); - fprintf(out_fp, " Copyright: %s\n", bdf_copyright); - fprintf(out_fp, " Capital A Height: %d, '1' Height: %d\n", bdf_capital_A_height, bdf_capital_1_height); - fprintf(out_fp, " Calculated Max Values w=%2d h=%2d x=%2d y=%2d dx=%2d dy=%2d ascent=%2d len=%2d\n", + fprintf(out_fp, "/**\n"); + fprintf(out_fp, " * Fontname: %s\n", bdf_font); + fprintf(out_fp, " * Copyright: %s\n", bdf_copyright); + fprintf(out_fp, " * Capital A Height: %d, '1' Height: %d\n", bdf_capital_A_height, bdf_capital_1_height); + fprintf(out_fp, " * Calculated Max Values w=%2d h=%2d x=%2d y=%2d dx=%2d dy=%2d ascent=%2d len=%2d\n", bdf_char_max_width, bdf_char_max_height, bdf_char_max_x, bdf_char_max_y, bdf_delta_max_x, bdf_delta_max_y, bdf_char_max_ascent, bdf_glyph_data_max_len); - fprintf(out_fp, " Font Bounding box w=%2d h=%2d x=%2d y=%2d\n", + fprintf(out_fp, " * Font Bounding box w=%2d h=%2d x=%2d y=%2d\n", bdf_font_width, bdf_font_height, bdf_font_x, bdf_font_y); - fprintf(out_fp, " Calculated Min Values x=%2d y=%2d dx=%2d dy=%2d\n", + fprintf(out_fp, " * Calculated Min Values x=%2d y=%2d dx=%2d dy=%2d\n", bdf_char_min_x, bdf_char_min_y, bdf_delta_min_x, bdf_delta_min_y); - fprintf(out_fp, " Pure Font ascent =%2d descent=%2d\n", capital_ascent, bdf_lower_g_descent); - fprintf(out_fp, " X Font ascent =%2d descent=%2d\n", bdf_char_xascent, bdf_char_xdescent); - fprintf(out_fp, " Max Font ascent =%2d descent=%2d\n", bdf_char_max_ascent, bdf_char_min_y); + fprintf(out_fp, " * Pure Font ascent =%2d descent=%2d\n", capital_ascent, bdf_lower_g_descent); + fprintf(out_fp, " * X Font ascent =%2d descent=%2d\n", bdf_char_xascent, bdf_char_xdescent); + fprintf(out_fp, " * Max Font ascent =%2d descent=%2d\n", bdf_char_max_ascent, bdf_char_min_y); - fprintf(out_fp, "*/\n"); + fprintf(out_fp, " */\n"); fprintf(out_fp, "const u8g_fntpgm_uint8_t %s[%d] U8G_FONT_SECTION(\"%s\") = {\n", fontname, data_pos, fontname); fprintf(out_fp, " "); data_Write(out_fp, " "); diff --git a/ini/features.ini b/ini/features.ini index a502808f09..01d15ec9b9 100644 --- a/ini/features.ini +++ b/ini/features.ini @@ -163,18 +163,19 @@ TFT_FONT_UNIFONT_30_ZH_TW = build_src_filter=+ IS_TFTGLCD_PANEL = build_src_filter=+ HAS_TOUCH_BUTTONS = build_src_filter=+ -HAS_MARLINUI_MENU = build_src_filter=+ - +HAS_MARLINUI_MENU = build_src_filter=+ + + + + + HAS_GAMES = build_src_filter=+ MARLIN_BRICKOUT = build_src_filter=+ MARLIN_INVADERS = build_src_filter=+ MARLIN_MAZE = build_src_filter=+ MARLIN_SNAKE = build_src_filter=+ HAS_MENU_BACKLASH = build_src_filter=+ -LCD_BED_LEVELING = build_src_filter=+ +HAS_MENU_PROBE_LEVEL = build_src_filter=+ HAS_MENU_BED_TRAMMING = build_src_filter=+ HAS_MENU_CANCELOBJECT = build_src_filter=+ HAS_MENU_DELTA_CALIBRATE = build_src_filter=+ HAS_MENU_FILAMENT = build_src_filter=+ +HAS_GAME_MENU = build_src_filter=+ LCD_INFO_MENU = build_src_filter=+ HAS_MENU_JOB_RECOVERY = build_src_filter=+ HAS_MENU_MULTI_LANGUAGE = build_src_filter=+ @@ -185,6 +186,7 @@ HAS_MENU_MMU = build_src_filter=+ + HAS_MENU_PASSWORD = build_src_filter=+ HAS_MENU_POWER_MONITOR = build_src_filter=+ +PROBE_OFFSET_WIZARD = build_src_filter=+ HAS_MENU_CUTTER = build_src_filter=+ HAS_MENU_TEMPERATURE = build_src_filter=+ HAS_MENU_TMC = build_src_filter=+