From 005cfea5c3b1396ae5328a1abd719cdb0f41d9a3 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 7 Jan 2020 19:06:55 -0500 Subject: gcode: Fix detection of some "extended" g-code commands Fix typo that resulted in _get_extended_params() being called for all commands. Allow "extended" g-code commands to contain numbers. Signed-off-by: Kevin O'Connor --- config/example-extras.cfg | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/example-extras.cfg b/config/example-extras.cfg index bb07c926..540cb018 100644 --- a/config/example-extras.cfg +++ b/config/example-extras.cfg @@ -389,9 +389,7 @@ ###################################################################### # G-Code macros (one may define any number of sections with a -# "gcode_macro" prefix). If G-Code macro names contain any numbers -# they must all be at the end of the macro's name. -# (example: test_macro25 is acceptable, but macro25_test3 is not). +# "gcode_macro" prefix). #[gcode_macro my_cmd] #gcode: # A list of G-Code commands to execute in place of "my_cmd". See @@ -411,13 +409,11 @@ # One may specify any number of options with a "variable_" prefix. # The given variable name will be assigned the given value (parsed # as a Python literal) and will be available during macro expansion. -# For example, a macro called set_fan with -# "variable_fan_speed = 75" might have gcode commands containing -# "M106 S{ fan_speed * 255 }". Variables can be changed at run-time -# using the SET_GCODE_VARIABLE command from within any G-Code Macro. -# Example, from a macro called my_macro2 I could state: -# "SET_GCODE_VARIABLE MACRO=set_fan VARIABLE=fan_speed VALUE=50" -# Variable names may not use upper case characters. +# For example, a config with "variable_fan_speed = 75" might have +# gcode commands containing "M106 S{ fan_speed * 255 }". Variables +# can be changed at run-time using the SET_GCODE_VARIABLE command +# (see docs/Command_Templates.md for details). Variable names may +# not use upper case characters. # Execute a gcode on a set delay. #[delayed_gcode my_delayed_gcode] -- cgit v1.2.3-70-g09d2