Bläddra i källkod

Improve ASSISTED_TRAMMING_WIZARD probe stowing (#20437)

* When BLTOUCH_HS_MODE enabled, stow pin before user interaction
* For all probes, ensure probe stows at end of wizard
qwewer0 4 år sedan
förälder
incheckning
ea9b4dc82c
Inget konto är kopplat till bidragsgivarens mejladress
1 ändrade filer med 7 tillägg och 6 borttagningar
  1. 7
    6
      Marlin/src/lcd/menu/menu_tramming.cpp

+ 7
- 6
Marlin/src/lcd/menu/menu_tramming.cpp Visa fil

43
 static uint8_t tram_index = 0;
43
 static uint8_t tram_index = 0;
44
 
44
 
45
 bool probe_single_point() {
45
 bool probe_single_point() {
46
-  // In BLTOUCH HS mode, the probe travels in a deployed state.
47
-  // Users of Tramming Wizard might have a badly misaligned bed, so raise Z by the
48
-  // length of the deployed pin (BLTOUCH stroke < 7mm)
49
-  do_blocking_move_to_z((Z_CLEARANCE_BETWEEN_PROBES) + TERN0(BLTOUCH_HS_MODE, 7));
50
-  const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true);
46
+  do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
47
+  //Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
48
+  const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
51
   DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm");
49
   DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm");
52
   z_measured[tram_index] = z_probed_height;
50
   z_measured[tram_index] = z_probed_height;
53
 
51
 
81
   LOOP_L_N(i, G35_PROBE_COUNT)
79
   LOOP_L_N(i, G35_PROBE_COUNT)
82
     SUBMENU_N_P(i, (char*)pgm_read_ptr(&tramming_point_name[i]), []{ _menu_single_probe(MenuItemBase::itemIndex); });
80
     SUBMENU_N_P(i, (char*)pgm_read_ptr(&tramming_point_name[i]), []{ _menu_single_probe(MenuItemBase::itemIndex); });
83
 
81
 
84
-  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen_no_defer(); });
82
+  ACTION_ITEM(MSG_BUTTON_DONE, []{
83
+    probe.stow(); // Stow before exiting Tramming Wizard
84
+    ui.goto_previous_screen_no_defer();
85
+    });
85
   END_MENU();
86
   END_MENU();
86
 }
87
 }
87
 
88
 

Laddar…
Avbryt
Spara