Sfoglia il codice sorgente

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

* 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.
Colten Edwards 7 anni fa
parent
commit
a6160916b0

+ 2
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp Vedi File

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

+ 4
- 7
Marlin/src/gcode/calibrate/M48.cpp Vedi File

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

Loading…
Annulla
Salva