bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

G0 feedrate may be fixed or variable (#12172)

Browse Source
This commit is contained in:
TheSFReader
2018-10-25 17:35:16 +02:00
committed by Scott Lahteine
parent 53c535a0c1
commit a07ac6312f
61 changed files with 319 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/gcode.cpp
View File

@ -184,7 +184,7 @@ void GcodeSuite::process_parsed_command(
case 'G': switch (parser.codenum) {
case 0: case 1: G0_G1( // G0: Fast Move, G1: Linear Move
#if IS_SCARA || ENABLED(G0_FEEDRATE)
#if IS_SCARA || defined(G0_FEEDRATE)
parser.codenum == 0
#endif
);

2
Marlin/src/gcode/gcode.h
View File

@ -342,7 +342,7 @@ public:
private:
static void G0_G1(
#if IS_SCARA || ENABLED(G0_FEEDRATE)
#if IS_SCARA || defined(G0_FEEDRATE)
bool fast_move=false
#endif
);

55
Marlin/src/gcode/motion/G0_G1.cpp
View File

@ -37,40 +37,48 @@
extern float destination[XYZE];
#if ENABLED(G0_FEEDRATE)
float saved_g0_feedrate_mm_s = MMM_TO_MMS(DEFAULT_G0_FEEDRATE);
#endif
#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
#if ENABLED(VARIABLE_G0_FEEDRATE)
float saved_g0_feedrate_mm_s = MMM_TO_MMS(G0_FEEDRATE);
#endif
/**
* G0, G1: Coordinated movement of X Y Z E axes
*/
void GcodeSuite::G0_G1(
#if IS_SCARA || ENABLED(G0_FEEDRATE)
#if IS_SCARA || defined(G0_FEEDRATE)
bool fast_move/*=false*/
#endif
) {
#if ENABLED(G0_FEEDRATE)
float saved_g1_feedrate_mm_s;
#endif
if (IsRunning() && G0_G1_CONDITION) {
if (IsRunning()
#if ENABLED(NO_MOTION_BEFORE_HOMING)
&& !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z'))
#endif
) {
#if ENABLED(G0_FEEDRATE)
if (fast_move) {
// Save standard feedrate before setting feedrate to fast/g0
saved_g1_feedrate_mm_s = feedrate_mm_s;
feedrate_mm_s = saved_g0_feedrate_mm_s;
}
#ifdef G0_FEEDRATE
float saved_feedrate_mm_s;
#if ENABLED(VARIABLE_G0_FEEDRATE)
if (fast_move) {
saved_feedrate_mm_s = feedrate_mm_s; // Back up the (old) motion mode feedrate
feedrate_mm_s = saved_g0_feedrate_mm_s; // Get G0 feedrate from last usage
}
#endif
#endif
get_destination_from_command(); // For X Y Z E F
#ifdef G0_FEEDRATE
if (fast_move) {
#if ENABLED(VARIABLE_G0_FEEDRATE)
saved_g0_feedrate_mm_s = feedrate_mm_s; // Save feedrate for the next G0
#else
saved_feedrate_mm_s = feedrate_mm_s; // Back up the (new) motion mode feedrate
feedrate_mm_s = MMM_TO_MMS(G0_FEEDRATE); // Get the fixed G0 feedrate
#endif
}
#endif
#if ENABLED(FWRETRACT) && ENABLED(FWRETRACT_AUTORETRACT)
if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
@ -94,12 +102,9 @@ void GcodeSuite::G0_G1(
prepare_move_to_destination();
#endif
#if ENABLED(G0_FEEDRATE)
// save G0 feedrate, and restore standard feedrate as soon as possible
if (fast_move) {
saved_g0_feedrate_mm_s = feedrate_mm_s;
feedrate_mm_s = saved_g1_feedrate_mm_s;
}
#ifdef G0_FEEDRATE
// Restore the motion mode feedrate
if (fast_move) feedrate_mm_s = saved_feedrate_mm_s;
#endif
#if ENABLED(NANODLP_Z_SYNC)