Consolidate probe clearance, add section debug (#18576)
* Better section / function log * Add do_z_clearance motion function
This commit is contained in:
		@@ -26,6 +26,7 @@
 | 
			
		||||
//  (or not) in a given .cpp file
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
#undef DEBUG_SECTION
 | 
			
		||||
#undef DEBUG_PRINT_P
 | 
			
		||||
#undef DEBUG_ECHO_START
 | 
			
		||||
#undef DEBUG_ERROR_START
 | 
			
		||||
@@ -53,6 +54,10 @@
 | 
			
		||||
#undef DEBUG_DELAY
 | 
			
		||||
 | 
			
		||||
#if DEBUG_OUT
 | 
			
		||||
 | 
			
		||||
  #include "debug_section.h"
 | 
			
		||||
  #define DEBUG_SECTION(N,S,D)    SectionLog N(PSTR(S),D)
 | 
			
		||||
 | 
			
		||||
  #define DEBUG_PRINT_P(P)        serialprintPGM(P)
 | 
			
		||||
  #define DEBUG_ECHO_START        SERIAL_ECHO_START
 | 
			
		||||
  #define DEBUG_ERROR_START       SERIAL_ERROR_START
 | 
			
		||||
@@ -78,7 +83,10 @@
 | 
			
		||||
  #define DEBUG_POS               SERIAL_POS
 | 
			
		||||
  #define DEBUG_XYZ               SERIAL_XYZ
 | 
			
		||||
  #define DEBUG_DELAY(ms)         serial_delay(ms)
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
  #define DEBUG_SECTION(...)        NOOP
 | 
			
		||||
  #define DEBUG_PRINT_P(P)          NOOP
 | 
			
		||||
  #define DEBUG_ECHO_START()        NOOP
 | 
			
		||||
  #define DEBUG_ERROR_START()       NOOP
 | 
			
		||||
@@ -104,6 +112,7 @@
 | 
			
		||||
  #define DEBUG_POS(...)            NOOP
 | 
			
		||||
  #define DEBUG_XYZ(...)            NOOP
 | 
			
		||||
  #define DEBUG_DELAY(...)          NOOP
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#undef DEBUG_OUT
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										49
									
								
								Marlin/src/core/debug_section.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								Marlin/src/core/debug_section.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,49 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Marlin 3D Printer Firmware
 | 
			
		||||
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 | 
			
		||||
 *
 | 
			
		||||
 * Based on Sprinter and grbl.
 | 
			
		||||
 * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
 | 
			
		||||
 *
 | 
			
		||||
 * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
 * it under the terms of the GNU General Public License as published by
 | 
			
		||||
 * the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
 * (at your option) any later version.
 | 
			
		||||
 *
 | 
			
		||||
 * This program is distributed in the hope that it will be useful,
 | 
			
		||||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
 * GNU General Public License for more details.
 | 
			
		||||
 *
 | 
			
		||||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "serial.h"
 | 
			
		||||
#include "../module/motion.h"
 | 
			
		||||
 | 
			
		||||
class SectionLog {
 | 
			
		||||
public:
 | 
			
		||||
  SectionLog(PGM_P const msg=nullptr, bool inbug=true) {
 | 
			
		||||
    the_msg = msg;
 | 
			
		||||
    if ((debug = inbug)) echo_msg(PSTR(">>>"));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  ~SectionLog() { if (debug) echo_msg(PSTR("<<<")); }
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
  PGM_P the_msg;
 | 
			
		||||
  bool debug;
 | 
			
		||||
 | 
			
		||||
  void echo_msg(PGM_P const pre) {
 | 
			
		||||
    serialprintPGM(pre);
 | 
			
		||||
    if (the_msg) {
 | 
			
		||||
      SERIAL_CHAR(' ');
 | 
			
		||||
      serialprintPGM(the_msg);
 | 
			
		||||
    }
 | 
			
		||||
    SERIAL_CHAR(' ');
 | 
			
		||||
    print_xyz(current_position);
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
		Reference in New Issue
	
	Block a user