G0 feedrate may be fixed or variable (#12172)

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

View file

@ -1614,9 +1614,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1614,9 +1614,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1619,9 +1619,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1621,11 +1621,12 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**
* User-defined menu items that execute custom GCode
*/

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1616,9 +1616,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1617,9 +1617,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1618,9 +1618,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1621,9 +1621,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1626,9 +1626,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1615,9 +1615,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1613,9 +1613,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

View file

@ -1614,9 +1614,11 @@
*/
//#define PAREN_COMMENTS // Support for parentheses-delimited comments
//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/m)
#ifdef G0_FEEDRATE
//#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
#endif
/**

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
);

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
);

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;
if (IsRunning()
#if ENABLED(NO_MOTION_BEFORE_HOMING)
&& !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z'))
#endif
) {
if (IsRunning() && G0_G1_CONDITION) {
#if ENABLED(G0_FEEDRATE)
#ifdef G0_FEEDRATE
float saved_feedrate_mm_s;
#if ENABLED(VARIABLE_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;
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)

View file

@ -319,6 +319,8 @@
#error "PARKING_EXTRUDER_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration."
#elif defined(SWITCHING_TOOLHEAD_SECURITY_RAISE)
#error "SWITCHING_TOOLHEAD_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration."
#elif defined(G0_FEEDRATE) && G0_FEEDRATE == 0
#error "G0_FEEDRATE is now used to set the G0 feedrate. Please update your configuration."
#endif
#define BOARD_MKS_13 -47