diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 88a3df2d535537d5dfbaca10a858738c47ad854a..71769db3fbc87ca3149fdf47b03a9ba31f604951 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1594,6 +1594,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h
index 88a3df2d535537d5dfbaca10a858738c47ad854a..71769db3fbc87ca3149fdf47b03a9ba31f604951 100755
--- a/Marlin/src/config/default/Configuration_adv.h
+++ b/Marlin/src/config/default/Configuration_adv.h
@@ -1594,6 +1594,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
index 40bf2c1878d2b54e16844b4fd61c0481f98486c0..77d66cff7bef418e75d9476c27d1189a6ed52043 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
index 3967a8e7461f85f73c90f6cf210b2b57076779cd..3ad44c8aea35ba32438b80a008263da81de9fa9a 100644
--- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
index 3967a8e7461f85f73c90f6cf210b2b57076779cd..3ad44c8aea35ba32438b80a008263da81de9fa9a 100644
--- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
index 793f661093e59b0fb9e5a800970b6e563fa16278..ccf5574a297ef0c0182fdac88b026885872ef502 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
index 92bad26e64d81a82e50e7da5732037b99201ab2b..28dd9fe5b5746496207a7f264cb19305f1114efc 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
index c7c8a16a9d24bd7d2e713f85cac13c9483ae0a1d..84c101cdd46cd0d01c77b4c11e7db256ed13b407 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
index 4ea5cc3ea460acf51e1809abe5f75ba2ea5d977d..3e08e878ae1f8bb4946b9607dd9bccc4292b8c78 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
index 330f447352375ebc6f41c12a0dd8e9067d27dcc4..c82fdbf442a797565ce43adff2d56514cad3e2c1 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
index 0c40af37d2887e8bc8169a2d4c189aed3c9a0c2c..ff74739c5cfe1ed18a0523b88ed3d9ab64fa499b 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
@@ -1601,6 +1601,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
index 330f447352375ebc6f41c12a0dd8e9067d27dcc4..c82fdbf442a797565ce43adff2d56514cad3e2c1 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
index 143fb18cc47e42b000dfee6465029dbcf035d7b3..2f398ef0095fbd0ab520a57b994ad7f9a124c003 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
index 028857f481cacc5153fe527ffa00c6518abd9ea4..6bc877403005d1fcd7a2a13001adb0cae17fd35f 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
@@ -1596,6 +1596,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
index f7e3387b3e7fbf413664d7ba8e583f7cfa77eff6..4688ca4f30950c370d4dd55020d08c52151f1c9d 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
index 318fcd5ac54ffb6a3bc29c5043a9a4ee4f47bd13..4e0469829dd59f6f0a84eec18030700df2dfdfd6 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
index a118fe1f7c0c45dd7ac52f61237c39cd3f513961..f3a149df1d5f1e38aba6326cb3404541465f0037 100644
--- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
index 8aa836b8d82b7fc0bd7879653316f5a65a95a03a..52ca32dd018e1ae0e8b6b5c8e990a1a7bcb51c42 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
index 69ef271feb5809b886ec9c1ba974e1eab169dd0e..6a23b885a1ba124958eeef8c9a195d6836aa1121 100644
--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
index a118fe1f7c0c45dd7ac52f61237c39cd3f513961..f3a149df1d5f1e38aba6326cb3404541465f0037 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
index 1c074c9b723bce73df1d1842a4995739b1977a90..84ecc2a0deff233051d03410eea653def05bcd70 100644
--- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h
index f0eef0c55158272916b4387e9677961853da67ea..e27b9d573502042067349e5a42ede46364474cc3 100644
--- a/Marlin/src/config/examples/Felix/Configuration_adv.h
+++ b/Marlin/src/config/examples/Felix/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
index 1504fdd11b91a4e2f8d97062220a35e7b3e4fcfa..05f74dd32e285961bc43e268a225dd6522f0367e 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
index dc5291355c359086ad75a40438297666917569d0..ea43482245711f61e44d8c1e3a24f2c2b292e4cd 100644
--- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
index 97311df671d4835e86e767fcbf5167fe0f7c0e7e..116ed77ce07d33d6c53d1bbd34ce49215eab38c7 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
@@ -1597,6 +1597,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
index ea9238b22588318da91f658af6a6d52cc73f9555..32728d27de69cadb4b7cbe7061054d43792da7cb 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
@@ -1598,6 +1598,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
index 0e9576481761f8ba8681aa885282bae2a8af5d85..1cf7f8c6283f4da0038840810747a5a58908432f 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
index 0e9576481761f8ba8681aa885282bae2a8af5d85..1cf7f8c6283f4da0038840810747a5a58908432f 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
index f715c61f015204152f2cb285edb95393bc6a0c37..6bc87f365499a24f079dfd6caf1cac71b29f1ccb 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
index a2ec109356905c77db18033ee1bc0ba864a48874..9dc320fce804e0db7fea14cb8e6e57bf425a778c 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
index 7a12be3f6d4823696d4a9f97e05e5d16eb51fe52..46b0366ed25628a4151f5f53824b6a3ddeeacdd5 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
index 4e3a050dfed739fee33b01c7770152d61251e3e7..84e2165b586d60411ff651f9c0562b6faa3ab7ee 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
index 2094752ab24f0d7998215c071d43dfe0b05067cd..b6d10d66e03d00f99cd2b241d51f0afb2e233dda 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
index 13f97550cff9b72256e0f409e8bc19e03cf1c695..fff5f52d6b083f432676c60abe66cd8f3858e23b 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
index f146cdb80af2ca88c1ee1eb95e5e5d56139145d8..71e09dd1cc6ef45c18131ed1ddb9caa06c9c5c6c 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
@@ -1601,6 +1601,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
index a71a9a81d04741497692e843283d354d84c59951..7389c648075a13775d3ff0ae4a3a28d467b2088c 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h
index dd667f0bb7425cad1150f234b7b8ab41c6462cf2..caf82e2bda9068ef10f61625c2e0272cc4f43c10 100644
--- a/Marlin/src/config/examples/SCARA/Configuration_adv.h
+++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
index 41dd7218ac0139419e9787ed7a696d9d0d0b0742..47d458e59cf9d56f55555b9be2fefbfa813eff72 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
index 8cd4081633980511a8bf0485a01c96e4b66de0fc..9ffea94e662c0cf07e65e14e72ab1b22629157c8 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
index 947f0573718d7a8c664f8cd3293bce15c278dd10..1586d9b792232394ac0bb3682795a574e3a9bede 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
index a4eaea42f848724abd56f7e7fb0cc5d12c76fa4f..73bd14fb18999b686e855291bbc0254f10a7e13c 100644
--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
index 29bb95289e35c6908bb7d244abeec532ebd249c8..2a9fa17b7a89c0de869971e0a0a51243d990c3df 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
index d1b20263a967021565c42a987009475004a6b045..61deda04675227d6464b6de121a5ed39039b2f9d 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
@@ -1606,6 +1606,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
index c479880d9ee69e57f5c6731a67c9307a0ea02a6b..781a0be68ece314ea03999dfd7b92437baee3c42 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
index b97d0b43e7f1affb963d68159c353d2166dc7905..8098ac9099588e9ed5ceb32886a3507b22f4d5b8 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
index f6160fed92a0fd594a32ca379d9f848228ec6b79..3e89abf51f200625dbb3f572482ba36dadc19356 100644
--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
index 57af4af00a6b606d407bcfbf03ca488e777a054f..0ae5a10a6a3762e5ea10d4d32081c89811bfbecc 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
index 57af4af00a6b606d407bcfbf03ca488e777a054f..0ae5a10a6a3762e5ea10d4d32081c89811bfbecc 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
index eaa28eb8a3d499a025ff61909cea8f06ac6082a6..8b91961135a591775171b3ba4f8ce4ce6f3ae7cb 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
index eaa28eb8a3d499a025ff61909cea8f06ac6082a6..8b91961135a591775171b3ba4f8ce4ce6f3ae7cb 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
index eaa28eb8a3d499a025ff61909cea8f06ac6082a6..8b91961135a591775171b3ba4f8ce4ce6f3ae7cb 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
index d5c7df792f6acbd81a9ce6e2168465d519c90431..3e4147a5a99b67662b20b839975b2d43e9d33f9c 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
@@ -1595,6 +1595,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
index 365ae3792e0b582ea080f0a2afd243cd3b78d7bf..6d8d7eba89dfa1335f77bafb62ac3ba09aa46f54 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h
index 8af856f1e3c6b7697be127b45a05c9b7ba8c8635..b634f016a4c3362473dd812adb873f338bcfca39 100644
--- a/Marlin/src/config/examples/makibox/Configuration_adv.h
+++ b/Marlin/src/config/examples/makibox/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
index fa3b4be542a83d60665813db31bfdb5784e6530a..66e4b393edeee706b871284de786b42066154aaa 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
@@ -1593,6 +1593,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h
index 184ca8cfa2966bfa87467e75835ec117591ee446..63a3a50b66639651a13a5262612cd5b304d586ca 100644
--- a/Marlin/src/config/examples/wt150/Configuration_adv.h
+++ b/Marlin/src/config/examples/wt150/Configuration_adv.h
@@ -1594,6 +1594,13 @@
*/
#define FASTER_GCODE_PARSER
+/**
+ * CNC G-code options
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
+ */
+//#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.
+
/**
* User-defined menu items that execute custom GCode
*/
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7e1a7f80cf7e292c6fbe38f163b369fadbb31ec2..36a01c1f7fd4ff46f4ef18f027752d0ac20038c1 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -263,6 +263,10 @@ void GcodeSuite::process_parsed_command(
break;
#endif
+ #if ENABLED(GCODE_MOTION_MODES)
+ case 80: G80(); break; // G80: Reset the current motion mode
+ #endif
+
case 90: relative_mode = false; break; // G90: Relative Mode
case 91: relative_mode = true; break; // G91: Absolute Mode
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 7340e3b9bf06f9690716ef5dd158cac8bc9d8214..106b980e7c2fbbe91e64a848356f2b95937f7c0b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -65,6 +65,7 @@
* G33 - Delta Auto-Calibration (Requires DELTA_AUTO_CALIBRATION)
* G38 - Probe in any direction using the Z_MIN_PROBE (Requires G38_PROBE_TARGET)
* G42 - Coordinated move to a mesh point (Requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BLINEAR, or AUTO_BED_LEVELING_UBL)
+ * G80 - Cancel current motion mode (Requires GCODE_MOTION_MODES)
* G90 - Use Absolute Coordinates
* G91 - Use Relative Coordinates
* G92 - Set current position to coordinates given
@@ -428,6 +429,10 @@ private:
static void G59();
#endif
+ #if ENABLED(GCODE_MOTION_MODES)
+ static void G80();
+ #endif
+
static void G92();
#if HAS_RESUME_CONTINUE
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 04a592266fb0ddf8be370f15f7b8ae7a64d1feda..8f30773246f48f43db599ffd19596ce6e77b0b2f 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -153,5 +153,19 @@ void GcodeSuite::M115() {
#endif
);
+ // PAREN_COMMENTS
+ cap_line(PSTR("PAREN_COMMENTS")
+ #if ENABLED(PAREN_COMMENTS)
+ , true
+ #endif
+ );
+
+ // MOTION_MODES (M80-M89)
+ cap_line(PSTR("MOTION_MODES")
+ #if ENABLED(GCODE_MOTION_MODES)
+ , true
+ #endif
+ );
+
#endif // EXTENDED_CAPABILITIES_REPORT
}
diff --git a/Marlin/src/gcode/motion/G80.cpp b/Marlin/src/gcode/motion/G80.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..983a46392d11adab2903e0775407e88746c3a4a6
--- /dev/null
+++ b/Marlin/src/gcode/motion/G80.cpp
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(GCODE_MOTION_MODES)
+
+/**
+ * G80: Cancel current motion mode
+ */
+void GcodeSuite::G80() {
+
+ parser.cancel_motion_mode();
+
+}
+
+#endif // GCODE_MOTION_MODES
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 392532646ce5f5a650c6ee7cbd13c2e0b32360e3..7c3fe76b60a341a3be502dac68236eba05751b9e 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -50,10 +50,18 @@ char *GCodeParser::command_ptr,
*GCodeParser::value_ptr;
char GCodeParser::command_letter;
int GCodeParser::codenum;
+
#if USE_GCODE_SUBCODES
uint8_t GCodeParser::subcode;
#endif
+#if ENABLED(GCODE_MOTION_MODES)
+ int16_t GCodeParser::motion_mode_codenum = -1;
+ #if USE_GCODE_SUBCODES
+ uint8_t GCodeParser::motion_mode_subcode;
+ #endif
+#endif
+
#if ENABLED(FASTER_GCODE_PARSER)
// Optimized Parameters
uint32_t GCodeParser::codebits; // found bits
@@ -117,36 +125,82 @@ void GCodeParser::parse(char *p) {
starpos[1] = '\0';
}
+ #if ENABLED(GCODE_MOTION_MODES)
+ #if ENABLED(ARC_SUPPORT)
+ #define GTOP 3
+ #else
+ #define GTOP 1
+ #endif
+ #endif
+
// Bail if the letter is not G, M, or T
- switch (letter) { case 'G': case 'M': case 'T': break; default: return; }
+ // (or a valid parameter for the current motion mode)
+ switch (letter) {
- // Skip spaces to get the numeric part
- while (*p == ' ') p++;
+ case 'G': case 'M': case 'T':
- // Bail if there's no command code number
- if (!NUMERIC(*p)) return;
+ // Skip spaces to get the numeric part
+ while (*p == ' ') p++;
- // Save the command letter at this point
- // A '?' signifies an unknown command
- command_letter = letter;
+ // Bail if there's no command code number
+ if (!NUMERIC(*p)) return;
- // Get the code number - integer digits only
- codenum = 0;
- do {
- codenum *= 10, codenum += *p++ - '0';
- } while (NUMERIC(*p));
+ // Save the command letter at this point
+ // A '?' signifies an unknown command
+ command_letter = letter;
- // Allow for decimal point in command
- #if USE_GCODE_SUBCODES
- if (*p == '.') {
- p++;
- while (NUMERIC(*p))
+ // Get the code number - integer digits only
+ codenum = 0;
+ do { codenum *= 10, codenum += *p++ - '0'; } while (NUMERIC(*p));
+
+ // Allow for decimal point in command
+ #if USE_GCODE_SUBCODES
+ if (*p == '.') {
+ p++;
+ while (NUMERIC(*p))
subcode *= 10, subcode += *p++ - '0';
- }
- #endif
+ }
+ #endif
+
+ // Skip all spaces to get to the first argument, or nul
+ while (*p == ' ') p++;
+
+ #if ENABLED(GCODE_MOTION_MODES)
+ if (letter == 'G' && (codenum <= GTOP || codenum == 5
+ #if ENABLED(G38_PROBE_TARGET)
+ || codenum == 38
+ #endif
+ )
+ ) {
+ motion_mode_codenum = codenum;
+ #if USE_GCODE_SUBCODES
+ motion_mode_subcode = subcode;
+ #endif
+ }
+ #endif
- // Skip all spaces to get to the first argument, or nul
- while (*p == ' ') p++;
+ break;
+
+ #if ENABLED(GCODE_MOTION_MODES)
+ #if ENABLED(ARC_SUPPORT)
+ case 'I': case 'J': case 'R':
+ if (motion_mode_codenum != 2 && motion_mode_codenum != 3) return;
+ #endif
+ case 'P': case 'Q':
+ if (motion_mode_codenum != 5) return;
+ case 'X': case 'Y': case 'Z': case 'E': case 'F':
+ if (motion_mode_codenum < 0) return;
+ command_letter = 'G';
+ codenum = motion_mode_codenum;
+ #if USE_GCODE_SUBCODES
+ subcode = motion_mode_subcode;
+ #endif
+ p--; // Back up one character to use the current parameter
+ break;
+ #endif // GCODE_MOTION_MODES
+
+ default: return;
+ }
// The command parameters (if any) start here, for sure!
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index eb67bf14a7e197a5df7e4d849126348dfbfe3ecb..b6044b216e764b1262cf6374af7aef00213c10ec 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -76,14 +76,21 @@ public:
// Command line state
static char *command_ptr, // The command, so it can be echoed
- *string_arg; // string of command line
-
- static char command_letter; // G, M, or T
+ *string_arg, // string of command line
+ command_letter; // G, M, or T
static int codenum; // 123
#if USE_GCODE_SUBCODES
static uint8_t subcode; // .1
#endif
+ #if ENABLED(GCODE_MOTION_MODES)
+ static int16_t motion_mode_codenum;
+ #if USE_GCODE_SUBCODES
+ static uint8_t motion_mode_subcode;
+ #endif
+ FORCE_INLINE static void cancel_motion_mode() { motion_mode_codenum = -1; }
+ #endif
+
#if ENABLED(DEBUG_GCODE_PARSER)
static void debug();
#endif
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 8e302488530f7bd85cb1f29abb877d832df42f47..61d7c1d15868b031fe4c6d04f36fb5548928e044 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -282,7 +282,11 @@ static int read_serial(const int index) {
*/
inline void get_serial_commands() {
static char serial_line_buffer[NUM_SERIAL][MAX_CMD_SIZE];
- static bool serial_comment_mode[NUM_SERIAL] = { false };
+ static bool serial_comment_mode[NUM_SERIAL] = { false }
+ #if ENABLED(PAREN_COMMENTS)
+ , serial_comment_paren_mode[NUM_SERIAL] = { false }
+ #endif
+ ;
// If the command buffer is empty for too long,
// send "wait" to indicate Marlin is still waiting.
@@ -310,7 +314,11 @@ inline void get_serial_commands() {
*/
if (serial_char == '\n' || serial_char == '\r') {
- serial_comment_mode[i] = false; // end of line == end of comment
+ // Start with comment mode off
+ serial_comment_mode[i] = false;
+ #if ENABLED(PAREN_COMMENTS)
+ serial_comment_paren_mode[i] = false;
+ #endif
// Skip empty lines and comments
if (!serial_count[i]) { thermalManager.manage_heater(); continue; }
@@ -404,12 +412,24 @@ inline void get_serial_commands() {
}
else if (serial_char == '\\') { // Handle escapes
// if we have one more character, copy it over
- if ((c = read_serial(i)) >= 0 && !serial_comment_mode[i])
+ if ((c = read_serial(i)) >= 0 && !serial_comment_mode[i]
+ #if ENABLED(PAREN_COMMENTS)
+ && !serial_comment_paren_mode[i]
+ #endif
+ )
serial_line_buffer[i][serial_count[i]++] = (char)c;
}
else { // it's not a newline, carriage return or escape char
if (serial_char == ';') serial_comment_mode[i] = true;
- if (!serial_comment_mode[i]) serial_line_buffer[i][serial_count[i]++] = serial_char;
+ #if ENABLED(PAREN_COMMENTS)
+ else if (serial_char == '(') serial_comment_paren_mode[i] = true;
+ else if (serial_char == ')') serial_comment_paren_mode[i] = false;
+ #endif
+ else if (!serial_comment_mode[i]
+ #if ENABLED(PAREN_COMMENTS)
+ && ! serial_comment_paren_mode[i]
+ #endif
+ ) serial_line_buffer[i][serial_count[i]++] = serial_char;
}
} // for NUM_SERIAL
} // queue has space, serial has data
@@ -424,7 +444,11 @@ inline void get_serial_commands() {
*/
inline void get_sdcard_commands() {
static bool stop_buffering = false,
- sd_comment_mode = false;
+ sd_comment_mode = false
+ #if ENABLED(PAREN_COMMENTS)
+ , sd_comment_paren_mode = false
+ #endif
+ ;
if (!IS_SD_PRINTING) return;
@@ -445,7 +469,11 @@ inline void get_serial_commands() {
card_eof = card.eof();
if (card_eof || n == -1
|| sd_char == '\n' || sd_char == '\r'
- || ((sd_char == '#' || sd_char == ':') && !sd_comment_mode)
+ || ((sd_char == '#' || sd_char == ':') && !sd_comment_mode
+ #if ENABLED(PAREN_COMMENTS)
+ && !sd_comment_paren_mode
+ #endif
+ )
) {
if (card_eof) {
@@ -481,6 +509,9 @@ inline void get_serial_commands() {
if (sd_char == '#') stop_buffering = true;
sd_comment_mode = false; // for new command
+ #if ENABLED(PAREN_COMMENTS)
+ sd_comment_paren_mode = false;
+ #endif
// Skip empty lines and comments
if (!sd_count) { thermalManager.manage_heater(); continue; }
@@ -498,7 +529,15 @@ inline void get_serial_commands() {
}
else {
if (sd_char == ';') sd_comment_mode = true;
- if (!sd_comment_mode) command_queue[cmd_queue_index_w][sd_count++] = sd_char;
+ #if ENABLED(PAREN_COMMENTS)
+ else if (sd_char == '(') sd_comment_paren_mode = true;
+ else if (sd_char == ')') sd_comment_paren_mode = false;
+ #endif
+ else if (!sd_comment_mode
+ #if ENABLED(PAREN_COMMENTS)
+ && ! sd_comment_paren_mode
+ #endif
+ ) command_queue[cmd_queue_index_w][sd_count++] = sd_char;
}
}
}
diff --git a/buildroot/share/tests/STM32F1_tests b/buildroot/share/tests/STM32F1_tests
index 283e68d9b2cea95135ad23e9f6760a22c6a8aa46..b9b91ff66d2c4e7d4a377fb533d3a96b7e32ca55 100755
--- a/buildroot/share/tests/STM32F1_tests
+++ b/buildroot/share/tests/STM32F1_tests
@@ -5,8 +5,9 @@ set -e
restore_configs
opt_set MOTHERBOARD BOARD_STM32F1R
-opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
-exec_test $1 $2 "STM32F1R EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT"
+opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
+ PAREN_COMMENTS GCODE_MOTION_MODES
+exec_test $1 $2 "STM32F1R EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT PAREN_COMMENTS GCODE_MOTION_MODES"
opt_enable SPINDLE_LASER_ENABLE
exec_test $1 $2 "STM32F1R SPINDLE_LASER_ENABLE"