3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tweaks to run independent of auto stepper align for probeless machines

Browse source
This commit is contained in:
InsanityAutomation 2020-11-10 11:09:57 -05:00
parent 27cc75b95c
commit c5846f400e
4 changed files with 344 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/gcode/calibrate/G34_M422.cpp
View file

@ -22,7 +22,7 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(Z_STEPPER_AUTO_ALIGN) #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
#include "../../feature/z_stepper_align.h" #include "../../feature/z_stepper_align.h"
@ -101,6 +101,7 @@ void GcodeSuite::G34() {
return; return;
} }
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
do { // break out on error do { // break out on error
#if NUM_Z_STEPPER_DRIVERS == 4 #if NUM_Z_STEPPER_DRIVERS == 4
@ -448,7 +449,11 @@ void GcodeSuite::G34() {
#endif #endif
}while(0); }while(0);
#endif
} }
#endif // END Z_MULTI_ENDSTOPS or Z_STEPPER_AUTO_ALIGN
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
/** /**
* M422: Set a Z-Stepper automatic alignment XY point. * M422: Set a Z-Stepper automatic alignment XY point.

2
Marlin/src/gcode/gcode.cpp
View file

@ -327,7 +327,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 33: G33(); break; // G33: Delta Auto-Calibration case 33: G33(); break; // G33: Delta Auto-Calibration
#endif #endif
#if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION) #if ANY(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
case 34: G34(); break; // G34: Z Stepper automatic alignment using probe case 34: G34(); break; // G34: Z Stepper automatic alignment using probe
#endif #endif

2
Marlin/src/gcode/gcode.h
View file

@ -468,7 +468,7 @@ private:
TERN_(DELTA_AUTO_CALIBRATION, static void G33()); TERN_(DELTA_AUTO_CALIBRATION, static void G33());
#if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION) #if ANY(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
static void G34(); static void G34();
#endif #endif

3
platformio.ini
View file

@ -316,7 +316,8 @@ EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+<src/feature/solenoid.cpp> +<
HAS_CUTTER = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp> HAS_CUTTER = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
EXPERIMENTAL_I2CBUS = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c> EXPERIMENTAL_I2CBUS = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
MECHANICAL_GANTRY_CAL.+ = src_filter=+<src/gcode/calibrate/G34.cpp> MECHANICAL_GANTRY_CAL.+ = src_filter=+<src/gcode/calibrate/G34.cpp>
Z_STEPPER_AUTO_ALIGN = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp> Z_MULTI_ENDSTOPS | Z_STEPPER_AUTO_ALIGN = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
Z_STEPPER_AUTO_ALIGN = src_filter=+<src/feature/z_stepper_align.cpp>
G26_MESH_VALIDATION = src_filter=+<src/gcode/bedlevel/G26.cpp> G26_MESH_VALIDATION = src_filter=+<src/gcode/bedlevel/G26.cpp>
ASSISTED_TRAMMING = src_filter=+<src/gcode/bedlevel/G35.cpp> ASSISTED_TRAMMING = src_filter=+<src/gcode/bedlevel/G35.cpp>
HAS_MESH = src_filter=+<src/gcode/bedlevel/G42.cpp> HAS_MESH = src_filter=+<src/gcode/bedlevel/G42.cpp>