Speaka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
0 deletions
-
Marlin/Configuration_adv.h
-
Marlin/src/lcd/menu/menu_tramming.cpp
|
@ -811,6 +811,7 @@ |
|
|
|
|
|
|
|
|
//#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item to run G35 Assisted Tramming (MarlinUI)
|
|
|
//#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item to run G35 Assisted Tramming (MarlinUI)
|
|
|
//#define ASSISTED_TRAMMING_WIZARD // Make the menu item open a Tramming Wizard sub-menu
|
|
|
//#define ASSISTED_TRAMMING_WIZARD // Make the menu item open a Tramming Wizard sub-menu
|
|
|
|
|
|
//#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment
|
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* Screw thread: |
|
|
* Screw thread: |
|
|
|
@ -50,6 +50,14 @@ bool probe_single_point() { |
|
|
const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true); |
|
|
const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true); |
|
|
DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm"); |
|
|
DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm"); |
|
|
z_measured[tram_index] = z_probed_height; |
|
|
z_measured[tram_index] = z_probed_height; |
|
|
|
|
|
|
|
|
|
|
|
#ifdef ASSISTED_TRAMMING_WAIT_POSITION |
|
|
|
|
|
// Move XY to safe position
|
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Moving away"); |
|
|
|
|
|
const xyz_pos_t wait_pos = ASSISTED_TRAMMING_WAIT_POSITION; |
|
|
|
|
|
do_blocking_move_to(wait_pos, XY_PROBE_FEEDRATE_MM_S); |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
return !isnan(z_probed_height); |
|
|
return !isnan(z_probed_height); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|