|
@@ -3800,6 +3800,10 @@ void home_all_axes() { gcode_G28(true); }
|
3800
|
3800
|
|
3801
|
3801
|
#if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY)
|
3802
|
3802
|
|
|
3803
|
+ #if ENABLED(PROBE_MANUALLY) && ENABLED(LCD_BED_LEVELING)
|
|
3804
|
+ extern bool lcd_wait_for_move;
|
|
3805
|
+ #endif
|
|
3806
|
+
|
3803
|
3807
|
inline void _manual_goto_xy(const float &x, const float &y) {
|
3804
|
3808
|
const float old_feedrate_mm_s = feedrate_mm_s;
|
3805
|
3809
|
|
|
@@ -3822,6 +3826,10 @@ void home_all_axes() { gcode_G28(true); }
|
3822
|
3826
|
|
3823
|
3827
|
feedrate_mm_s = old_feedrate_mm_s;
|
3824
|
3828
|
stepper.synchronize();
|
|
3829
|
+
|
|
3830
|
+ #if ENABLED(PROBE_MANUALLY) && ENABLED(LCD_BED_LEVELING)
|
|
3831
|
+ lcd_wait_for_move = false;
|
|
3832
|
+ #endif
|
3825
|
3833
|
}
|
3826
|
3834
|
|
3827
|
3835
|
#endif
|
|
@@ -4414,16 +4422,20 @@ void home_all_axes() { gcode_G28(true); }
|
4414
|
4422
|
#endif
|
4415
|
4423
|
planner.abl_enabled = abl_should_enable;
|
4416
|
4424
|
g29_in_progress = false;
|
|
4425
|
+ #if ENABLED(LCD_BED_LEVELING)
|
|
4426
|
+ lcd_wait_for_move = false;
|
|
4427
|
+ #endif
|
4417
|
4428
|
}
|
4418
|
4429
|
|
4419
|
4430
|
// Query G29 status
|
4420
|
4431
|
if (verbose_level || seenQ) {
|
4421
|
|
- if (!g29_in_progress)
|
4422
|
|
- SERIAL_PROTOCOLLNPGM("Manual G29 idle");
|
4423
|
|
- else {
|
4424
|
|
- SERIAL_PROTOCOLPAIR("Manual G29 point ", abl_probe_index + 1);
|
|
4432
|
+ SERIAL_PROTOCOLPGM("Manual G29 ");
|
|
4433
|
+ if (g29_in_progress) {
|
|
4434
|
+ SERIAL_PROTOCOLPAIR("point ", abl_probe_index + 1);
|
4425
|
4435
|
SERIAL_PROTOCOLLNPAIR(" of ", abl2);
|
4426
|
4436
|
}
|
|
4437
|
+ else
|
|
4438
|
+ SERIAL_PROTOCOLLNPGM("idle");
|
4427
|
4439
|
}
|
4428
|
4440
|
|
4429
|
4441
|
if (seenA || seenQ) return;
|
|
@@ -4681,6 +4693,10 @@ void home_all_axes() { gcode_G28(true); }
|
4681
|
4693
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> probing complete", current_position);
|
4682
|
4694
|
#endif
|
4683
|
4695
|
|
|
4696
|
+ #if ENABLED(PROBE_MANUALLY) && ENABLED(LCD_BED_LEVELING)
|
|
4697
|
+ lcd_wait_for_move = false;
|
|
4698
|
+ #endif
|
|
4699
|
+
|
4684
|
4700
|
// Calculate leveling, print reports, correct the position
|
4685
|
4701
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
4686
|
4702
|
|