From 1a1f3b28b3a11dcb9406a558ef6440abe8c9dbf7 Mon Sep 17 00:00:00 2001 From: Thomas Schmid Date: Thu, 6 Jan 2022 12:51:39 +0100 Subject: [PATCH] Move menu configuration into seperate file Move menu configuration into sperate file menu.cfg and incude it in main printer.cfg Signed-off-by: Thomas Schmid --- menu.cfg | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++ printer.cfg | 197 ++-------------------------------------------------- 2 files changed, 197 insertions(+), 193 deletions(-) create mode 100644 menu.cfg diff --git a/menu.cfg b/menu.cfg new file mode 100644 index 0000000..4559f7b --- /dev/null +++ b/menu.cfg @@ -0,0 +1,193 @@ +### menu move 10mm ### +[menu __main __control __move_10mm] +type: list +enable: {not printer.idle_timeout.state == "Printing"} +name: Move 10mm + +[menu __main __control __move_10mm __axis_x] +type: input +name: Move X:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.x} +input_min: {printer.toolhead.axis_minimum.x} +input_max: {printer.toolhead.axis_maximum.x} +input_step: 10.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 X{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_10mm __axis_y] +type: input +name: Move Y:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.y} +input_min: {printer.toolhead.axis_minimum.y} +input_max: {printer.toolhead.axis_maximum.y} +input_step: 10.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Y{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_10mm __axis_z] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move Z:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.z} +input_min: 0 +input_max: {printer.toolhead.axis_maximum.z} +input_step: 10.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Z{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_10mm __axis_e] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move E:{'%+06.1f' % menu.input} +realtime: True +input: 0 +input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_step: 10.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + M83 + G1 E{menu.input} F240 + RESTORE_GCODE_STATE NAME=__move__axis + +### menu move 1mm ### +[menu __main __control __move_1mm] +type: list +enable: {not printer.idle_timeout.state == "Printing"} +name: Move 1mm + +[menu __main __control __move_1mm __axis_x] +type: input +name: Move X:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.x} +input_min: {printer.toolhead.axis_minimum.x} +input_max: {printer.toolhead.axis_maximum.x} +input_step: 1.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 X{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_1mm __axis_y] +type: input +name: Move Y:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.y} +input_min: {printer.toolhead.axis_minimum.y} +input_max: {printer.toolhead.axis_maximum.y} +input_step: 1.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Y{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_1mm __axis_z] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move Z:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.z} +input_min: 0 +input_max: {printer.toolhead.axis_maximum.z} +input_step: 1.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Z{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_1mm __axis_e] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move E:{'%+06.1f' % menu.input} +realtime: True +input: 0 +input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_step: 1.0 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + M83 + G1 E{menu.input} F240 + RESTORE_GCODE_STATE NAME=__move__axis + +### menu move 0.1mm ### +[menu __main __control __move_01mm] +type: list +enable: {not printer.idle_timeout.state == "Printing"} +name: Move 0.1mm + +[menu __main __control __move_01mm __axis_x] +type: input +name: Move X:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.x} +input_min: {printer.toolhead.axis_minimum.x} +input_max: {printer.toolhead.axis_maximum.x} +input_step: 0.1 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 X{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_01mm __axis_y] +type: input +name: Move Y:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.y} +input_min: {printer.toolhead.axis_minimum.y} +input_max: {printer.toolhead.axis_maximum.y} +input_step: 0.1 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Y{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_01mm __axis_z] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move Z:{'%05.1f' % menu.input} +realtime: True +input: {printer.gcode_move.gcode_position.z} +input_min: 0 +input_max: {printer.toolhead.axis_maximum.z} +input_step: 0.1 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + G90 + G1 Z{menu.input} + RESTORE_GCODE_STATE NAME=__move__axis + +[menu __main __control __move_01mm __axis_e] +type: input +enable: {not printer.idle_timeout.state == "Printing"} +name: Move E:{'%+06.1f' % menu.input} +realtime: True +input: 0 +input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} +input_step: 0.1 +gcode: + SAVE_GCODE_STATE NAME=__move__axis + M83 + G1 E{menu.input} F240 + RESTORE_GCODE_STATE NAME=__move__axis + +#-------------------------------------------------------------------- diff --git a/printer.cfg b/printer.cfg index fe2d2f3..20ae89a 100644 --- a/printer.cfg +++ b/printer.cfg @@ -565,200 +565,11 @@ gcode: SET_LED LED=btt_mini12864 RED=1 GREEN=1 BLUE=1 INDEX=2 TRANSMIT=0 SET_LED LED=btt_mini12864 RED=0 GREEN=0.2 BLUE=1 INDEX=3 -### menu move 10mm ### -[menu __main __control __move_10mm] -type: list -enable: {not printer.idle_timeout.state == "Printing"} -name: Move 10mm - -[menu __main __control __move_10mm __axis_x] -type: input -name: Move X:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.x} -input_min: {printer.toolhead.axis_minimum.x} -input_max: {printer.toolhead.axis_maximum.x} -input_step: 10.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 X{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_10mm __axis_y] -type: input -name: Move Y:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.y} -input_min: {printer.toolhead.axis_minimum.y} -input_max: {printer.toolhead.axis_maximum.y} -input_step: 10.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Y{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_10mm __axis_z] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move Z:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.z} -input_min: 0 -input_max: {printer.toolhead.axis_maximum.z} -input_step: 10.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Z{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_10mm __axis_e] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move E:{'%+06.1f' % menu.input} -realtime: True -input: 0 -input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_step: 10.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - M83 - G1 E{menu.input} F240 - RESTORE_GCODE_STATE NAME=__move__axis - -### menu move 1mm ### -[menu __main __control __move_1mm] -type: list -enable: {not printer.idle_timeout.state == "Printing"} -name: Move 1mm - -[menu __main __control __move_1mm __axis_x] -type: input -name: Move X:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.x} -input_min: {printer.toolhead.axis_minimum.x} -input_max: {printer.toolhead.axis_maximum.x} -input_step: 1.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 X{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_1mm __axis_y] -type: input -name: Move Y:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.y} -input_min: {printer.toolhead.axis_minimum.y} -input_max: {printer.toolhead.axis_maximum.y} -input_step: 1.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Y{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_1mm __axis_z] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move Z:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.z} -input_min: 0 -input_max: {printer.toolhead.axis_maximum.z} -input_step: 1.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Z{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_1mm __axis_e] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move E:{'%+06.1f' % menu.input} -realtime: True -input: 0 -input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_step: 1.0 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - M83 - G1 E{menu.input} F240 - RESTORE_GCODE_STATE NAME=__move__axis - -### menu move 0.1mm ### -[menu __main __control __move_01mm] -type: list -enable: {not printer.idle_timeout.state == "Printing"} -name: Move 0.1mm - -[menu __main __control __move_01mm __axis_x] -type: input -name: Move X:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.x} -input_min: {printer.toolhead.axis_minimum.x} -input_max: {printer.toolhead.axis_maximum.x} -input_step: 0.1 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 X{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_01mm __axis_y] -type: input -name: Move Y:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.y} -input_min: {printer.toolhead.axis_minimum.y} -input_max: {printer.toolhead.axis_maximum.y} -input_step: 0.1 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Y{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_01mm __axis_z] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move Z:{'%05.1f' % menu.input} -realtime: True -input: {printer.gcode_move.gcode_position.z} -input_min: 0 -input_max: {printer.toolhead.axis_maximum.z} -input_step: 0.1 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - G90 - G1 Z{menu.input} - RESTORE_GCODE_STATE NAME=__move__axis - -[menu __main __control __move_01mm __axis_e] -type: input -enable: {not printer.idle_timeout.state == "Printing"} -name: Move E:{'%+06.1f' % menu.input} -realtime: True -input: 0 -input_min: -{printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_max: {printer.configfile.config.extruder.max_extrude_only_distance|default(50)} -input_step: 0.1 -gcode: - SAVE_GCODE_STATE NAME=__move__axis - M83 - G1 E{menu.input} F240 - RESTORE_GCODE_STATE NAME=__move__axis - -#-------------------------------------------------------------------- +##################################################################### +# Menu +##################################################################### +[include menu.cfg] ##################################################################### # Macros