Przeglądaj źródła

Z-offset edit precision based on value limits (#16425)

InsanityAutomation 4 lat temu
rodzic
commit
d129ac1b37

+ 2
- 2
Marlin/src/lcd/menu/menu.cpp Wyświetl plik

@@ -429,10 +429,10 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
429 429
     if (ui.should_draw()) {
430 430
       #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
431 431
         if (!do_probe)
432
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr43sign(hotend_offset[active_extruder].z));
432
+          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), LCD_Z_OFFSET_FUNC(hotend_offset[active_extruder].z));
433 433
         else
434 434
       #endif
435
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), ftostr43sign(probe_offset.z));
435
+          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe_offset.z));
436 436
 
437 437
       #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
438 438
         if (do_probe) _lcd_zoffset_overlay_gfx(probe_offset.z);

+ 8
- 0
Marlin/src/lcd/menu/menu.h Wyświetl plik

@@ -47,6 +47,14 @@ typedef void (*selectFunc_t)();
47 47
   void _lcd_zoffset_overlay_gfx(const float zvalue);
48 48
 #endif
49 49
 
50
+#if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
51
+  #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
52
+  #define LCD_Z_OFFSET_TYPE float43
53
+#else
54
+  #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
55
+  #define LCD_Z_OFFSET_TYPE float52
56
+#endif
57
+
50 58
 ////////////////////////////////////////////
51 59
 ///////////// Base Menu Items //////////////
52 60
 ////////////////////////////////////////////

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp Wyświetl plik

@@ -281,7 +281,7 @@ void menu_bed_leveling() {
281 281
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
282 282
     SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
283 283
   #elif HAS_BED_PROBE
284
-    EDIT_ITEM(float52, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
284
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
285 285
   #endif
286 286
 
287 287
   #if ENABLED(LEVEL_BED_CORNERS)

+ 1
- 1
Marlin/src/lcd/menu/menu_configuration.cpp Wyświetl plik

@@ -317,7 +317,7 @@ void menu_configuration() {
317 317
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
318 318
     SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
319 319
   #elif HAS_BED_PROBE
320
-    EDIT_ITEM(float52, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
320
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
321 321
   #endif
322 322
 
323 323
   const bool busy = printer_busy();

+ 2
- 2
Marlin/src/lcd/menu/menu_tune.cpp Wyświetl plik

@@ -65,7 +65,7 @@
65 65
     }
66 66
     if (ui.should_draw()) {
67 67
       const float spm = planner.steps_to_mm[axis];
68
-      MenuEditItemBase::draw_edit_screen(msg, ftostr54sign(spm * babystep.accum));
68
+      MenuEditItemBase::draw_edit_screen(msg, LCD_Z_OFFSET_FUNC(spm * babystep.accum));
69 69
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
70 70
         const bool in_view = (true
71 71
           #if HAS_GRAPHICAL_LCD
@@ -81,7 +81,7 @@
81 81
           #endif
82 82
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
83 83
           lcd_put_wchar(':');
84
-          lcd_put_u8str(ftostr54sign(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)]));
84
+          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)]));
85 85
         }
86 86
       #endif
87 87
     }

Ładowanie…
Anuluj
Zapisz