bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Consolidate probe clearance, add section debug (#18576)

Browse Source 
* Better section / function log
* Add do_z_clearance motion function
This commit is contained in:
Scott Lahteine
2020-07-08 21:44:21 -05:00
committed by GitHub
parent 0eab9fc08c
commit 73fc0778b8
18 changed files with 132 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -622,8 +622,7 @@ void GcodeSuite::G26() {
*/
set_bed_leveling_enabled(!parser.seen('D'));
if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES)
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
do_z_clearance(Z_CLEARANCE_BETWEEN_PROBES);
#if DISABLED(NO_VOLUMETRICS)
bool volumetric_was_enabled = parser.volumetric_enabled;

9
Marlin/src/gcode/bedlevel/G35.cpp
View File

@ -75,10 +75,9 @@ static_assert(G35_PROBE_COUNT > 2, "TRAMMING_POINT_XY requires at least 3 XY pos
* 51 - Counter-Clockwise M5
**/
void GcodeSuite::G35() {
if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPGM(">>> G35");
log_machine_info();
}
DEBUG_SECTION(log_G35, "G35", DEBUGGING(LEVELING));
if (DEBUGGING(LEVELING)) log_machine_info();
float z_measured[G35_PROBE_COUNT] = { 0 };
@ -181,8 +180,6 @@ void GcodeSuite::G35() {
// Home Z after the alignment procedure
process_subcommands_now_P(PSTR("G28Z"));
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G35");
}
#endif // ASSISTED_TRAMMING

14
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@ -172,10 +172,8 @@ G29_TYPE GcodeSuite::G29() {
#if ENABLED(DEBUG_LEVELING_FEATURE)
const uint8_t old_debug_flags = marlin_debug_flags;
if (seenQ) marlin_debug_flags |= MARLIN_DEBUG_LEVELING;
if (DEBUGGING(LEVELING)) {
DEBUG_POS(">>> G29", current_position);
log_machine_info();
}
DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
if (DEBUGGING(LEVELING)) log_machine_info();
marlin_debug_flags = old_debug_flags;
if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
#endif
@ -188,7 +186,7 @@ G29_TYPE GcodeSuite::G29() {
if (axis_unhomed_error()) G29_RETURN(false);
if (!no_action && planner.leveling_active && parser.boolval('O')) { // Auto-level only if needed
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Auto-level not needed, skip\n<<< G29");
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Auto-level not needed, skip");
G29_RETURN(false);
}
@ -416,7 +414,7 @@ G29_TYPE GcodeSuite::G29() {
// Deploy certain probes before starting probing
#if HAS_BED_PROBE
if (ENABLED(BLTOUCH))
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE);
else if (probe.deploy()) {
set_bed_leveling_enabled(abl_should_enable);
G29_RETURN(false);
@ -884,7 +882,7 @@ G29_TYPE GcodeSuite::G29() {
// Sync the planner from the current_position
if (planner.leveling_active) sync_plan_position();
#if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
#if HAS_BED_PROBE
probe.move_z_after_probing();
#endif
@ -900,8 +898,6 @@ G29_TYPE GcodeSuite::G29() {
report_current_position();
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
G29_RETURN(isnan(measured_z));
}