Browse Source

🚸 Probe / Level Menu (#27393)

* 🎨 Housekeeping
* 🚸 Tweak UBL menu
* 🚸 Babystep Probe specific titles
* 🚸 Probe / Level Menu
Scott Lahteine 6 months ago
parent
commit
c7e62b33d1

+ 1 - 0
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

+ 6 - 2
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;

+ 1 - 0
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);
 

+ 6 - 9
Marlin/src/feature/mmu3/mmu2_progress_converter.cpp

@@ -30,33 +30,30 @@
 
 #include "../../core/language.h"
 #include "mmu2_progress_converter.h"
-#ifdef __AVR__
-  #include <avr/pgmspace.h>
-#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),

+ 1 - 1
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

+ 15 - 0
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), // '중' -- '중'

+ 58 - 14
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), // '點' -- '點'

+ 26 - 4
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), // '進' -- '進'

+ 1 - 1
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");

+ 2 - 2
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");

Some files were not shown because too many files changed in this diff