Browse Source

🧑‍💻 Fix UBL Build Mesh preheat items (#24598)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Keith Bennett 2 years ago
parent
commit
637bff9982
No account linked to committer's email address
1 changed files with 3 additions and 19 deletions
  1. 3
    19
      Marlin/src/lcd/menu/menu_ubl.cpp

+ 3
- 19
Marlin/src/lcd/menu/menu_ubl.cpp View File

@@ -312,11 +312,7 @@ void _lcd_ubl_build_mesh() {
312 312
   START_MENU();
313 313
   BACK_ITEM(MSG_UBL_TOOLS);
314 314
   #if HAS_PREHEAT
315
-    #if HAS_HEATED_BED
316
-      #define PREHEAT_BED_GCODE(M) "M190I" STRINGIFY(M) "\n"
317
-    #else
318
-      #define PREHEAT_BED_GCODE(M) ""
319
-    #endif
315
+    #define PREHEAT_BED_GCODE(M) TERN(HAS_HEATED_BED, "M190I" STRINGIFY(M) "\n", "")
320 316
     #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_f(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
321 317
       F( \
322 318
         "G28\n" \
@@ -325,20 +321,8 @@ void _lcd_ubl_build_mesh() {
325 321
         "G29P1\n" \
326 322
         "M104S0\n" \
327 323
         "M140S0" \
328
-      ) )
329
-    BUILD_MESH_GCODE_ITEM(0);
330
-    #if PREHEAT_COUNT > 1
331
-      BUILD_MESH_GCODE_ITEM(1);
332
-      #if PREHEAT_COUNT > 2
333
-        BUILD_MESH_GCODE_ITEM(2);
334
-        #if PREHEAT_COUNT > 3
335
-          BUILD_MESH_GCODE_ITEM(3);
336
-          #if PREHEAT_COUNT > 4
337
-            BUILD_MESH_GCODE_ITEM(4);
338
-          #endif
339
-        #endif
340
-      #endif
341
-    #endif
324
+      ) );
325
+    REPEAT(PREHEAT_COUNT, BUILD_MESH_GCODE_ITEM)
342 326
   #endif // HAS_PREHEAT
343 327
 
344 328
   SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);

Loading…
Cancel
Save