Add HAS_FAST_MOVES
This commit is contained in:
parent
d99fdcf526
commit
fb7d7ee7b4
|
@ -260,12 +260,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
|
|||
switch (parser.command_letter) {
|
||||
case 'G': switch (parser.codenum) {
|
||||
|
||||
case 0: case 1: G0_G1( // G0: Fast Move, G1: Linear Move
|
||||
#if IS_SCARA || defined(G0_FEEDRATE)
|
||||
parser.codenum == 0
|
||||
#endif
|
||||
);
|
||||
break;
|
||||
case 0: case 1: // G0: Fast Move, G1: Linear Move
|
||||
G0_G1(TERN_(HAS_FAST_MOVES, parser.codenum == 0)); break;
|
||||
|
||||
#if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
|
||||
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*/) {
|
|||
|
||||
#if HAS_LEVELING
|
||||
case 29: // G29: Bed leveling calibration
|
||||
#if ENABLED(G29_RETRY_AND_RECOVER)
|
||||
G29_with_retry();
|
||||
#else
|
||||
G29();
|
||||
#endif
|
||||
TERN(G29_RETRY_AND_RECOVER, G29_with_retry, G29)();
|
||||
break;
|
||||
#endif // HAS_LEVELING
|
||||
#endif
|
||||
|
||||
#if HAS_BED_PROBE
|
||||
case 30: G30(); break; // G30: Single Z probe
|
||||
|
|
|
@ -298,6 +298,10 @@
|
|||
#include "../feature/encoder_i2c.h"
|
||||
#endif
|
||||
|
||||
#if IS_SCARA || defined(G0_FEEDRATE)
|
||||
#define HAS_FAST_MOVES 1
|
||||
#endif
|
||||
|
||||
enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
|
||||
|
||||
class GcodeSuite {
|
||||
|
@ -404,11 +408,7 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
static void G0_G1(
|
||||
#if IS_SCARA || defined(G0_FEEDRATE)
|
||||
const bool fast_move=false
|
||||
#endif
|
||||
);
|
||||
static void G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move=false));
|
||||
|
||||
TERN_(ARC_SUPPORT, static void G2_G3(const bool clockwise));
|
||||
|
||||
|
|
|
@ -44,11 +44,7 @@ extern xyze_pos_t destination;
|
|||
/**
|
||||
* G0, G1: Coordinated movement of X Y Z E axes
|
||||
*/
|
||||
void GcodeSuite::G0_G1(
|
||||
#if IS_SCARA || defined(G0_FEEDRATE)
|
||||
const bool fast_move/*=false*/
|
||||
#endif
|
||||
) {
|
||||
void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
|
||||
|
||||
if (IsRunning()
|
||||
#if ENABLED(NO_MOTION_BEFORE_HOMING)
|
||||
|
|
Loading…
Reference in a new issue