SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (#8176)

Browse source 
* [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour

NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed

* Update G0_G1.cpp

* Update G0_G1.cpp
This commit is contained in:
GMagician 2017-10-31 04:50:22 +01:00 committed by Scott Lahteine
parent 577659cacf
commit 727a403ba1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,12 @@
extern float destination[XYZE]; extern float destination[XYZE];
#if ENABLED(NO_MOTION_BEFORE_HOMING)
#define G0_G1_CONDITION !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z'))
#else
#define G0_G1_CONDITION true
#endif
/** /**
* G0, G1: Coordinated movement of X Y Z E axes * G0, G1: Coordinated movement of X Y Z E axes
*/ */
@ -41,7 +47,7 @@ void GcodeSuite::G0_G1(
bool fast_move/*=false*/ bool fast_move/*=false*/
#endif #endif
) { ) {
if (MOTION_CONDITIONS) { if (IsRunning() && G0_G1_CONDITION) {
get_destination_from_command(); // For X Y Z E F get_destination_from_command(); // For X Y Z E F
#if ENABLED(FWRETRACT) #if ENABLED(FWRETRACT)