|
@@ -4134,8 +4134,14 @@ void home_all_axes() { gcode_G28(true); }
|
4134
|
4134
|
#endif
|
4135
|
4135
|
#endif
|
4136
|
4136
|
|
|
4137
|
+ #if ENABLED(PROBE_MANUALLY)
|
|
4138
|
+ const bool seenA = parser.seen('A'), seenQ = parser.seen('Q'), no_action = seenA || seenQ;
|
|
4139
|
+ #endif
|
|
4140
|
+
|
4137
|
4141
|
#if ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(PROBE_MANUALLY)
|
4138
|
4142
|
const bool faux = parser.seen('C') && parser.value_bool();
|
|
4143
|
+ #elif ENABLED(PROBE_MANUALLY)
|
|
4144
|
+ const bool faux = no_action;
|
4139
|
4145
|
#else
|
4140
|
4146
|
bool constexpr faux = false;
|
4141
|
4147
|
#endif
|
|
@@ -4281,7 +4287,11 @@ void home_all_axes() { gcode_G28(true); }
|
4281
|
4287
|
return;
|
4282
|
4288
|
}
|
4283
|
4289
|
|
4284
|
|
- dryrun = parser.seen('D') && parser.value_bool();
|
|
4290
|
+ dryrun = (parser.seen('D') && parser.value_bool())
|
|
4291
|
+ #if ENABLED(PROBE_MANUALLY)
|
|
4292
|
+ || no_action
|
|
4293
|
+ #endif
|
|
4294
|
+ ;
|
4285
|
4295
|
|
4286
|
4296
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
|
4287
|
4297
|
|
|
@@ -4426,16 +4436,14 @@ void home_all_axes() { gcode_G28(true); }
|
4426
|
4436
|
|
4427
|
4437
|
#if ENABLED(PROBE_MANUALLY)
|
4428
|
4438
|
|
4429
|
|
- const bool seenA = parser.seen('A'), seenQ = parser.seen('Q');
|
4430
|
|
-
|
4431
|
4439
|
// For manual probing, get the next index to probe now.
|
4432
|
4440
|
// On the first probe this will be incremented to 0.
|
4433
|
|
- if (!seenA && !seenQ) {
|
|
4441
|
+ if (!no_action) {
|
4434
|
4442
|
++abl_probe_index;
|
4435
|
4443
|
g29_in_progress = true;
|
4436
|
4444
|
}
|
4437
|
4445
|
|
4438
|
|
- // Abort current G29 procedure, go back to ABLStart
|
|
4446
|
+ // Abort current G29 procedure, go back to idle state
|
4439
|
4447
|
if (seenA && g29_in_progress) {
|
4440
|
4448
|
SERIAL_PROTOCOLLNPGM("Manual G29 aborted");
|
4441
|
4449
|
#if HAS_SOFTWARE_ENDSTOPS
|
|
@@ -4459,7 +4467,7 @@ void home_all_axes() { gcode_G28(true); }
|
4459
|
4467
|
SERIAL_PROTOCOLLNPGM("idle");
|
4460
|
4468
|
}
|
4461
|
4469
|
|
4462
|
|
- if (seenA || seenQ) return;
|
|
4470
|
+ if (no_action) return;
|
4463
|
4471
|
|
4464
|
4472
|
if (abl_probe_index == 0) {
|
4465
|
4473
|
// For the initial G29 save software endstop state
|
|
@@ -4484,6 +4492,14 @@ void home_all_axes() { gcode_G28(true); }
|
4484
|
4492
|
|
4485
|
4493
|
z_values[xCount][yCount] = measured_z + zoffset;
|
4486
|
4494
|
|
|
4495
|
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
4496
|
+ if (DEBUGGING(LEVELING)) {
|
|
4497
|
+ SERIAL_PROTOCOLPAIR("Save X", xCount);
|
|
4498
|
+ SERIAL_PROTOCOLPAIR(" Y", yCount);
|
|
4499
|
+ SERIAL_PROTOCOLLNPAIR(" Z", measured_z + zoffset);
|
|
4500
|
+ }
|
|
4501
|
+ #endif
|
|
4502
|
+
|
4487
|
4503
|
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
4488
|
4504
|
|
4489
|
4505
|
points[i].z = measured_z;
|