zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add HAS_FAST_MOVES

Browse source
This commit is contained in:
Scott Lahteine 2020-10-04 17:29:12 -05:00
parent d88e694d06
commit 7e0524109e
3 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/gcode/gcode.cpp
View file

@ -260,12 +260,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
switch (parser.command_letter) { switch (parser.command_letter) {
case 'G': switch (parser.codenum) { case 'G': switch (parser.codenum) {
case 0: case 1: G0_G1( // G0: Fast Move, G1: Linear Move case 0: case 1: // G0: Fast Move, G1: Linear Move
#if IS_SCARA || defined(G0_FEEDRATE) G0_G1(TERN_(HAS_FAST_MOVES, parser.codenum == 0)); break;
parser.codenum == 0
#endif
);
break;
#if ENABLED(ARC_SUPPORT) && DISABLED(SCARA) #if ENABLED(ARC_SUPPORT) && DISABLED(SCARA)
case 2: case 3: G2_G3(parser.codenum == 2); break; // G2: CW ARC, G3: CCW ARC 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 #if HAS_LEVELING
case 29: // G29: Bed leveling calibration case 29: // G29: Bed leveling calibration
#if ENABLED(G29_RETRY_AND_RECOVER) TERN(G29_RETRY_AND_RECOVER, G29_with_retry, G29)();
G29_with_retry();
#else
G29();
#endif
break; break;
#endif // HAS_LEVELING #endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
case 30: G30(); break; // G30: Single Z probe case 30: G30(); break; // G30: Single Z probe

10
Marlin/src/gcode/gcode.h
View file

@ -298,6 +298,10 @@
#include "../feature/encoder_i2c.h" #include "../feature/encoder_i2c.h"
#endif #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 }; enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
class GcodeSuite { class GcodeSuite {
@ -404,11 +408,7 @@ public:
private: private:
static void G0_G1( static void G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move=false));
#if IS_SCARA || defined(G0_FEEDRATE)
const bool fast_move=false
#endif
);
TERN_(ARC_SUPPORT, static void G2_G3(const bool clockwise)); TERN_(ARC_SUPPORT, static void G2_G3(const bool clockwise));

6
Marlin/src/gcode/motion/G0_G1.cpp
View file

@ -44,11 +44,7 @@ extern xyze_pos_t destination;
/** /**
* G0, G1: Coordinated movement of X Y Z E axes * G0, G1: Coordinated movement of X Y Z E axes
*/ */
void GcodeSuite::G0_G1( void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
#if IS_SCARA || defined(G0_FEEDRATE)
const bool fast_move/*=false*/
#endif
) {
if (IsRunning() if (IsRunning()
#if ENABLED(NO_MOTION_BEFORE_HOMING) #if ENABLED(NO_MOTION_BEFORE_HOMING)