CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configuring the probe safe position

Browse Source
This commit is contained in:
Brian Kahl 2021-09-13 11:46:28 -05:00
parent 6f493092a7
commit b6ca15efd1
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Configuration.h
View File

@ -1570,6 +1570,20 @@
#define PROBING_MARGIN -9
#endif
#endif
//Defining a safe position to probe for M48 and PROBE_OFFSET_WIZARD
#if ANY(Sidekick_289, Sidekick_747)
#define PROBE_SAFE_POINT { X_CENTER, Y_CENTER }
#elif ENABLED(MiniV2)
#define PROBE_SAFE_POINT { -4, -4 }
#elif ENABLED(TAZ6)
#define PROBE_SAFE_POINT { -8, -8 }
#elif ENABLED(Workhorse)
#define PROBE_SAFE_POINT { -10, -10 }
#elif ANY(TAZPro, TAZProXT)
#define PROBE_SAFE_POINT { -9, -9 }
#endif
// X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_FEEDRATE (200*60)

10
Marlin/Configuration_adv.h
View File

@ -1272,15 +1272,7 @@
#define PROBE_OFFSET_WIZARD_START_Z 1.0
// Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
#if ANY(Sidekick_289, Sidekick_747)
#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
#elif ENABLED(MiniV2)
#define PROBE_OFFSET_WIZARD_XY_POS { -4, -4 }
#elif ENABLED(TAZ6)
#define PROBE_OFFSET_WIZARD_XY_POS { -8, -8 }
#elif ENABLED(Workhorse)
#define PROBE_OFFSET_WIZARD_XY_POS { -10, -10 }
#endif
#define PROBE_OFFSET_WIZARD_XY_POS PROBE_SAFE_POINT
#endif
#endif

16
Marlin/src/gcode/calibrate/M48.cpp
View File

@ -28,6 +28,7 @@
#include "../../module/motion.h"
#include "../../module/probe.h"
#include "../../lcd/marlinui.h"
#include "../../../Configuration_adv.h"
#include "../../feature/bedlevel/bedlevel.h"
@ -72,19 +73,8 @@ void GcodeSuite::M48() {
const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
//setting tool head location to be above the front left washer if the printer uses nozzle as probe
#if ANY(Sidekick_289, Sidekick_747)
#define PROBE_OFFSET_XY_POS { X_CENTER, Y_CENTER } //place center to keep nozzle away from the edge of the bed
#elif ENABLED(MiniV2)
#define PROBE_OFFSET_XY_POS { -4, -4 }
#elif ENABLED(TAZ6)
#define PROBE_OFFSET_XY_POS { -8, -8 }
#elif ENABLED(Workhorse)
#define PROBE_OFFSET_XY_POS { -10, -10 }
#endif
constexpr xy_pos_t probe_point = PROBE_OFFSET_XY_POS;
do_blocking_move_to_xy(probe_point); //moving toolhead to probe point
constexpr xy_pos_t probe_point = PROBE_SAFE_POINT;
do_blocking_move_to_xy(probe_point); //moving toolhead to a safe probing point
// Test at the current position by default, overridden by X and Y
const xy_pos_t test_position = {