|
@@ -260,12 +260,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
|
260
|
260
|
switch (parser.command_letter) {
|
261
|
261
|
case 'G': switch (parser.codenum) {
|
262
|
262
|
|
263
|
|
- case 0: case 1: G0_G1( // G0: Fast Move, G1: Linear Move
|
264
|
|
- #if IS_SCARA || defined(G0_FEEDRATE)
|
265
|
|
- parser.codenum == 0
|
266
|
|
- #endif
|
267
|
|
- );
|
268
|
|
- break;
|
|
263
|
+ case 0: case 1: // G0: Fast Move, G1: Linear Move
|
|
264
|
+ G0_G1(TERN_(HAS_FAST_MOVES, parser.codenum == 0)); break;
|
269
|
265
|
|
270
|
266
|
#if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
|
271
|
267
|
case 2: case 3: G2_G3(parser.codenum == 2); break; // G2: CW ARC, G3: CCW ARC
|
|
@@ -315,13 +311,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
|
315
|
311
|
|
316
|
312
|
#if HAS_LEVELING
|
317
|
313
|
case 29: // G29: Bed leveling calibration
|
318
|
|
- #if ENABLED(G29_RETRY_AND_RECOVER)
|
319
|
|
- G29_with_retry();
|
320
|
|
- #else
|
321
|
|
- G29();
|
322
|
|
- #endif
|
|
314
|
+ TERN(G29_RETRY_AND_RECOVER, G29_with_retry, G29)();
|
323
|
315
|
break;
|
324
|
|
- #endif // HAS_LEVELING
|
|
316
|
+ #endif
|
325
|
317
|
|
326
|
318
|
#if HAS_BED_PROBE
|
327
|
319
|
case 30: G30(); break; // G30: Single Z probe
|