MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch G29 A and Q arguments to bypass setup

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-29 16:00:57 -05:00
parent 4cece2d72e
commit c6a7adc293
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Marlin/Marlin_main.cpp
View File

@ -4134,8 +4134,14 @@ void home_all_axes() { gcode_G28(true); }
#endif #endif
#endif #endif
#if ENABLED(PROBE_MANUALLY)
const bool seenA = parser.seen('A'), seenQ = parser.seen('Q'), no_action = seenA || seenQ;
#endif
#if ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(PROBE_MANUALLY) #if ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(PROBE_MANUALLY)
const bool faux = parser.seen('C') && parser.value_bool(); const bool faux = parser.seen('C') && parser.value_bool();
#elif ENABLED(PROBE_MANUALLY)
const bool faux = no_action;
#else #else
bool constexpr faux = false; bool constexpr faux = false;
#endif #endif
@ -4281,7 +4287,11 @@ void home_all_axes() { gcode_G28(true); }
return; return;
} }
dryrun = parser.seen('D') && parser.value_bool(); dryrun = (parser.seen('D') && parser.value_bool())
#if ENABLED(PROBE_MANUALLY)
|| no_action
#endif
;
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR)
@ -4426,16 +4436,14 @@ void home_all_axes() { gcode_G28(true); }
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
const bool seenA = parser.seen('A'), seenQ = parser.seen('Q');
// For manual probing, get the next index to probe now. // For manual probing, get the next index to probe now.
// On the first probe this will be incremented to 0. // On the first probe this will be incremented to 0.
if (!seenA && !seenQ) { if (!no_action) {
++abl_probe_index; ++abl_probe_index;
g29_in_progress = true; g29_in_progress = true;
} }
// Abort current G29 procedure, go back to ABLStart // Abort current G29 procedure, go back to idle state
if (seenA && g29_in_progress) { if (seenA && g29_in_progress) {
SERIAL_PROTOCOLLNPGM("Manual G29 aborted"); SERIAL_PROTOCOLLNPGM("Manual G29 aborted");
#if HAS_SOFTWARE_ENDSTOPS #if HAS_SOFTWARE_ENDSTOPS
@ -4459,7 +4467,7 @@ void home_all_axes() { gcode_G28(true); }
SERIAL_PROTOCOLLNPGM("idle"); SERIAL_PROTOCOLLNPGM("idle");
} }
if (seenA || seenQ) return; if (no_action) return;
if (abl_probe_index == 0) { if (abl_probe_index == 0) {
// For the initial G29 save software endstop state // For the initial G29 save software endstop state
@ -4484,6 +4492,14 @@ void home_all_axes() { gcode_G28(true); }
z_values[xCount][yCount] = measured_z + zoffset; z_values[xCount][yCount] = measured_z + zoffset;
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) {
SERIAL_PROTOCOLPAIR("Save X", xCount);
SERIAL_PROTOCOLPAIR(" Y", yCount);
SERIAL_PROTOCOLLNPAIR(" Z", measured_z + zoffset);
}
#endif
#elif ENABLED(AUTO_BED_LEVELING_3POINT) #elif ENABLED(AUTO_BED_LEVELING_3POINT)
points[i].z = measured_z; points[i].z = measured_z;