⛙ Merge w/Marlin

Author: classicrocker883

Marlin/Configuration.h

@@ -2793,10 +2793,10 @@
  *
  * Select the language to display on the LCD. These languages are available:
  *
- *   en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hr, hu, it,
+ *   en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hg, hr, hu, id, it,
  *   jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, sv, tr, uk, vi, zh_CN, zh_TW
  *
- * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
+ * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hg':'Hinglish (Hindi-Latin)', 'hr':'Croatian', 'hu':'Hungarian', 'id':'Indonesian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
  */
 #define LCD_LANGUAGE en
 

Marlin/Version.h

@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2026-03-01"
+//#define STRING_DISTRIBUTION_DATE "2026-03-09"
 
 #define STRING_DISTRIBUTION_DATE __DATE__
 #define STRING_DISTRIBUTION_TIME __TIME__

Marlin/src/core/language.h

@@ -57,8 +57,10 @@
 // fr         French
 // fr_na      French without accents (DWIN T5UID1 touchscreen)
 // gl         Galician
+// hg         Hinglish (Hindi in Latin script)
 // hr         Croatian
 // hu         Hungarian
+// id         Indonesian (Bahasa)
 // it         Italian
 // jp_kana    Japanese
 // ko_KR      Korean (South Korea)

Marlin/src/feature/bedlevel/abl/bbl.cpp

@@ -110,7 +110,7 @@ void LevelingBilinear::reset() {
  * Set grid spacing and start position
  */
 void LevelingBilinear::set_grid(const xy_pos_t& _grid_spacing, const xy_pos_t& _grid_start) {
-  #if ENABLED(PROUI_MESH_EDIT)
+  #if HAS_PROUI_MESH_EDIT
     UNUSED(_grid_spacing); UNUSED(_grid_start);
     grid_start = mesh_min;
     grid_spacing.set(MESH_X_DIST, MESH_Y_DIST);

Marlin/src/feature/bedlevel/abl/bbl.h

@@ -23,11 +23,6 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(PROUI_MESH_EDIT)
-  #define MESH_X_DIST ((mesh_max.x - mesh_min.x) / (GRID_MAX_CELLS_X))
-  #define MESH_Y_DIST ((mesh_max.y - mesh_min.y) / (GRID_MAX_CELLS_Y))
-#endif
-
 class LevelingBilinear {
 public:
   static bed_mesh_t z_values;

Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h

@@ -34,9 +34,6 @@ enum MeshLevelingState : char {
   MeshReset       // G29 S5
 };
 
-#define MESH_X_DIST ((mesh_max.x - mesh_min.x) / (GRID_MAX_CELLS_X))
-#define MESH_Y_DIST ((mesh_max.y - mesh_min.y) / (GRID_MAX_CELLS_Y))
-
 class mesh_bed_leveling {
 public:
   static float z_offset;
@@ -52,12 +49,12 @@ class mesh_bed_leveling {
 
   mesh_bed_leveling();
 
+  static void reset();
+
   static void initialize();
 
   static void report_mesh();
 
-  static void reset();
-
   FORCE_INLINE static bool has_mesh() {
     GRID_LOOP(x, y) if (z_values[x][y]) return true;
     return false;
@@ -83,11 +80,11 @@ class mesh_bed_leveling {
   static float get_mesh_y(const uint8_t j) { return index_to_ypos[j]; }
 
   static uint8_t cell_index_x(const float x) {
-    int8_t cx = (x - mesh_min.x) * RECIPROCAL(MESH_X_DIST);
+    const int8_t cx = (x - mesh_min.x) * RECIPROCAL(MESH_X_DIST);
     return constrain(cx, 0, GRID_MAX_CELLS_X - 1);
   }
   static uint8_t cell_index_y(const float y) {
-    int8_t cy = (y - mesh_min.y) * RECIPROCAL(MESH_Y_DIST);
+    const int8_t cy = (y - mesh_min.y) * RECIPROCAL(MESH_Y_DIST);
     return constrain(cy, 0, GRID_MAX_CELLS_Y - 1);
   }
   static xy_uint8_t cell_indexes(const float x, const float y) {
@@ -96,11 +93,11 @@ class mesh_bed_leveling {
   static xy_uint8_t cell_indexes(const xy_pos_t &xy) { return cell_indexes(xy.x, xy.y); }
 
   static int8_t probe_index_x(const float x) {
-    int8_t px = (x - mesh_min.x + 0.5f * (MESH_X_DIST)) * RECIPROCAL(MESH_X_DIST);
+    const int8_t px = (x - mesh_min.x + 0.5f * (MESH_X_DIST)) * RECIPROCAL(MESH_X_DIST);
     return WITHIN(px, 0, (GRID_MAX_POINTS_X) - 1) ? px : -1;
   }
   static int8_t probe_index_y(const float y) {
-    int8_t py = (y - mesh_min.y + 0.5f * (MESH_Y_DIST)) * RECIPROCAL(MESH_Y_DIST);
+    const int8_t py = (y - mesh_min.y + 0.5f * (MESH_Y_DIST)) * RECIPROCAL(MESH_Y_DIST);
     return WITHIN(py, 0, (GRID_MAX_POINTS_Y) - 1) ? py : -1;
   }
   static xy_int8_t probe_indexes(const float x, const float y) {

Marlin/src/feature/bedlevel/ubl/ubl.cpp

@@ -67,7 +67,7 @@ int8_t unified_bed_leveling::storage_slot;
 
 bed_mesh_t unified_bed_leveling::z_values;
 
-#if DISABLED(DWIN_LCD_PROUI)
+#if NONE(PROUI_EX, HAS_PROUI_MESH_EDIT, PROUI_GRID_PNTS)
   #define _GRIDPOS(A,N) (MESH_MIN_##A + N * (MESH_##A##_DIST))
 
   const float

Marlin/src/feature/bedlevel/ubl/ubl.h

@@ -38,9 +38,6 @@ enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP, CLOSEST };
 
 struct mesh_index_pair;
 
-#define MESH_X_DIST ((mesh_max.x - mesh_min.x) / (GRID_MAX_CELLS_X))
-#define MESH_Y_DIST ((mesh_max.y - mesh_min.y) / (GRID_MAX_CELLS_Y))
-
 #if ENABLED(OPTIMIZED_MESH_STORAGE)
   #if ANY(PROUI_EX, PROUI_GRID_PNTS)
     typedef int16_t mesh_store_t[GRID_LIMIT][GRID_LIMIT];
@@ -121,7 +118,7 @@ class unified_bed_leveling {
     static void set_mesh_from_store(const mesh_store_t &stored_values, bed_mesh_t &out_values);
   #endif
 
-  #if DISABLED(DWIN_LCD_PROUI)
+  #if NONE(PROUI_EX, HAS_PROUI_MESH_EDIT, PROUI_GRID_PNTS)
     static const float _mesh_index_to_xpos[GRID_MAX_POINTS_X],
                        _mesh_index_to_ypos[GRID_MAX_POINTS_Y];
   #endif
@@ -294,12 +291,12 @@ class unified_bed_leveling {
 
   static constexpr float get_z_offset() { return 0.0f; }
 
-  #if !ALL(PROUI_EX, PROUI_MESH_EDIT) || DISABLED(DWIN_LCD_PROUI)
+  #if !ALL(PROUI_EX, HAS_PROUI_MESH_EDIT) || DISABLED(DWIN_LCD_PROUI)
     static float _get_mesh_x(const uint8_t i) { return mesh_min.x + i * (MESH_X_DIST); }
     static float _get_mesh_y(const uint8_t j) { return mesh_min.y + j * (MESH_Y_DIST); }
   #endif
 
-  #if ALL(PROUI_EX, PROUI_MESH_EDIT)
+  #if ALL(PROUI_EX, HAS_PROUI_MESH_EDIT)
     static float get_mesh_x(const uint8_t i);
     static float get_mesh_y(const uint8_t j);
   #elif ENABLED(DWIN_LCD_PROUI)

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -799,7 +799,10 @@ void unified_bed_leveling::shift_mesh_height(const float zoffs) {
       DEBUG_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
       TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
       TERN_(HAS_BACKLIGHT_TIMEOUT, ui.refresh_backlight_timeout());
-      TERN_(DWIN_LCD_PROUI, if (!HMI_flag.cancel_lev) { DWIN_RedrawScreen(); } else { break; })
+
+      #if ENABLED(DWIN_LCD_PROUI)
+        if (!HMI_flag.cancel_lev) DWIN_RedrawScreen(); else break;
+      #endif
 
       #if HAS_MARLINUI_MENU
         if (ui.button_pressed()) {

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -821,6 +821,7 @@ G29_TYPE GcodeSuite::G29() {
 
           abl.reenable = false; // Don't re-enable after modifying the mesh
           marlin.idle_no_sleep();
+
           if (TERN0(DWIN_LCD_PROUI, HMI_flag.cancel_lev)) break;
 
         } // inner