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

[2.0] Fix M48 for delta printers/ABL compile issue (#8286)

Browse Source 
* fix M48 for delta printers

fix M48 for delta printers. home printer if not already homed.

* remove ENABLED(DELTA)

remove ENABLED(DELTA) as it is not needed.

* Update M48.cpp

* abl needs queue.h

without queue.h abl will not compile since there is a script that runs at the end of it and we need to queue it up.
This commit is contained in:
Colten Edwards 2017-11-07 15:36:33 -06:00 committed by Scott Lahteine
parent 776cb52629
commit a6160916b0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include "../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../module/stepper.h" #include "../../../module/stepper.h"
#include "../../../module/probe.h" #include "../../../module/probe.h"
#include "../../queue.h"
#if ENABLED(LCD_BED_LEVELING) && ENABLED(PROBE_MANUALLY) #if ENABLED(LCD_BED_LEVELING) && ENABLED(PROBE_MANUALLY)
#include "../../../lcd/ultralcd.h" #include "../../../lcd/ultralcd.h"
@ -344,7 +345,7 @@ void GcodeSuite::G29() {
right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : RIGHT_PROBE_BED_POSITION; right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : RIGHT_PROBE_BED_POSITION;
front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION; front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION; back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
const bool left_out_l = left_probe_bed_position < MIN_PROBE_X, const bool left_out_l = left_probe_bed_position < MIN_PROBE_X,
left_out = left_out_l || left_probe_bed_position > right_probe_bed_position - (MIN_PROBE_EDGE), left_out = left_out_l || left_probe_bed_position > right_probe_bed_position - (MIN_PROBE_EDGE),
right_out_r = right_probe_bed_position > MAX_PROBE_X, right_out_r = right_probe_bed_position > MAX_PROBE_X,

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

@ -28,9 +28,9 @@
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../module/probe.h" #include "../../module/probe.h"
#if DISABLED(DELTA)
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"
#endif
#if HAS_LEVELING #if HAS_LEVELING
#include "../../module/planner.h" #include "../../module/planner.h"
@ -49,10 +49,7 @@
* L = Number of legs of movement before probe * L = Number of legs of movement before probe
* S = Schizoid (Or Star if you prefer) * S = Schizoid (Or Star if you prefer)
* *
* This function assumes the bed has been homed. Specifically, that a G28 command * This function requires the machine to be homed before invocation.
* as been issued prior to invoking the M48 Z probe repeatability measurement function.
* Any information generated by a prior G29 Bed leveling command will be lost and need to be
* regenerated.
*/ */
void GcodeSuite::M48() { void GcodeSuite::M48() {