From 8dff241650d22098420f7ec6f9e425c1eba3271b Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 17 Jan 2024 07:19:01 +0000 Subject: [PATCH 01/65] STEAPP-872: added the wizard change_material. --- klippy/extras/wizard/wizard.py | 7 +- klippy/extras/wizard/wizard_step_selector.py | 5 +- stereotech_config/wizards/change_material.cfg | 292 +++++++++--------- .../wizards/change_material_cmd.cfg | 54 ++++ 4 files changed, 200 insertions(+), 158 deletions(-) create mode 100644 stereotech_config/wizards/change_material_cmd.cfg diff --git a/klippy/extras/wizard/wizard.py b/klippy/extras/wizard/wizard.py index e607b805daa3..cb97ccbdd291 100644 --- a/klippy/extras/wizard/wizard.py +++ b/klippy/extras/wizard/wizard.py @@ -64,13 +64,14 @@ def cmd_SET_WIZARD_VARIABLE(self, gcmd): raise gcmd.error( "2051: Unknown wizard variable '%s'" % (variable,)) try: - literal = ast.literal_eval(value) - json.dumps(literal, separators=(',', ':')) + pass + # literal = ast.literal_eval(value) + # json.dumps(literal, separators=(',', ':')) except (SyntaxError, TypeError, ValueError) as e: raise gcmd.error("2052: Unable to parse '%s' as a literal: %s" % (value, e)) v = dict(self.variables) - v[variable] = literal + v[variable] = value self.variables = v cmd_SET_WIZARD_ENABLE_help = "Set the enable to WIZARD" diff --git a/klippy/extras/wizard/wizard_step_selector.py b/klippy/extras/wizard/wizard_step_selector.py index f5e314f8beca..72acf23d9836 100644 --- a/klippy/extras/wizard/wizard_step_selector.py +++ b/klippy/extras/wizard/wizard_step_selector.py @@ -4,9 +4,10 @@ class WizardStepSelector(WizardStep): def __init__(self, config): WizardStep.__init__(self, config) - self.selected = '' # get options - self.items = config.getlists('items', []) + self.items = config.getlists('items') + # set attributes + self.selected = self.items[0] # create template self.template = self.gcode_macro.load_template(config, 'select_gcode') # register commands diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index dba82f5e1211..0916925ba22a 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -1,16 +1,19 @@ [wizard CHANGE_MATERIAL] +# image path image: wizards/change_material/change_material.jpg +# 5d, 3d, any type: any -steps: CHANGE_MATERIAL_0, STEP_2 -variable_needed_action: '' -variable_manufacturer_select: '' -variable_seria_select: '' - +# all steps +steps: CHANGE_MATERIAL0, CHANGE_MATERIAL1, CHANGE_MATERIAL2, CHANGE_MATERIAL3, CHANGE_MATERIAL4, CHANGE_MATERIAL5, CHANGE_MATERIAL6, CHANGE_MATERIAL7 +# variable +variable_selected_e: 'extruder' +variable_action: 'all' +variable_material: 'another' # ---------------------------------------------------------------------------step0 -[wizard_step CHANGE_MATERIAL_0] +[wizard_step CHANGE_MATERIAL0] image: wizards/change_material/change_material.jpg landscape: false description: This wizard will help you to change insert or remove the material @@ -18,214 +21,197 @@ warning: none countdown: 0 info: none action_gcode: - {action_respond_info('-------------------start CHANGE_MATERIAL_0')} - SET_WIZARD_ENABLE WIZARD=CHANGE_MATERIAL ENABLE=1 # ERROR=error_message -cancel_gcode: - {action_respond_info('------------------CANCEL STEP_0')} - RESET_WIZARD WIZARD={wizard} - # HOME_POSITION ABORT=1 - -[wizard_step_button CHANGE_MATERIAL_BUTTON_0] -image: none -landscape: false -description: START -warning: none -countdown: none -info: none -button_STEP_BUTTON_1_gcode: - {action_respond_info('-------------------CHANGE_MATERIAL_BUTTON_0')} - {% if printer.extruders|int > 1 %} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL_1 + {action_respond_info('-------------------action_gcode CHANGE_MATERIAL0')} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + {% if printer.extruder and printer.extruder1 %} + {action_respond_info('-------------------CHANGE_MATERIAL0 more extruders')} + SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 {% else %} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL_2 + {action_respond_info('-------------------CHANGE_MATERIAL0 one extruder')} + SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ACTIVATE_EXTRUDER EXTRUDER=extruder {% endif %} -action_gcode: - # pass cancel_gcode: - # pass + {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL0')} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 # ---------------------------------------------------------------------------step1 -[wizard_step CHANGE_MATERIAL_1] +[wizard_step_selector CHANGE_MATERIAL1] image: wizards/change_material/change_material01.jpg landscape: false description: Select the extruder where you want change the material warning: none countdown: 1 info: none -action_gcode: - # pass -cancel_gcode: - {action_respond_info('------------------CANCEL STEP_0')} - RESET_WIZARD WIZARD={wizard} - # HOME_POSITION ABORT=1 - -[wizard_step_selector CHANGE_MATERIAL_SELECTOR_1] -image: none -landscape: false -description: none -warning: none -countdown: none -info: none items: extruder, extruder1 -#select_gcode: -action_gcode: - {% set selected = printer['wizard_step_selector CHANGE_MATERIAL_SELECTOR_1'].selected %} - ACTIVATE_EXTRUDER EXTRUDER={selected} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={} -cancel_gcode: - # pass - -[wizard_step_button CHANGE_MATERIAL_BUTTON_1] -image: none -landscape: false -description: NEXT -warning: none -countdown: none -info: none -button_STEP_BUTTON_1_gcode: - {action_respond_info('-------------------CHANGE_MATERIAL_BUTTON_1')} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL_2 action_gcode: - # pass + {action_respond_info('------------------action_gcode CHANGE_MATERIAL1')} + {% set selected_e = printer['wizard_step_selector CHANGE_MATERIAL1'].selected %} + {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL_1 selected_e=%s' % selected_e)} + ACTIVATE_EXTRUDER EXTRUDER={selected_e} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL2 cancel_gcode: - # pass + {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL1')} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +select_gcode: + {action_respond_info('-------------------select_gcode CHANGE_MATERIAL1 selected=%s, wizard=%s' % (selected, wizard.name))} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=selected_e VALUE={selected} # ---------------------------------------------------------------------------step2 -[wizard_step CHANGE_MATERIAL_2] +[wizard_step_selector CHANGE_MATERIAL2] image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed action warning: none countdown: 2 info: none +items: insert, eject, all action_gcode: - # pass + {action_respond_info('------------------action_gcode CHANGE_MATERIAL2')} + {% set action = printer['wizard CHANGE_MATERIAL'].action|default('all') %} + {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL2 action=%s' % action)} + {% if action == 'all' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 + {% elif action == 'insert' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 + {% elif action == 'eject' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 + {% endif %} cancel_gcode: - {action_respond_info('------------------CANCEL STEP_0')} - RESET_WIZARD WIZARD={wizard} + {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL_2')} + RESET_WIZARD WIZARD={wizard.name} # HOME_POSITION ABORT=1 - -[wizard_step_selector CHANGE_MATERIAL_SELECTOR_2] -image: none -landscape: false -description: none -warning: none -countdown: none -info: none -items: Insert, Change, Remove select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL_SELECTOR_2 selected=%s, wizard=%s' % (selected, wizard))} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=needed_action VALUE={selected} -action_gcode: - # pass -cancel_gcode: - # pass + {action_respond_info('-------------------select_gcode CHANGE_MATERIAL2 selected=%s, wizard=%s' % (selected, wizard.name))} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} -[wizard_step_button CHANGE_MATERIAL_BUTTON_2] -image: none -landscape: false -description: NEXT -warning: none -countdown: none -info: none -button_STEP_BUTTON_1_gcode: - {action_respond_info('-------------------CHANGE_MATERIAL_BUTTON_2')} - {% if wizard.variables['needed_action'] == 'Insert' %} - SET_WIZARD_STEP WIZARD={wizard} STEP=CHANGE_MATERIAL_4 # ?????????????????????????? - {% else %} - SET_WIZARD_STEP WIZARD={wizard} STEP=CHANGE_MATERIAL_3 - {% endif %} -action_gcode: - # pass -cancel_gcode: - # pass +# ---------------------------------------------------------------------------step3 ?????????????????????????????????????? -# ---------------------------------------------------------------------------step3 -[wizard_step CHANGE_MATERIAL_3] -# change or reemove material +[wizard_step_selector CHANGE_MATERIAL3] # component: 'material-selector', image: wizards/change_material/change_material02.jpg landscape: false description: Select Current Material warning: none -countdown: 2 +countdown: 3 info: none +items: another, Stereotech action_gcode: - # pass + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} + {% set material = printer['wizard_step_selector CHANGE_MATERIAL3'].selected|default('') %} + {% if material == 'another' %} + {action_respond_info('-------------------material=%s' % material)} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 + {% elif material == 'Stereotech' %} + {action_respond_info('-------------------material2=%s' % material)} + # load data end set temperature + # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 + {% endif %} cancel_gcode: - {action_respond_info('------------------CANCEL CHANGE_MATERIAL_3')} - RESET_WIZARD WIZARD={wizard} + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} # HOME_POSITION ABORT=1 +select_gcode: + {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} + # SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=material VALUE={selected} + +# ---------------------------------------------------------------------------step4 -[wizard_step_selector CHANGE_MATERIAL_SELECTOR_3_0] -image: none +[wizard_step_slider CHANGE_MATERIAL4] +image: wizards/change_material/change_material02.jpg landscape: false -description: Manufacturer select +description: Select unloading temperature warning: none -countdown: none +countdown: 4 info: none -items: Stereotech, Another -select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL_SELECTOR_3_0 selected=%s, wizard=%s' % (selected, wizard))} - SET_WIZARD_VARIABLE WIZARD={wizard} VARIABLE=manufacturer_select VALUE={selected} +slider_slider1_min: 150 +slider_slider1_max: 300 +slider_slider1_step: 5 +slider_slider1_default: 240 action_gcode: - # pass + {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|default(240)|int %} + {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} + SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 + M109 S{current_value} cancel_gcode: - # pass + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 + +# ---------------------------------------------------------------------------step5 -[wizard_step_selector CHANGE_MATERIAL_SELECTOR_3_1] -image: none +[wizard_step_button CHANGE_MATERIAL5] +image: wizards/change_material/change_material03.jpg landscape: false -description: Seria select +description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading warning: none -countdown: none +countdown: 5 info: none -items: Proto, Enduse, Fiberpart, Sealant -select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL_SELECTOR_2 selected=%s, wizard=%s' % (selected, wizard))} - SET_WIZARD_VARIABLE WIZARD={wizard} VARIABLE=seria_select VALUE={selected} - WIZARD_STEP_SELECT WIZARD={wizard} STEP=CHANGE_MATERIAL_SELECTOR_3_2 ITEM= action_gcode: - # pass + {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} + {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} + {% if action == 'remove' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 + {% elif action == 'all' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 + {% endif %} cancel_gcode: - # pass + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +button_eject_gcode: + {action_respond_info('-------------------button_eject_gcode')} + EJECT_MATERIAL +button_load_gcode: + {action_respond_info('-------------------button_load_gcode')} + LOAD_MATERIAL -Name select -ABS G4 -# step 4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# # ---------------------------------------------------------------------------step6 -[wizard_step_selector CHANGE_MATERIAL_SELECTOR_3_2] -image: none +[wizard_step_button CHANGE_MATERIAL6] +image: wizards/change_material/change_material04.jpg landscape: false -description: Name selected +description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle warning: none -countdown: none +countdown: 6 info: none -items: PLA, PVA, Remove -select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL_SELECTOR_2 selected=%s, wizard=%s' % (selected, wizard))} - SET_WIZARD_VARIABLE WIZARD={wizard} VARIABLE=data1 VALUE={selected} action_gcode: - # pass + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 cancel_gcode: - # pass - - -[wizard_step_selector MY] -image: none + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +button_retract_gcode: + {action_respond_info('-------------------button_retract_gcode')} + RETRACT_MATERIAL +button_load_gcode: + {action_respond_info('-------------------button_load_gcode')} + LOAD_MATERIAL +button_insert_gcode: + {action_respond_info('-------------------button_insert_gcode')} + INSERT_MATERIAL + +# # ---------------------------------------------------------------------------step7 + +[wizard_step CHANGE_MATERIAL7] +image: wizards/change_material/change_material.jpg landscape: false -description: none +description: Material change completed warning: none -countdown: none +countdown: 7 info: none -items: PLA, PVA, Remove -select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL_SELECTOR_2 selected=%s, wizard=%s' % (selected, wizard))} - SET_WIZARD_VARIABLE WIZARD={wizard} VARIABLE=data1 VALUE={selected} action_gcode: - # pass + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=0 + RESET_WIZARD WIZARD={wizard.name} cancel_gcode: - # pass \ No newline at end of file + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 diff --git a/stereotech_config/wizards/change_material_cmd.cfg b/stereotech_config/wizards/change_material_cmd.cfg new file mode 100644 index 000000000000..c2449679651d --- /dev/null +++ b/stereotech_config/wizards/change_material_cmd.cfg @@ -0,0 +1,54 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder1 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=all +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=eject +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 ITEM=another +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 ITEM=Stereotech +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=eject +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 + + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 BUTTON=again +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 From 4206dda30966c92d04f046b47ddddba5d067f96e Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 17 Jan 2024 12:02:00 +0000 Subject: [PATCH 02/65] STEAPP-872: added the wizard change_material. --- HTE530-5-4-22.cfg | 6 +- stereotech_config/wizards/change_material.cfg | 182 ++++++++++++------ .../wizards/change_material_cmd.cfg | 35 +++- 3 files changed, 162 insertions(+), 61 deletions(-) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index b23921b92c8b..c583d95ab95b 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -26,6 +26,10 @@ path: /home/ste/uploads [include stereotech_config/calibrate/probe_v1.cfg] [include stereotech_config/calibrate/probe_v2.cfg] +# wizards +# [include stereotech_config/wizards/wizards.cfg] +[include stereotech_config/wizards/change_material.cfg] + [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] [include stereotech_config/common/nozzle_offset.cfg] @@ -42,7 +46,7 @@ path: /home/ste/uploads [include stereotech_config/common/variables.cfg] [include stereotech_config/common/diagnostics.cfg] -[include stereotech_config/wizards/wizards.cfg] + [gcode_macro CONSTANTS] description: Holds printer constants diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 0916925ba22a..a5e052232f87 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -4,37 +4,34 @@ image: wizards/change_material/change_material.jpg # 5d, 3d, any type: any # all steps -steps: CHANGE_MATERIAL0, CHANGE_MATERIAL1, CHANGE_MATERIAL2, CHANGE_MATERIAL3, CHANGE_MATERIAL4, CHANGE_MATERIAL5, CHANGE_MATERIAL6, CHANGE_MATERIAL7 +steps: CHANGE_MATERIAL0, CHANGE_MATERIAL1, CHANGE_MATERIAL2, CHANGE_MATERIAL3, CHANGE_MATERIAL4, CHANGE_MATERIAL5, CHANGE_MATERIAL6, CHANGE_MATERIAL7, CHANGE_MATERIAL8, CHANGE_MATERIAL9, CHANGE_MATERIAL10, , CHANGE_MATERIAL11 # variable variable_selected_e: 'extruder' variable_action: 'all' variable_material: 'another' - # ---------------------------------------------------------------------------step0 [wizard_step CHANGE_MATERIAL0] image: wizards/change_material/change_material.jpg landscape: false description: This wizard will help you to change insert or remove the material -warning: none +warning: Missing extruder countdown: 0 info: none action_gcode: - {action_respond_info('-------------------action_gcode CHANGE_MATERIAL0')} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 {% if printer.extruder and printer.extruder1 %} - {action_respond_info('-------------------CHANGE_MATERIAL0 more extruders')} + {action_respond_info('-------------------action_gcode %s, extruder > 1' % (wizard.wizard_step_name, ))} SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 {% else %} - {action_respond_info('-------------------CHANGE_MATERIAL0 one extruder')} + {action_respond_info('-------------------action_gcode %s, extruder == 1' % (wizard.wizard_step_name, ))} SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ACTIVATE_EXTRUDER EXTRUDER=extruder {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL0')} + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 # ---------------------------------------------------------------------------step1 @@ -43,21 +40,19 @@ image: wizards/change_material/change_material01.jpg landscape: false description: Select the extruder where you want change the material warning: none -countdown: 1 +countdown: 0 info: none items: extruder, extruder1 action_gcode: - {action_respond_info('------------------action_gcode CHANGE_MATERIAL1')} {% set selected_e = printer['wizard_step_selector CHANGE_MATERIAL1'].selected %} - {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL_1 selected_e=%s' % selected_e)} + {action_respond_info('-------------------wizard_step_selector %s, selected_e=%s' % (wizard.wizard_step_name, selected_e))} ACTIVATE_EXTRUDER EXTRUDER={selected_e} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL2 cancel_gcode: - {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL1')} + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL1 selected=%s, wizard=%s' % (selected, wizard.name))} + {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=selected_e VALUE={selected} # ---------------------------------------------------------------------------step2 @@ -67,47 +62,41 @@ image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed action warning: none -countdown: 2 +countdown: 0 info: none items: insert, eject, all action_gcode: - {action_respond_info('------------------action_gcode CHANGE_MATERIAL2')} - {% set action = printer['wizard CHANGE_MATERIAL'].action|default('all') %} + {% set action = printer['wizard CHANGE_MATERIAL'].action %} {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL2 action=%s' % action)} - {% if action == 'all' %} + {% if action == 'insert' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 + {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 - {% elif action == 'insert' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 - {% elif action == 'eject' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 {% endif %} cancel_gcode: {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL_2')} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 select_gcode: {action_respond_info('-------------------select_gcode CHANGE_MATERIAL2 selected=%s, wizard=%s' % (selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} -# ---------------------------------------------------------------------------step3 ?????????????????????????????????????? - +# ---------------------------------------------------------------------------step3 [wizard_step_selector CHANGE_MATERIAL3] # component: 'material-selector', image: wizards/change_material/change_material02.jpg landscape: false description: Select Current Material warning: none -countdown: 3 +countdown: 0 info: none items: another, Stereotech action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} - {% set material = printer['wizard_step_selector CHANGE_MATERIAL3'].selected|default('') %} + {% set material = printer['wizard_step_selector CHANGE_MATERIAL3'].selected %} + {action_respond_info('-------------------action_gcode %s, material=%s' % (wizard.wizard_step_name, material))} {% if material == 'another' %} - {action_respond_info('-------------------material=%s' % material)} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 {% elif material == 'Stereotech' %} - {action_respond_info('-------------------material2=%s' % material)} # load data end set temperature # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 @@ -115,10 +104,8 @@ action_gcode: cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 select_gcode: {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} - # SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=material VALUE={selected} # ---------------------------------------------------------------------------step4 @@ -127,14 +114,14 @@ image: wizards/change_material/change_material02.jpg landscape: false description: Select unloading temperature warning: none -countdown: 4 +countdown: 0 info: none slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|default(240)|int %} + {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|int %} {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 @@ -142,52 +129,116 @@ action_gcode: cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 # ---------------------------------------------------------------------------step5 -[wizard_step_button CHANGE_MATERIAL5] +[wizard_step_button CHANGE_MATERIAL5] # !!!!!!! placeholder: 'wizard-step-preheat', image: wizards/change_material/change_material03.jpg landscape: false description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading warning: none -countdown: 5 +countdown: 0 info: none action_gcode: {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} + M109 S{current_value} {% if action == 'remove' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 - {% elif action == 'all' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL #111111111111111111111111111111111111111111111111 + {% else %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -button_eject_gcode: +button_unload_gcode: {action_respond_info('-------------------button_eject_gcode')} EJECT_MATERIAL button_load_gcode: {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL -# # ---------------------------------------------------------------------------step6 +# ---------------------------------------------------------------------------step6 + +[wizard_step_selector CHANGE_MATERIAL6] # component: 'material-selector', +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select loaded material +warning: none +countdown: 0 +info: none +items: another, Stereotech +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} + {% set material = printer['wizard_step_selector CHANGE_MATERIAL6'].selected %} + {action_respond_info('-------------------action_gcode %s, material=%s' % (wizard.wizard_step_name, material))} + {% if material == 'another' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 + {% elif material == 'Stereotech' %} + # load data end set temperature + # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 + {% endif %} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} +select_gcode: + {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} + +# ---------------------------------------------------------------------------step7 + +[wizard_step_slider CHANGE_MATERIAL7] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select loading temperature +warning: none +countdown: 0 +info: none +slider_slider1_min: 150 +slider_slider1_max: 300 +slider_slider1_step: 5 +slider_slider1_default: 240 +action_gcode: + {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|int %} + {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} + SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 + M109 S{current_value} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + +# ---------------------------------------------------------------------------step8 -[wizard_step_button CHANGE_MATERIAL6] +[wizard_step CHANGE_MATERIAL8] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', +image: wizards/change_material/change_material.jpg +landscape: false +description: Load new spool insert material into bowden tube and press Next button +warning: none +countdown: 0 +info: none +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} + RESET_WIZARD WIZARD={wizard.name} + +# ---------------------------------------------------------------------------step9 + +[wizard_step_button CHANGE_MATERIAL9] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', image: wizards/change_material/change_material04.jpg landscape: false description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle warning: none -countdown: 6 +countdown: 0 info: none action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 button_retract_gcode: {action_respond_info('-------------------button_retract_gcode')} RETRACT_MATERIAL @@ -198,20 +249,43 @@ button_insert_gcode: {action_respond_info('-------------------button_insert_gcode')} INSERT_MATERIAL -# # ---------------------------------------------------------------------------step7 +# ---------------------------------------------------------------------------step10 -[wizard_step CHANGE_MATERIAL7] +# FOR FIBER +[wizard_step_button CHANGE_MATERIAL10] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', +image: wizards/change_material/change_material04.jpg +landscape: false +description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times +warning: none +countdown: 0 +info: none +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} + RESET_WIZARD WIZARD={wizard.name} +button_retract_gcode: + {action_respond_info('-------------------button_retract_gcode')} + RETRACT_MATERIAL +button_load_gcode: + {action_respond_info('-------------------button_load_gcode')} + LOAD_MATERIAL + +# ---------------------------------------------------------------------------step11 + +[wizard_step CHANGE_MATERIAL11] image: wizards/change_material/change_material.jpg landscape: false description: Material change completed warning: none -countdown: 7 +countdown: 0 info: none action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=0 + TURN_OFF_HEATERS RESET_WIZARD WIZARD={wizard.name} + G28 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 diff --git a/stereotech_config/wizards/change_material_cmd.cfg b/stereotech_config/wizards/change_material_cmd.cfg index c2449679651d..4fa0d49f8adb 100644 --- a/stereotech_config/wizards/change_material_cmd.cfg +++ b/stereotech_config/wizards/change_material_cmd.cfg @@ -34,21 +34,44 @@ CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 # ---------------------------------step5 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=eject +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=unload WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=load CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 - # ---------------------------------step6 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=load -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 BUTTON=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 ITEM=another +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 ITEM=Stereotech CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 # ---------------------------------step7 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 BUTTON=again +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 SLIDER=slider1 VALUE=125 CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 + +# ---------------------------------step9 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 + +# ---------------------------------step10 ( FOR FIBER ) + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 + +# ---------------------------------step11 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 From b0d12809a8aee96f221d271081aadfe8d27b5b3c Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 17 Jan 2024 12:54:24 +0000 Subject: [PATCH 03/65] STEAPP-872: added the wizard change_module. --- stereotech_config/wizards/change_module.cfg | 208 ++++++++++++++++++ .../wizards/change_module_cmd.cfg | 54 +++++ 2 files changed, 262 insertions(+) create mode 100644 stereotech_config/wizards/change_module.cfg create mode 100644 stereotech_config/wizards/change_module_cmd.cfg diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg new file mode 100644 index 000000000000..3038eeacaf37 --- /dev/null +++ b/stereotech_config/wizards/change_module.cfg @@ -0,0 +1,208 @@ +[wizard CHANGE_MODULE] +# image path +image: wizards/change_module/change_module.jpg +# 5d, 3d, any +type: any +# all steps +steps: CHANGE_MODULE0, CHANGE_MODULE1, CHANGE_MODULE2, CHANGE_MODULE3, CHANGE_MODULE4, CHANGE_MODULE5, CHANGE_MODULE6, CHANGE_MODULE7 +# # variable +# variable_selected_e: 'extruder' +# variable_action: 'all' +# variable_material: 'another' + + +# ---------------------------------------------------------------------------step0 + +[wizard_step CHANGE_MODULE0] +image: wizards/change_material/change_material.jpg +landscape: false +description: This wizard will help you change module. To remove the module, loosen the fixing nuts on the left and right (two on each side) using the supplied wrench, then carefully pull the module towards you until it stops. Once the nuts line up with the vertical slot, pull the module up. Disconnect the module cable from the connector. +warning: Missing extruder +countdown: 0 +info: none +action_gcode: + {action_respond_info('-------------------action_gcode %s' % wizard.wizard_step_name)} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 + +# ---------------------------------------------------------------------------step1 + +[wizard_step_buttons CHANGE_MODULE1] +image: wizards/change_module/change_module1.jpg +landscape: false +description: Power off printer and disconnect it from power source. Then you could change module according to the manual +warning: none +countdown: 1 +info: none +items: extruder, extruder1 +action_gcode: + {% set selected_e = printer['wizard_step_selector CHANGE_MODULE1'].selected %} + {action_respond_info('-------------------wizard_step_selector %s selected_e=%s' % (wizard_step_name, selected_e))} + ACTIVATE_EXTRUDER EXTRUDER={selected_e} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE2 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +button_power_off_now_gcode: + {action_respond_info('-------------------button_button2_gcode')} + +# ---------------------------------------------------------------------------step2 + +[wizard_step_selector CHANGE_MODULE2] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select the needed action +warning: none +countdown: 2 +info: none +items: insert, eject, all +action_gcode: + {action_respond_info('------------------action_gcode %s' % wizard.name)} + {% set action = printer['wizard CHANGE_MODULE'].action|default('all') %} + {action_respond_info('-------------------wizard_step_selector CHANGE_MODULE2 action=%s' % action)} + {% if action == 'all' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE3 + {% elif action == 'insert' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE6 + {% elif action == 'eject' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE4 + {% endif %} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +select_gcode: + {action_respond_info('-------------------select_gcode CHANGE_MODULE2 selected=%s, wizard=%s' % (selected, wizard.name))} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} + +# ---------------------------------------------------------------------------step3 ?????????????????????????????????????? + + +[wizard_step_selector CHANGE_MODULE3] # component: 'material-selector', +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select Current Material +warning: none +countdown: 3 +info: none +items: another, Stereotech +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} + {% set material = printer['wizard_step_selector CHANGE_MODULE3'].selected|default('') %} + {% if material == 'another' %} + {action_respond_info('-------------------material=%s' % material)} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE4 + {% elif material == 'Stereotech' %} + {action_respond_info('-------------------material2=%s' % material)} + # load data end set temperature + # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE5 + {% endif %} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +select_gcode: + {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} + # SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=material VALUE={selected} + +# ---------------------------------------------------------------------------step4 + +[wizard_step_slider CHANGE_MODULE4] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select unloading temperature +warning: none +countdown: 4 +info: none +slider_slider1_min: 150 +slider_slider1_max: 300 +slider_slider1_step: 5 +slider_slider1_default: 240 +action_gcode: + {% set current_value = printer["wizard_step_slider CHANGE_MODULE4"].slider1|default(240)|int %} + {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} + SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE5 + M109 S{current_value} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 + +# ---------------------------------------------------------------------------step5 + +[wizard_step_button CHANGE_MODULE5] +image: wizards/change_material/change_material03.jpg +landscape: false +description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading +warning: none +countdown: 5 +info: none +action_gcode: + {% set action = printer['wizard CHANGE_MODULE'].variables.action %} + {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} + {% if action == 'remove' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE9 + {% elif action == 'all' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE3 + {% endif %} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +button_eject_gcode: + {action_respond_info('-------------------button_eject_gcode')} + EJECT_MODULE +button_load_gcode: + {action_respond_info('-------------------button_load_gcode')} + LOAD_MODULE + +# # ---------------------------------------------------------------------------step6 + +[wizard_step_button CHANGE_MODULE6] +image: wizards/change_material/change_material04.jpg +landscape: false +description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle +warning: none +countdown: 6 +info: none +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE7 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 +button_retract_gcode: + {action_respond_info('-------------------button_retract_gcode')} + RETRACT_MODULE +button_load_gcode: + {action_respond_info('-------------------button_load_gcode')} + LOAD_MODULE +button_insert_gcode: + {action_respond_info('-------------------button_insert_gcode')} + INSERT_MODULE + +# # ---------------------------------------------------------------------------step7 + +[wizard_step CHANGE_MODULE7] +image: wizards/change_material/change_material.jpg +landscape: false +description: Material change completed +warning: none +countdown: 7 +info: none +action_gcode: + {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=0 + RESET_WIZARD WIZARD={wizard.name} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % wizard.name)} + RESET_WIZARD WIZARD={wizard.name} + # HOME_POSITION ABORT=1 diff --git a/stereotech_config/wizards/change_module_cmd.cfg b/stereotech_config/wizards/change_module_cmd.cfg new file mode 100644 index 000000000000..6a34fdc4674a --- /dev/null +++ b/stereotech_config/wizards/change_module_cmd.cfg @@ -0,0 +1,54 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 ITEM=extruder +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 ITEM=extruder1 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=all +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=eject +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 ITEM=another +WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 ITEM=Stereotech +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 BUTTON=eject +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 + + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 BUTTON=again +CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 From f017d1080822a9a0dd6651136f5bacc88fd1a8ed Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 08:17:25 +0000 Subject: [PATCH 04/65] STEAPP-872: added the wizard change_material. --- stereotech_config/wizards/change_material.cfg | 114 +++++++++++------- stereotech_config/wizards/wizards.cfg | 10 +- 2 files changed, 76 insertions(+), 48 deletions(-) diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index a5e052232f87..6d8ad22a7ddb 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -82,30 +82,28 @@ select_gcode: # ---------------------------------------------------------------------------step3 -[wizard_step_selector CHANGE_MATERIAL3] # component: 'material-selector', +[wizard_step_tree CHANGE_MATERIAL3] image: wizards/change_material/change_material02.jpg landscape: false description: Select Current Material warning: none countdown: 0 info: none -items: another, Stereotech +tree_file_path: wizards/data/materials.json +depth: 3 +types: manufacturer, series, name action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} - {% set material = printer['wizard_step_selector CHANGE_MATERIAL3'].selected %} - {action_respond_info('-------------------action_gcode %s, material=%s' % (wizard.wizard_step_name, material))} - {% if material == 'another' %} + {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} + {% set selected = printer['wizard_step_tree CHANGE_MATERIAL3'].selected %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% if temperature >= 110.0 and selected == 'Stereotech' %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} + {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 - {% elif material == 'Stereotech' %} - # load data end set temperature - # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 {% endif %} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -select_gcode: - {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} # ---------------------------------------------------------------------------step4 @@ -121,30 +119,28 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|int %} - {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} - SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 - M109 S{current_value} + {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|float %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} # ---------------------------------------------------------------------------step5 -[wizard_step_button CHANGE_MATERIAL5] # !!!!!!! placeholder: 'wizard-step-preheat', +[wizard_step_button CHANGE_MATERIAL5] image: wizards/change_material/change_material03.jpg landscape: false description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading warning: none countdown: 0 info: none +placeholder: wizard-step-preheat action_gcode: {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} - M109 S{current_value} {% if action == 'remove' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL #111111111111111111111111111111111111111111111111 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 {% endif %} @@ -160,30 +156,51 @@ button_load_gcode: # ---------------------------------------------------------------------------step6 -[wizard_step_selector CHANGE_MATERIAL6] # component: 'material-selector', +[wizard_step_selector CHANGE_MATERIAL6] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select Current Material +warning: none +countdown: 0 +info: none +tree_file_path: /home/ste/klippy_dev/klipper/stereotech_config/wizards/data/materials.json +depth: 3 +types: manufacturer, series, name +action_gcode: + {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} + {% set selected = printer['wizard_step_tree CHANGE_MATERIAL3'].selected %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% if temperature >= 110.0 and selected == 'Stereotech' %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} + {% else %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 + {% endif %} +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_tree CHANGE_MATERIAL6] image: wizards/change_material/change_material02.jpg landscape: false description: Select loaded material warning: none countdown: 0 info: none -items: another, Stereotech +tree_file_path: ./wizards/data/materials.json +depth: 3 +types: manufacturer, series, name action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} - {% set material = printer['wizard_step_selector CHANGE_MATERIAL6'].selected %} - {action_respond_info('-------------------action_gcode %s, material=%s' % (wizard.wizard_step_name, material))} - {% if material == 'another' %} + {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL6'].value|float %} + {% set selected = printer['wizard_step_tree CHANGE_MATERIAL6'].selected %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% if temperature >= 110.0 and selected == 'Stereotech' %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} + {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 - {% elif material == 'Stereotech' %} - # load data end set temperature - # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 {% endif %} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -select_gcode: - {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} # ---------------------------------------------------------------------------step7 @@ -199,40 +216,41 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set current_value = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|int %} - {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} - SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 - M109 S{current_value} + {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} # ---------------------------------------------------------------------------step8 -[wizard_step CHANGE_MATERIAL8] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', +[wizard_step CHANGE_MATERIAL8] image: wizards/change_material/change_material.jpg landscape: false description: Load new spool insert material into bowden tube and press Next button warning: none countdown: 0 info: none +placeholder: wizard-step-preheat action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 + {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} + {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} # ---------------------------------------------------------------------------step9 -[wizard_step_button CHANGE_MATERIAL9] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', +[wizard_step_button CHANGE_MATERIAL9] image: wizards/change_material/change_material04.jpg landscape: false description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle warning: none countdown: 0 info: none +placeholder: wizard-step-preheat action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 @@ -252,13 +270,14 @@ button_insert_gcode: # ---------------------------------------------------------------------------step10 # FOR FIBER -[wizard_step_button CHANGE_MATERIAL10] # !!!!!!!!!!!!!!!!!!!!!!!!!!!!! placeholder: 'wizard-step-preheat', +[wizard_step_button CHANGE_MATERIAL10] image: wizards/change_material/change_material04.jpg landscape: false description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times warning: none countdown: 0 info: none +placeholder: wizard-step-preheat action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 @@ -289,3 +308,14 @@ action_gcode: cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} + +[gcode_macro CHANGE_STEP_AND_WAIT_HEATING] +gcode: + {% set wizard = params.WIZARD %} + {% set step = params.STEP %} + {% set temperature = params.TEMP %} + SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={temperature} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard} STEP={step} + M109 S{temperature} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 diff --git a/stereotech_config/wizards/wizards.cfg b/stereotech_config/wizards/wizards.cfg index ec43a4a274d1..5bf60610cd2b 100644 --- a/stereotech_config/wizards/wizards.cfg +++ b/stereotech_config/wizards/wizards.cfg @@ -59,7 +59,7 @@ description: description STEP_0 warning: warning STEP_0 countdown: 10 info: info about STSTEP_0 -placeholder: path/to/wizard/placeholder +placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} {action_respond_info('-------------------start STEP_0')} @@ -75,7 +75,7 @@ description: description STEP_BUTTON_1 warning: warning STEP_BUTTON_1 countdown: 20 info: info about STEP_BUTTON_1 -placeholder: path/to/wizard/placeholder +placeholder: wizard-step-preheat button_button_1_gcode: {action_respond_info('-------------------button_button_1_gcode')} button_button2_gcode: @@ -154,7 +154,7 @@ info: info about STEP_JOG_1 axes: x, y, z, a, c steps: 0.1, 1, 10, 20 default_step: 10 -placeholder: path/to/wizard/placeholder +placeholder: wizard-step-preheat jog_gcode: {action_respond_info('-------------------jog_gcode STEP_JOG_1 (G1 %s%s, direction=%s)' % (axis|upper, step, direction))} action_gcode: @@ -186,10 +186,8 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step_tree STEP_TREE_1] -# tree_file_path: /home/ste/klippy_dev/klipper/klippy/data/materials.json tree_file_path: /home/ste/klippy_dev/klipper/stereotech_config/wizards/data/materials.json -depth: 3 # (глубина дерева) -# (типы на каждой глубине) +depth: 3 types: manufacturer, series, name action_gcode: {action_respond_info('-------------------action_gcode %s' % wizard.wizard_step_name)} From 49d8eca778218bfdb8e5cf704af1b55bc2bdc885 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 09:44:09 +0000 Subject: [PATCH 05/65] STEAPP-872: added the wizard change_material. --- stereotech_config/wizards/change_material.cfg | 70 ++-------- .../wizards/change_material_cmd.cfg | 6 +- stereotech_config/wizards/data/materials.json | 121 +++++++++++++++--- 3 files changed, 111 insertions(+), 86 deletions(-) diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 6d8ad22a7ddb..4bfd2ce4be52 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -1,16 +1,9 @@ [wizard CHANGE_MATERIAL] -# image path image: wizards/change_material/change_material.jpg -# 5d, 3d, any type: any -# all steps steps: CHANGE_MATERIAL0, CHANGE_MATERIAL1, CHANGE_MATERIAL2, CHANGE_MATERIAL3, CHANGE_MATERIAL4, CHANGE_MATERIAL5, CHANGE_MATERIAL6, CHANGE_MATERIAL7, CHANGE_MATERIAL8, CHANGE_MATERIAL9, CHANGE_MATERIAL10, , CHANGE_MATERIAL11 -# variable variable_selected_e: 'extruder' variable_action: 'all' -variable_material: 'another' - -# ---------------------------------------------------------------------------step0 [wizard_step CHANGE_MATERIAL0] image: wizards/change_material/change_material.jpg @@ -33,8 +26,6 @@ cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step1 - [wizard_step_selector CHANGE_MATERIAL1] image: wizards/change_material/change_material01.jpg landscape: false @@ -44,7 +35,7 @@ countdown: 0 info: none items: extruder, extruder1 action_gcode: - {% set selected_e = printer['wizard_step_selector CHANGE_MATERIAL1'].selected %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {action_respond_info('-------------------wizard_step_selector %s, selected_e=%s' % (wizard.wizard_step_name, selected_e))} ACTIVATE_EXTRUDER EXTRUDER={selected_e} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL2 @@ -55,8 +46,6 @@ select_gcode: {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=selected_e VALUE={selected} -# ---------------------------------------------------------------------------step2 - [wizard_step_selector CHANGE_MATERIAL2] image: wizards/change_material/change_material02.jpg landscape: false @@ -66,7 +55,7 @@ countdown: 0 info: none items: insert, eject, all action_gcode: - {% set action = printer['wizard CHANGE_MATERIAL'].action %} + {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL2 action=%s' % action)} {% if action == 'insert' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 @@ -80,8 +69,6 @@ select_gcode: {action_respond_info('-------------------select_gcode CHANGE_MATERIAL2 selected=%s, wizard=%s' % (selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} -# ---------------------------------------------------------------------------step3 - [wizard_step_tree CHANGE_MATERIAL3] image: wizards/change_material/change_material02.jpg landscape: false @@ -94,9 +81,8 @@ depth: 3 types: manufacturer, series, name action_gcode: {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} - {% set selected = printer['wizard_step_tree CHANGE_MATERIAL3'].selected %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - {% if temperature >= 110.0 and selected == 'Stereotech' %} + {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 @@ -105,8 +91,6 @@ cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step4 - [wizard_step_slider CHANGE_MATERIAL4] image: wizards/change_material/change_material02.jpg landscape: false @@ -126,8 +110,6 @@ cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step5 - [wizard_step_button CHANGE_MATERIAL5] image: wizards/change_material/change_material03.jpg landscape: false @@ -154,31 +136,6 @@ button_load_gcode: {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL -# ---------------------------------------------------------------------------step6 - -[wizard_step_selector CHANGE_MATERIAL6] -image: wizards/change_material/change_material02.jpg -landscape: false -description: Select Current Material -warning: none -countdown: 0 -info: none -tree_file_path: /home/ste/klippy_dev/klipper/stereotech_config/wizards/data/materials.json -depth: 3 -types: manufacturer, series, name -action_gcode: - {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} - {% set selected = printer['wizard_step_tree CHANGE_MATERIAL3'].selected %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - {% if temperature >= 110.0 and selected == 'Stereotech' %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} - {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 - {% endif %} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} - RESET_WIZARD WIZARD={wizard.name} - [wizard_step_tree CHANGE_MATERIAL6] image: wizards/change_material/change_material02.jpg landscape: false @@ -186,14 +143,13 @@ description: Select loaded material warning: none countdown: 0 info: none -tree_file_path: ./wizards/data/materials.json +tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL6'].value|float %} - {% set selected = printer['wizard_step_tree CHANGE_MATERIAL6'].selected %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - {% if temperature >= 110.0 and selected == 'Stereotech' %} + {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 @@ -202,8 +158,6 @@ cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step7 - [wizard_step_slider CHANGE_MATERIAL7] image: wizards/change_material/change_material02.jpg landscape: false @@ -223,8 +177,6 @@ cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step8 - [wizard_step CHANGE_MATERIAL8] image: wizards/change_material/change_material.jpg landscape: false @@ -234,15 +186,14 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} + {% set temperature = printer[selected_e].target|float %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} -# ---------------------------------------------------------------------------step9 - [wizard_step_button CHANGE_MATERIAL9] image: wizards/change_material/change_material04.jpg landscape: false @@ -267,8 +218,6 @@ button_insert_gcode: {action_respond_info('-------------------button_insert_gcode')} INSERT_MATERIAL -# ---------------------------------------------------------------------------step10 - # FOR FIBER [wizard_step_button CHANGE_MATERIAL10] image: wizards/change_material/change_material04.jpg @@ -291,8 +240,6 @@ button_load_gcode: {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL -# ---------------------------------------------------------------------------step11 - [wizard_step CHANGE_MATERIAL11] image: wizards/change_material/change_material.jpg landscape: false @@ -314,7 +261,8 @@ gcode: {% set wizard = params.WIZARD %} {% set step = params.STEP %} {% set temperature = params.TEMP %} - SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={temperature} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} + SET_HEATER_TEMPERATURE HEATER={selected_e} TARGET={temperature} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 SET_WIZARD_STEP WIZARD={wizard} STEP={step} M109 S{temperature} diff --git a/stereotech_config/wizards/change_material_cmd.cfg b/stereotech_config/wizards/change_material_cmd.cfg index 4fa0d49f8adb..c875c877a0da 100644 --- a/stereotech_config/wizards/change_material_cmd.cfg +++ b/stereotech_config/wizards/change_material_cmd.cfg @@ -21,8 +21,7 @@ CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 # ---------------------------------step3 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 ITEM=another -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 ITEM=Stereotech +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 KEY=pva CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 # ---------------------------------step4 @@ -41,9 +40,8 @@ CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 # ---------------------------------step6 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 ITEM=another -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 ITEM=Stereotech CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 KEY=pla # ---------------------------------step7 diff --git a/stereotech_config/wizards/data/materials.json b/stereotech_config/wizards/data/materials.json index c376353f11f2..f8ac13dc6af8 100644 --- a/stereotech_config/wizards/data/materials.json +++ b/stereotech_config/wizards/data/materials.json @@ -3,49 +3,128 @@ "key": "stereotech", "children": [ { - "key": "proto", + "key": "Proto", "children": [ { - "key": "pla", + "key": "PLA", "value": 205 }, { - "key": "pva", - "value": 206 + "key": "PVA", + "value": 200 } ] - } - ] - }, - { - "key": "stereotech1", - "children": [ + }, { - "key": "proto1", + "key": "Enduse", "children": [ { - "key": "pla1", - "value": 207 + "key": "ABS", + "value": 250 + }, + { + "key": "SBS", + "value": 230 + }, + { + "key": "PETG", + "value": 230 + }, + { + "key": "TPU D70", + "value": 217 + }, + { + "key": "PP", + "value": 225 }, { - "key": "pva1", - "value": 208 + "key": "PA6", + "value": 260 + }, + { + "key": "PC", + "value": 280 } ] }, { - "key": "proto2", + "key": "Fiberpart", "children": [ { - "key": "pla2", - "value": 209 + "key": "ABS G4", + "value": 242 + }, + { + "key": "ABS G13", + "value": 270 }, { - "key": "pva2", - "value": 210 + "key": "TPU C5", + "value": 227 + }, + { + "key": "TPU G30", + "value": 240 + }, + { + "key": "ABSPA G8", + "value": 280 + }, + { + "key": "PA12 G12", + "value": 250 + }, + { + "key": "PP G30", + "value": 290 + }, + { + "key": "PC G20", + "value": 290 + } + ] + }, + { + "key": "Sealant", + "children": [ + { + "key": "TPU A95", + "value": 212 + }, + { + "key": "TPU A93", + "value": 200 + }, + { + "key": "TPU A90", + "value": 225 + }, + { + "key": "SEBS", + "value": 232 + } + ] + }, + { + "key": "Metalcast", + "children": [ + { + "key": "Metalcast-316", + "value": 240 + } + ] + }, + { + "key": "ContiFiber", + "children": [ + { + "key": "ContiFiber CPA", + "value": 270 } ] } + ] } -] \ No newline at end of file +] From 09debb28f3a6d39393851a01f55bcbda4fc563e7 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 11:57:22 +0000 Subject: [PATCH 06/65] STEAPP-872: added the wizard change_module. --- HTE530-5-4-22.cfg | 1 + klippy/extras/wizard/wizard_step.py | 2 + stereotech_config/wizards/change_module.cfg | 188 +----------------- .../wizards/change_module_cmd.cfg | 41 +--- 4 files changed, 15 insertions(+), 217 deletions(-) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index c583d95ab95b..f71f48b3b837 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -29,6 +29,7 @@ path: /home/ste/uploads # wizards # [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/change_material.cfg] +[include stereotech_config/wizards/change_module.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/klippy/extras/wizard/wizard_step.py b/klippy/extras/wizard/wizard_step.py index f91f93fc6fef..3d45def8614a 100644 --- a/klippy/extras/wizard/wizard_step.py +++ b/klippy/extras/wizard/wizard_step.py @@ -67,8 +67,10 @@ def cmd(self, gcmd, gcode): self.in_script = True try: if gcode == 'action_gcode': + gcmd.respond_info("-------------------action_gcode %s" % (self.name,)) self.template_action.run_gcode_from_command(kwparams) elif gcode == 'cancel_gcode': + gcmd.respond_info("-------------------cancel_gcode %s" % (self.name,)) self.template_cancel.run_gcode_from_command(kwparams) finally: self.in_script = False diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index 3038eeacaf37..f7280c22a4a4 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -1,208 +1,42 @@ [wizard CHANGE_MODULE] -# image path image: wizards/change_module/change_module.jpg -# 5d, 3d, any type: any -# all steps -steps: CHANGE_MODULE0, CHANGE_MODULE1, CHANGE_MODULE2, CHANGE_MODULE3, CHANGE_MODULE4, CHANGE_MODULE5, CHANGE_MODULE6, CHANGE_MODULE7 -# # variable -# variable_selected_e: 'extruder' -# variable_action: 'all' -# variable_material: 'another' - - -# ---------------------------------------------------------------------------step0 +steps: CHANGE_MODULE0, CHANGE_MODULE1, CHANGE_MODULE2 [wizard_step CHANGE_MODULE0] -image: wizards/change_material/change_material.jpg +image: wizards/change_module/change_module.jpg landscape: false description: This wizard will help you change module. To remove the module, loosen the fixing nuts on the left and right (two on each side) using the supplied wrench, then carefully pull the module towards you until it stops. Once the nuts line up with the vertical slot, pull the module up. Disconnect the module cable from the connector. -warning: Missing extruder countdown: 0 info: none action_gcode: - {action_respond_info('-------------------action_gcode %s' % wizard.wizard_step_name)} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 - -# ---------------------------------------------------------------------------step1 -[wizard_step_buttons CHANGE_MODULE1] +[wizard_step_button CHANGE_MODULE1] image: wizards/change_module/change_module1.jpg landscape: false description: Power off printer and disconnect it from power source. Then you could change module according to the manual -warning: none -countdown: 1 +warning: Calibration required after module change +countdown: 0 info: none -items: extruder, extruder1 action_gcode: - {% set selected_e = printer['wizard_step_selector CHANGE_MODULE1'].selected %} - {action_respond_info('-------------------wizard_step_selector %s selected_e=%s' % (wizard_step_name, selected_e))} - ACTIVATE_EXTRUDER EXTRUDER={selected_e} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE2 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -button_power_off_now_gcode: - {action_respond_info('-------------------button_button2_gcode')} - -# ---------------------------------------------------------------------------step2 - -[wizard_step_selector CHANGE_MODULE2] -image: wizards/change_material/change_material02.jpg -landscape: false -description: Select the needed action -warning: none -countdown: 2 -info: none -items: insert, eject, all -action_gcode: - {action_respond_info('------------------action_gcode %s' % wizard.name)} - {% set action = printer['wizard CHANGE_MODULE'].action|default('all') %} - {action_respond_info('-------------------wizard_step_selector CHANGE_MODULE2 action=%s' % action)} - {% if action == 'all' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE3 - {% elif action == 'insert' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE6 - {% elif action == 'eject' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE4 - {% endif %} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MODULE2 selected=%s, wizard=%s' % (selected, wizard.name))} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} - -# ---------------------------------------------------------------------------step3 ?????????????????????????????????????? - - -[wizard_step_selector CHANGE_MODULE3] # component: 'material-selector', -image: wizards/change_material/change_material02.jpg -landscape: false -description: Select Current Material -warning: none -countdown: 3 -info: none -items: another, Stereotech -action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name, ))} - {% set material = printer['wizard_step_selector CHANGE_MODULE3'].selected|default('') %} - {% if material == 'another' %} - {action_respond_info('-------------------material=%s' % material)} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE4 - {% elif material == 'Stereotech' %} - {action_respond_info('-------------------material2=%s' % material)} - # load data end set temperature - # SET_HEATER_TEMPERATURE HEATER=extruder TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE5 - {% endif %} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -select_gcode: - {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} - # SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=material VALUE={selected} - -# ---------------------------------------------------------------------------step4 - -[wizard_step_slider CHANGE_MODULE4] -image: wizards/change_material/change_material02.jpg -landscape: false -description: Select unloading temperature -warning: none -countdown: 4 -info: none -slider_slider1_min: 150 -slider_slider1_max: 300 -slider_slider1_step: 5 -slider_slider1_default: 240 -action_gcode: - {% set current_value = printer["wizard_step_slider CHANGE_MODULE4"].slider1|default(240)|int %} - {action_respond_info('-------------------action_gcode %s, current_value=%s' % (wizard.wizard_step_name, current_value))} - SET_HEATER_TEMPERATURE HEATER={printer.toolhead.extruder} TARGET={current_value} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE5 - M109 S{current_value} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 - -# ---------------------------------------------------------------------------step5 +button_power_off_gcode: + POWER_OFF -[wizard_step_button CHANGE_MODULE5] -image: wizards/change_material/change_material03.jpg -landscape: false -description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading -warning: none -countdown: 5 -info: none -action_gcode: - {% set action = printer['wizard CHANGE_MODULE'].variables.action %} - {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} - {% if action == 'remove' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE9 - {% elif action == 'all' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE3 - {% endif %} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -button_eject_gcode: - {action_respond_info('-------------------button_eject_gcode')} - EJECT_MODULE -button_load_gcode: - {action_respond_info('-------------------button_load_gcode')} - LOAD_MODULE - -# # ---------------------------------------------------------------------------step6 - -[wizard_step_button CHANGE_MODULE6] -image: wizards/change_material/change_material04.jpg -landscape: false -description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle -warning: none -countdown: 6 -info: none -action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE7 -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 -button_retract_gcode: - {action_respond_info('-------------------button_retract_gcode')} - RETRACT_MODULE -button_load_gcode: - {action_respond_info('-------------------button_load_gcode')} - LOAD_MODULE -button_insert_gcode: - {action_respond_info('-------------------button_insert_gcode')} - INSERT_MODULE - -# # ---------------------------------------------------------------------------step7 - -[wizard_step CHANGE_MODULE7] -image: wizards/change_material/change_material.jpg +[wizard_step CHANGE_MODULE2] +image: wizards/change_module/change_module.jpg landscape: false -description: Material change completed +description: Change Module complete warning: none -countdown: 7 +countdown: 0 info: none action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=0 RESET_WIZARD WIZARD={wizard.name} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.name)} RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 diff --git a/stereotech_config/wizards/change_module_cmd.cfg b/stereotech_config/wizards/change_module_cmd.cfg index 6a34fdc4674a..e7171133727d 100644 --- a/stereotech_config/wizards/change_module_cmd.cfg +++ b/stereotech_config/wizards/change_module_cmd.cfg @@ -6,49 +6,10 @@ CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE0 # --------------------------------step1 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 ITEM=extruder -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 ITEM=extruder1 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 BUTTON=power_off CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 # ---------------------------------step2 EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=all -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=insert -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 ITEM=eject CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE2 - -# ---------------------------------step3 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 ITEM=another -WIZARD_STEP_SELECT WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 ITEM=Stereotech -CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE3 - -# ---------------------------------step4 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 -WIZARD_STEP_SLIDER WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 SLIDER=slider1 VALUE=125 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE4 - -# ---------------------------------step5 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 BUTTON=eject -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 BUTTON=load -CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE5 - - -# ---------------------------------step6 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=load -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 BUTTON=insert -CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE6 - -# ---------------------------------step7 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 BUTTON=again -CANCEL_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE7 From d49d6dfc91f34aa708ebfc0df2979c10b83f73c8 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 12:19:32 +0000 Subject: [PATCH 07/65] STEAPP-872: added the wizard adjust_basement (wizard_step_wizards). --- HTE530-5-4-22.cfg | 1 + .../wizards/change_adjust_basement.cfg | 17 +++++++++++++++++ .../wizards/change_adjust_basement_cmd.cfg | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 stereotech_config/wizards/change_adjust_basement.cfg create mode 100644 stereotech_config/wizards/change_adjust_basement_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index f71f48b3b837..755713b57175 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -30,6 +30,7 @@ path: /home/ste/uploads # [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_module.cfg] +[include stereotech_config/wizards/adjust_basement.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/change_adjust_basement.cfg b/stereotech_config/wizards/change_adjust_basement.cfg new file mode 100644 index 000000000000..fd249ff23f7f --- /dev/null +++ b/stereotech_config/wizards/change_adjust_basement.cfg @@ -0,0 +1,17 @@ +[wizard ADJUST_BASEMENT] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +type: 5d +steps: ADJUST_BASEMENT0 + +[wizard_step_wizards ADJUST_BASEMENT0] +image: none +landscape: false +description: Choose the required manager +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + # pass +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_adjust_basement_cmd.cfg b/stereotech_config/wizards/change_adjust_basement_cmd.cfg new file mode 100644 index 000000000000..d87ca471dc29 --- /dev/null +++ b/stereotech_config/wizards/change_adjust_basement_cmd.cfg @@ -0,0 +1,4 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 From 636a222cdf73e0a168f5684e12cd1579efc2e258 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 12:20:32 +0000 Subject: [PATCH 08/65] STEAPP-872: added the wizard adjust_basement (wizard_step_wizards). --- stereotech_config/wizards/adjust_basement.cfg | 17 +++++++++++++++++ .../wizards/adjust_basement_cmd.cfg | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 stereotech_config/wizards/adjust_basement.cfg create mode 100644 stereotech_config/wizards/adjust_basement_cmd.cfg diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg new file mode 100644 index 000000000000..fd249ff23f7f --- /dev/null +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -0,0 +1,17 @@ +[wizard ADJUST_BASEMENT] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +type: 5d +steps: ADJUST_BASEMENT0 + +[wizard_step_wizards ADJUST_BASEMENT0] +image: none +landscape: false +description: Choose the required manager +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + # pass +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement_cmd.cfg b/stereotech_config/wizards/adjust_basement_cmd.cfg new file mode 100644 index 000000000000..d87ca471dc29 --- /dev/null +++ b/stereotech_config/wizards/adjust_basement_cmd.cfg @@ -0,0 +1,4 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 From fa212bb2a7d9631696c4f6c3be24fa8f2bf624d6 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 12:20:46 +0000 Subject: [PATCH 09/65] STEAPP-872: added the wizard adjust_basement (wizard_step_wizards). --- .../wizards/change_adjust_basement.cfg | 17 ----------------- .../wizards/change_adjust_basement_cmd.cfg | 4 ---- 2 files changed, 21 deletions(-) delete mode 100644 stereotech_config/wizards/change_adjust_basement.cfg delete mode 100644 stereotech_config/wizards/change_adjust_basement_cmd.cfg diff --git a/stereotech_config/wizards/change_adjust_basement.cfg b/stereotech_config/wizards/change_adjust_basement.cfg deleted file mode 100644 index fd249ff23f7f..000000000000 --- a/stereotech_config/wizards/change_adjust_basement.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[wizard ADJUST_BASEMENT] -image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg -type: 5d -steps: ADJUST_BASEMENT0 - -[wizard_step_wizards ADJUST_BASEMENT0] -image: none -landscape: false -description: Choose the required manager -warning: none -countdown: 0 -info: none -action_gcode: - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 - # pass -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_adjust_basement_cmd.cfg b/stereotech_config/wizards/change_adjust_basement_cmd.cfg deleted file mode 100644 index d87ca471dc29..000000000000 --- a/stereotech_config/wizards/change_adjust_basement_cmd.cfg +++ /dev/null @@ -1,4 +0,0 @@ -# -------------------------------step 0 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 From 539ea8eff6dd34c546cbb563eb72253318f555a4 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 12:58:53 +0000 Subject: [PATCH 10/65] STEAPP-872: added the wizard change_material. --- stereotech_config/wizards/change_material.cfg | 26 +++++++------------ stereotech_config/wizards/common.cfg | 11 ++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 stereotech_config/wizards/common.cfg diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 4bfd2ce4be52..9810f92956b1 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -81,9 +81,10 @@ depth: 3 types: manufacturer, series, name action_gcode: {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} {% if temperature >= 110.0 %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 {% endif %} @@ -104,8 +105,9 @@ slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|float %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} @@ -148,9 +150,10 @@ depth: 3 types: manufacturer, series, name action_gcode: {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL6'].value|float %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} {% if temperature >= 110.0 %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 {% endif %} @@ -171,8 +174,9 @@ slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} + {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} @@ -189,7 +193,7 @@ action_gcode: {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} {% set temperature = printer[selected_e].target|float %} {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} @@ -255,15 +259,3 @@ action_gcode: cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} - -[gcode_macro CHANGE_STEP_AND_WAIT_HEATING] -gcode: - {% set wizard = params.WIZARD %} - {% set step = params.STEP %} - {% set temperature = params.TEMP %} - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - SET_HEATER_TEMPERATURE HEATER={selected_e} TARGET={temperature} - WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard} STEP={step} - M109 S{temperature} - WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg new file mode 100644 index 000000000000..bd6ebe6c3f3a --- /dev/null +++ b/stereotech_config/wizards/common.cfg @@ -0,0 +1,11 @@ +[gcode_macro CHANGE_STEP_AND_WAIT_HEATING] +gcode: + {% set wizard = params.WIZARD %} + {% set step = params.STEP %} + {% set temperature = params.TEMP %} + {% set selected_e = params.EXTRUDER %} + SET_HEATER_TEMPERATURE HEATER={selected_e} TARGET={temperature} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard} STEP={step} + M109 S{temperature} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 From 77b52c0eae765611f3f4cc3d217a3d2f7a92b46f Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 13:21:48 +0000 Subject: [PATCH 11/65] STEAPP-872: added the wizard clear_nozzle. --- stereotech_config/wizards/clear_nozzle.cfg | 46 ++++++++++++++++++++++ stereotech_config/wizards/common.cfg | 7 ++++ 2 files changed, 53 insertions(+) create mode 100644 stereotech_config/wizards/clear_nozzle.cfg diff --git a/stereotech_config/wizards/clear_nozzle.cfg b/stereotech_config/wizards/clear_nozzle.cfg new file mode 100644 index 000000000000..d326e2f9f23b --- /dev/null +++ b/stereotech_config/wizards/clear_nozzle.cfg @@ -0,0 +1,46 @@ +[wizard CLEAR_NOZZLE] +image: none +type: 5d +steps: CLEAR_NOZZLE0, CLEAR_NOZZLE1, CLEAR_NOZZLE2 + +[wizard_step CLEAR_NOZZLE0] +image: none +landscape: false +description: ClearNozzle.ClearNozzle +warning: none +countdown: 0 +info: none +action_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION_HEAD + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE1 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CLEAR_NOZZLE1] +image: none +landscape: false +description: ClearNozzle.WaitHeating +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + RETRACT_MATERIAL + SET_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CLEAR_NOZZLE2] +image: none +landscape: false +description: ClearNozzle.NozzleClear +warning: none +countdown: 0 +info: none +action_gcode: + TURN_OFF_HEATERS + RESET_WIZARD WIZARD={wizard.name} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index bd6ebe6c3f3a..28725b246a79 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -9,3 +9,10 @@ gcode: SET_WIZARD_STEP WIZARD={wizard} STEP={step} M109 S{temperature} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 + +[gcode_macro RESET_WIZARD] +rename_existing: RESET_WIZARD_OLD +gcode: + {% set wizard = params.WIZARD %} + TURN_OFF_HEATERS + RESET_WIZARD_OLD WIZARD={wizard} From 9e9adeab77707e11b166e5894c7413724492ec22 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 13:25:41 +0000 Subject: [PATCH 12/65] STEAPP-872: added the wizard clear_nozzle. --- HTE530-5-4-22.cfg | 1 + .../adjust_basement_auto_cmd.cfg} | 0 .../{ => cmd_debug}/adjust_basement_cmd.cfg | 0 .../wizards/cmd_debug/change_material_cmd.cfg | 75 +++++++++++++++++++ .../{ => cmd_debug}/change_module_cmd.cfg | 0 .../wizards/cmd_debug/clear_nozzle_cmd.cfg | 14 ++++ 6 files changed, 90 insertions(+) rename stereotech_config/wizards/{change_material_cmd.cfg => cmd_debug/adjust_basement_auto_cmd.cfg} (100%) rename stereotech_config/wizards/{ => cmd_debug}/adjust_basement_cmd.cfg (100%) create mode 100644 stereotech_config/wizards/cmd_debug/change_material_cmd.cfg rename stereotech_config/wizards/{ => cmd_debug}/change_module_cmd.cfg (100%) create mode 100644 stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 755713b57175..b8b59134d133 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -31,6 +31,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_module.cfg] [include stereotech_config/wizards/adjust_basement.cfg] +[include stereotech_config/wizards/clear_nozzle.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/change_material_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg similarity index 100% rename from stereotech_config/wizards/change_material_cmd.cfg rename to stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg diff --git a/stereotech_config/wizards/adjust_basement_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg similarity index 100% rename from stereotech_config/wizards/adjust_basement_cmd.cfg rename to stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg diff --git a/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg b/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg new file mode 100644 index 000000000000..c875c877a0da --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg @@ -0,0 +1,75 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder1 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=all +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=eject +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 KEY=pva +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=unload +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 KEY=pla + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 + +# ---------------------------------step9 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 + +# ---------------------------------step10 ( FOR FIBER ) + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 + +# ---------------------------------step11 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 diff --git a/stereotech_config/wizards/change_module_cmd.cfg b/stereotech_config/wizards/cmd_debug/change_module_cmd.cfg similarity index 100% rename from stereotech_config/wizards/change_module_cmd.cfg rename to stereotech_config/wizards/cmd_debug/change_module_cmd.cfg diff --git a/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg b/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg new file mode 100644 index 000000000000..86afeb5ad8ef --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg @@ -0,0 +1,14 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 +CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 \ No newline at end of file From 1f53b34fa5002147ba386b5951aca6c93f5bdaaf Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 22 Jan 2024 13:33:22 +0000 Subject: [PATCH 13/65] STEAPP-872: added the wizard clear_nozzle. --- HTE530-5-4-22.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index b8b59134d133..4582121afd50 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -28,6 +28,7 @@ path: /home/ste/uploads # wizards # [include stereotech_config/wizards/wizards.cfg] +[include stereotech_config/wizards/common.cfg] [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_module.cfg] [include stereotech_config/wizards/adjust_basement.cfg] From 327472a0869fd3dc3bd5237e2b2c1fb127c1ba84 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 23 Jan 2024 13:30:32 +0000 Subject: [PATCH 14/65] STEAPP-872: added the wizard adjust_basement_auto. --- HTE530-5-4-22.cfg | 3 +- klippy/extras/wizard/wizard_step.py | 2 +- stereotech_config/wizards/adjust_basement.cfg | 4 +- .../wizards/adjust_basement_auto.cfg | 157 ++++++++++++++++++ stereotech_config/wizards/change_material.cfg | 4 +- stereotech_config/wizards/change_module.cfg | 2 +- stereotech_config/wizards/clear_nozzle.cfg | 46 ----- .../cmd_debug/adjust_basement_auto_cmd.cfg | 86 ++++------ .../wizards/cmd_debug/clear_nozzle_cmd.cfg | 13 +- stereotech_config/wizards/common.cfg | 58 +++++++ 10 files changed, 262 insertions(+), 113 deletions(-) create mode 100644 stereotech_config/wizards/adjust_basement_auto.cfg delete mode 100644 stereotech_config/wizards/clear_nozzle.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 4582121afd50..c9205e17dcdc 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -32,7 +32,8 @@ path: /home/ste/uploads [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_module.cfg] [include stereotech_config/wizards/adjust_basement.cfg] -[include stereotech_config/wizards/clear_nozzle.cfg] +[include stereotech_config/wizards/adjust_basement_auto.cfg] + [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/klippy/extras/wizard/wizard_step.py b/klippy/extras/wizard/wizard_step.py index 3d45def8614a..da9997a16dc6 100644 --- a/klippy/extras/wizard/wizard_step.py +++ b/klippy/extras/wizard/wizard_step.py @@ -40,7 +40,7 @@ def __init__(self, config): cmd_WIZARD_STEP_LOADING_STATE_help = "Change state for show the placeholder" def cmd_WIZARD_STEP_LOADING_STATE(self, gcmd): - state = gcmd.get('ENABLE', 0) + state = gcmd.get_int('ENABLE', 0) self.loading = True if state else False cmd_EXECUTE_WIZARD_STEP_help = "Run gcode in the 'action_gcode' option" diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index fd249ff23f7f..06a328add8c7 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -10,8 +10,8 @@ description: Choose the required manager warning: none countdown: 0 info: none +wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL action_gcode: - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 - # pass + RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg new file mode 100644 index 000000000000..cbdafff1c533 --- /dev/null +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -0,0 +1,157 @@ +[wizard ADJUST_BASEMENT_AUTO] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +type: 5d +steps: ADJUST_BASEMENT_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7, ADJUST_BASEMENT_AUTO8 +variable_continue_from_step: '' + +[wizard_step_button ADJUST_BASEMENT_AUTO0] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +landscape: false +description: 5DCalibrationAuto.Description +warning: 5DCalibrationAuto.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + TURN_OFF_HEATERS + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_AUTO1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO1] +image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg +landscape: false +description: Place the calibration tool into the five axis module and press Next +warning: 5DCalibrationAuto.GapBetweenTemplateModule +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO2] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: Connect probe and press Next +warning: 5DCalibrationAuto.WarningScrew +countdown: 0 +info: none +action_gcode: + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO3] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: 5DCalibrationAuto.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 + CALIBRATE_MODULE_FIVE_D + M400 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO4] +image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg +landscape: false +description: 5DCalibrationAuto.Wait +warning: none +countdown: 420 +info: none +placeholder: waitProgress true +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ADJUST_BASEMENT_AUTO5] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg +landscape: false +description: 5DCalibrationAuto.MoveToSurface +warning: none +countdown: 0 +info: none +axes: z +steps: 0.01, 0.05, 0.1, 1 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO5"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 + SET_WCS_FROM_AUTO_WCS + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button ADJUST_BASEMENT_AUTO6] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: 5DCalibrationAuto.XYCorrectionDescription +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 +button_xy_correction_gcode: + MOVE_TO_AUTO_WCS XY=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ADJUST_BASEMENT_AUTO7] +image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg +landscape: false +description: 5DCalibrationAuto.MoveToHole +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.01, 0.05, 0.1, 1 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO7"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 + SET_WCS_FROM_AUTO_WCS + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO8] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: 5DCalibrationAuto.Finish +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 9810f92956b1..bbd89c12d5a0 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -253,9 +253,7 @@ countdown: 0 info: none action_gcode: {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} - TURN_OFF_HEATERS - RESET_WIZARD WIZARD={wizard.name} - G28 + RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index f7280c22a4a4..fda5a05ea853 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -37,6 +37,6 @@ warning: none countdown: 0 info: none action_gcode: - RESET_WIZARD WIZARD={wizard.name} + RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/clear_nozzle.cfg b/stereotech_config/wizards/clear_nozzle.cfg deleted file mode 100644 index d326e2f9f23b..000000000000 --- a/stereotech_config/wizards/clear_nozzle.cfg +++ /dev/null @@ -1,46 +0,0 @@ -[wizard CLEAR_NOZZLE] -image: none -type: 5d -steps: CLEAR_NOZZLE0, CLEAR_NOZZLE1, CLEAR_NOZZLE2 - -[wizard_step CLEAR_NOZZLE0] -image: none -landscape: false -description: ClearNozzle.ClearNozzle -warning: none -countdown: 0 -info: none -action_gcode: - {% set extruder = printer.toolhead.extruder|default('extruder') %} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 - MOVE_SERVICE_POSITION_HEAD - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE1 TEMP=200 EXTRUDER={extruder} -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step CLEAR_NOZZLE1] -image: none -landscape: false -description: ClearNozzle.WaitHeating -warning: none -countdown: 0 -info: none -placeholder: wizard-step-preheat -action_gcode: - RETRACT_MATERIAL - SET_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step CLEAR_NOZZLE2] -image: none -landscape: false -description: ClearNozzle.NozzleClear -warning: none -countdown: 0 -info: none -action_gcode: - TURN_OFF_HEATERS - RESET_WIZARD WIZARD={wizard.name} -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg index c875c877a0da..126deea7c0bd 100644 --- a/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg @@ -1,75 +1,61 @@ # -------------------------------step 0 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 +WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 + # --------------------------------step1 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder1 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 # ---------------------------------step2 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=all -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=insert -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=eject -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 # ---------------------------------step3 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 -WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 KEY=pva -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 # ---------------------------------step4 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 -WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 SLIDER=slider1 VALUE=125 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 # ---------------------------------step5 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=unload -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=load -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 -# ---------------------------------step6 +# # ---------------------------------step6 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 KEY=pla +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 +WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 BUTTON=xy_correction # ---------------------------------step7 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 -WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 SLIDER=slider1 VALUE=125 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 AXIS=x DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 VALUE=0.1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 # ---------------------------------step8 -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 - -# ---------------------------------step9 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=load -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=insert -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 - -# ---------------------------------step10 ( FOR FIBER ) - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=load -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 - -# ---------------------------------step11 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 diff --git a/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg b/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg index 86afeb5ad8ef..d38a60c0fdc6 100644 --- a/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg @@ -1,14 +1,9 @@ # -------------------------------step 0 -EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE0 -CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE0 +EXECUTE_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE0 # --------------------------------step1 -EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE1 -CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE1 - -# ---------------------------------step2 - -EXECUTE_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 -CANCEL_WIZARD_STEP WIZARD=CLEAR_NOZZLE STEP=CLEAR_NOZZLE2 \ No newline at end of file +EXECUTE_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE1 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 28725b246a79..b03a17532d00 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -14,5 +14,63 @@ gcode: rename_existing: RESET_WIZARD_OLD gcode: {% set wizard = params.WIZARD %} + {% set abort = params.ABORT|default(1)|int %} + CANCEL_TEST_PROBE + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 TURN_OFF_HEATERS + HOME_POSITION ABORT={abort} RESET_WIZARD_OLD WIZARD={wizard} + +[gcode_macro CHANGE_STEP_AND_WAIT_PROBE] +variable_wizard: '' +variable_step: '' +gcode: + {% set wizard = params.WIZARD %} + {% set step = params.STEP %} + SET_GCODE_VARIABLE MACRO=CHANGE_STEP_AND_WAIT_PROBE VARIABLE=wizard VALUE={["'" ~ wizard ~ "'"]} + SET_GCODE_VARIABLE MACRO=CHANGE_STEP_AND_WAIT_PROBE VARIABLE=step VALUE={["'" ~ step ~ "'"]} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard} STEP={step} + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=1.0 + TEST_PROBE + +[delayed_gcode test_probe_loop_two] +gcode: + {% if printer["probe"].last_query %} + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 + {% set wizard = printer["gcode_macro CHANGE_STEP_AND_WAIT_PROBE"].wizard %} + {% set step = printer["gcode_macro CHANGE_STEP_AND_WAIT_PROBE"].step %} + WIZARD_STEP_LOADING_STATE WIZARD={wizard[0]} STEP={step[0]} ENABLE=0 + {% else %} + QUERY_PROBE + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=1.0 + {% endif %} + +[wizard_step CLEAR_NOZZLE0] +image: none +landscape: false +description: ClearNozzle.WaitHeating +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + RETRACT_MATERIAL + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CLEAR_NOZZLE1 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CLEAR_NOZZLE1] +image: none +landscape: false +description: ClearNozzle.NozzleClear +warning: none +countdown: 0 +info: none +action_gcode: + TURN_OFF_HEATERS + MOVE_SERVICE_POSITION + {% set continue_from_step = printer['wizard ' ~ wizard.name].variables.continue_from_step %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={continue_from_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} From afa55758b0193da0351033d7a5798a17408325a1 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 23 Jan 2024 13:57:30 +0000 Subject: [PATCH 15/65] STEAPP-872: added the wizard 5d_calibration_auto. --- HTE530-5-4-22.cfg | 5 +- ...adjust_basement.cfg => 5d_calibration.cfg} | 4 +- ...ement_auto.cfg => 5d_calibration_auto.cfg} | 54 ++++++++-------- .../cmd_debug/5d_calibration_auto_cmd.cfg | 61 +++++++++++++++++++ ...asement_cmd.cfg => 5d_calibration_cmd.cfg} | 0 .../cmd_debug/adjust_basement_auto_cmd.cfg | 61 ------------------- 6 files changed, 93 insertions(+), 92 deletions(-) rename stereotech_config/wizards/{adjust_basement.cfg => 5d_calibration.cfg} (85%) rename stereotech_config/wizards/{adjust_basement_auto.cfg => 5d_calibration_auto.cfg} (66%) create mode 100644 stereotech_config/wizards/cmd_debug/5d_calibration_auto_cmd.cfg rename stereotech_config/wizards/cmd_debug/{adjust_basement_cmd.cfg => 5d_calibration_cmd.cfg} (100%) delete mode 100644 stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index c9205e17dcdc..723c6c139866 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -31,8 +31,9 @@ path: /home/ste/uploads [include stereotech_config/wizards/common.cfg] [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_module.cfg] -[include stereotech_config/wizards/adjust_basement.cfg] -[include stereotech_config/wizards/adjust_basement_auto.cfg] +[include stereotech_config/wizards/5d_calibration.cfg] +[include stereotech_config/wizards/5d_calibration_auto.cfg] +[include stereotech_config/wizards/5d_calibration_manual.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/5d_calibration.cfg similarity index 85% rename from stereotech_config/wizards/adjust_basement.cfg rename to stereotech_config/wizards/5d_calibration.cfg index 06a328add8c7..4137fc19747c 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -1,9 +1,9 @@ -[wizard ADJUST_BASEMENT] +[wizard CALIBRATE_5D] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg type: 5d steps: ADJUST_BASEMENT0 -[wizard_step_wizards ADJUST_BASEMENT0] +[wizard_step_wizards CALIBRATE_5D_0] image: none landscape: false description: Choose the required manager diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg similarity index 66% rename from stereotech_config/wizards/adjust_basement_auto.cfg rename to stereotech_config/wizards/5d_calibration_auto.cfg index cbdafff1c533..0e78092771a2 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -1,10 +1,10 @@ -[wizard ADJUST_BASEMENT_AUTO] +[wizard CALIBRATE_5D_AUTO] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg type: 5d -steps: ADJUST_BASEMENT_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7, ADJUST_BASEMENT_AUTO8 +steps: CALIBRATE_5D_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_AUTO1, CALIBRATE_5D_AUTO2, CALIBRATE_5D_AUTO3, CALIBRATE_5D_AUTO4, CALIBRATE_5D_AUTO5, CALIBRATE_5D_AUTO6, CALIBRATE_5D_AUTO7, CALIBRATE_5D_AUTO8 variable_continue_from_step: '' -[wizard_step_button ADJUST_BASEMENT_AUTO0] +[wizard_step_button CALIBRATE_5D_AUTO0] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg landscape: false description: 5DCalibrationAuto.Description @@ -15,17 +15,17 @@ action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' TURN_OFF_HEATERS MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_AUTO1 + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_AUTO1 CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO1] +[wizard_step CALIBRATE_5D_AUTO1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg landscape: false description: Place the calibration tool into the five axis module and press Next @@ -33,11 +33,11 @@ warning: 5DCalibrationAuto.GapBetweenTemplateModule countdown: 0 info: none action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO2 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO2] +[wizard_step CALIBRATE_5D_AUTO2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: Connect probe and press Next @@ -45,11 +45,11 @@ warning: 5DCalibrationAuto.WarningScrew countdown: 0 info: none action_gcode: - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO3 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO3] +[wizard_step CALIBRATE_5D_AUTO3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg landscape: false description: 5DCalibrationAuto.ConnectAndCheck @@ -58,15 +58,15 @@ countdown: 0 info: none placeholder: wizard-step-probe action_gcode: - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 CALIBRATE_MODULE_FIVE_D M400 - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=0 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 ENABLE=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO4] +[wizard_step CALIBRATE_5D_AUTO4] image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg landscape: false description: 5DCalibrationAuto.Wait @@ -75,11 +75,11 @@ countdown: 420 info: none placeholder: waitProgress true action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO5 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_jog ADJUST_BASEMENT_AUTO5] +[wizard_step_jog CALIBRATE_5D_AUTO5] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg landscape: false description: 5DCalibrationAuto.MoveToSurface @@ -92,19 +92,19 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO5"].step %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_AUTO5"].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 - {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO6 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_button ADJUST_BASEMENT_AUTO6] +[wizard_step_button CALIBRATE_5D_AUTO6] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: 5DCalibrationAuto.XYCorrectionDescription @@ -112,14 +112,14 @@ warning: none countdown: 0 info: none action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 button_xy_correction_gcode: MOVE_TO_AUTO_WCS XY=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO7 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_jog ADJUST_BASEMENT_AUTO7] +[wizard_step_jog CALIBRATE_5D_AUTO7] image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg landscape: false description: 5DCalibrationAuto.MoveToHole @@ -132,19 +132,19 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO7"].step %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_AUTO7"].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 - {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO8] +[wizard_step CALIBRATE_5D_AUTO8] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: 5DCalibrationAuto.Finish diff --git a/stereotech_config/wizards/cmd_debug/5d_calibration_auto_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_auto_cmd.cfg new file mode 100644 index 000000000000..f1a1703a20fd --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/5d_calibration_auto_cmd.cfg @@ -0,0 +1,61 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO0 +WIZARD_STEP_BUTTON WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CLEAR_NOZZLE1 + + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO2 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO3 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO4 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO5 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO5 + +# # ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO6 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO6 +WIZARD_STEP_BUTTON WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO6 BUTTON=xy_correction + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO7 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO7 AXIS=x DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO7 VALUE=0.1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO8 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_AUTO STEP=CALIBRATE_5D_AUTO8 diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg similarity index 100% rename from stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg rename to stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg deleted file mode 100644 index 126deea7c0bd..000000000000 --- a/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg +++ /dev/null @@ -1,61 +0,0 @@ -# -------------------------------step 0 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 -WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 BUTTON=clear_noozle -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 - -# # --------------------------------step0.1 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 - -# --------------------------------step0.2 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 - - -# --------------------------------step1 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 - -# ---------------------------------step2 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 - -# ---------------------------------step3 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 - -# ---------------------------------step4 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 - -# ---------------------------------step5 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 -WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=z DIRECTION=0 -WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 VALUE=1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 - -# # ---------------------------------step6 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 -WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 BUTTON=xy_correction - -# ---------------------------------step7 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 -WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 AXIS=x DIRECTION=0 -WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 VALUE=0.1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 - -# ---------------------------------step8 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 From b4b294376a7f3f2c47925cf408d7a2cb0238cbf4 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 23 Jan 2024 13:57:41 +0000 Subject: [PATCH 16/65] STEAPP-872: added the wizard 5d_calibration_manual. --- .../wizards/5d_calibration_manual.cfg | 157 ++++++++++++++++++ .../cmd_debug/5d_calibration_manual_cmd.cfg | 61 +++++++ 2 files changed, 218 insertions(+) create mode 100644 stereotech_config/wizards/5d_calibration_manual.cfg create mode 100644 stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg new file mode 100644 index 000000000000..cbdafff1c533 --- /dev/null +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -0,0 +1,157 @@ +[wizard ADJUST_BASEMENT_AUTO] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +type: 5d +steps: ADJUST_BASEMENT_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7, ADJUST_BASEMENT_AUTO8 +variable_continue_from_step: '' + +[wizard_step_button ADJUST_BASEMENT_AUTO0] +image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +landscape: false +description: 5DCalibrationAuto.Description +warning: 5DCalibrationAuto.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + TURN_OFF_HEATERS + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_AUTO1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO1] +image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg +landscape: false +description: Place the calibration tool into the five axis module and press Next +warning: 5DCalibrationAuto.GapBetweenTemplateModule +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO2] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: Connect probe and press Next +warning: 5DCalibrationAuto.WarningScrew +countdown: 0 +info: none +action_gcode: + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO3] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: 5DCalibrationAuto.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 + CALIBRATE_MODULE_FIVE_D + M400 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO4] +image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg +landscape: false +description: 5DCalibrationAuto.Wait +warning: none +countdown: 420 +info: none +placeholder: waitProgress true +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ADJUST_BASEMENT_AUTO5] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg +landscape: false +description: 5DCalibrationAuto.MoveToSurface +warning: none +countdown: 0 +info: none +axes: z +steps: 0.01, 0.05, 0.1, 1 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO5"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 + SET_WCS_FROM_AUTO_WCS + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button ADJUST_BASEMENT_AUTO6] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: 5DCalibrationAuto.XYCorrectionDescription +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 +button_xy_correction_gcode: + MOVE_TO_AUTO_WCS XY=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ADJUST_BASEMENT_AUTO7] +image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg +landscape: false +description: 5DCalibrationAuto.MoveToHole +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.01, 0.05, 0.1, 1 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO7"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 + SET_WCS_FROM_AUTO_WCS + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO8] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: 5DCalibrationAuto.Finish +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg new file mode 100644 index 000000000000..126deea7c0bd --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg @@ -0,0 +1,61 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 +WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 + + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 + +# # ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 +WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 BUTTON=xy_correction + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 AXIS=x DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 VALUE=0.1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 From 18249f97b355c97abd99ff45e0e5e07ff148edcb Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 23 Jan 2024 13:58:45 +0000 Subject: [PATCH 17/65] STEAPP-872: added the wizard 5d_calibration. --- stereotech_config/wizards/5d_calibration.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index 4137fc19747c..f974d929d861 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -1,7 +1,7 @@ [wizard CALIBRATE_5D] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg type: 5d -steps: ADJUST_BASEMENT0 +steps: CALIBRATE_5D_0 [wizard_step_wizards CALIBRATE_5D_0] image: none From 77d8d12aa924f4336cd53fbc9b3ece3c2aa0d61e Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 23 Jan 2024 13:59:37 +0000 Subject: [PATCH 18/65] STEAPP-872: added the wizard 5d_calibration. --- stereotech_config/wizards/5d_calibration.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index f974d929d861..8827a9ce2370 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -10,7 +10,7 @@ description: Choose the required manager warning: none countdown: 0 info: none -wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL +wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: From edb7df6358506943488e1c5e907438658dfb3140 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 07:20:00 +0000 Subject: [PATCH 19/65] STEAPP-872: added the wizard 5d_calibration_manual. --- .../wizards/5d_calibration_manual.cfg | 146 +++++++++--------- .../cmd_debug/5d_calibration_manual_cmd.cfg | 70 ++++----- 2 files changed, 106 insertions(+), 110 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index cbdafff1c533..e6ca6f10fdee 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -1,153 +1,149 @@ -[wizard ADJUST_BASEMENT_AUTO] -image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +[wizard CALIBRATE_5D_MANUAL] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg type: 5d -steps: ADJUST_BASEMENT_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7, ADJUST_BASEMENT_AUTO8 +steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, CALIBRATE_5D_MANUAL2, CALIBRATE_5D_MANUAL3, CALIBRATE_5D_MANUAL4, CALIBRATE_5D_MANUAL5, CALIBRATE_5D_MANUAL6 variable_continue_from_step: '' -[wizard_step_button ADJUST_BASEMENT_AUTO0] -image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg +[wizard_step_button CALIBRATE_5D_MANUAL0] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg landscape: false -description: 5DCalibrationAuto.Description -warning: 5DCalibrationAuto.MakeSureFreeOfPlastic +description: This wizard will help you calibrate five axis module +warning: 5DCalibrationManual.MakeSureFreeOfPlastic countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' TURN_OFF_HEATERS MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_AUTO1 + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_MANUAL1 CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO1] +[wizard_step CALIBRATE_5D_MANUAL1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg landscape: false description: Place the calibration tool into the five axis module and press Next -warning: 5DCalibrationAuto.GapBetweenTemplateModule -countdown: 0 -info: none -action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step ADJUST_BASEMENT_AUTO2] -image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false -description: Connect probe and press Next -warning: 5DCalibrationAuto.WarningScrew -countdown: 0 -info: none -action_gcode: - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step ADJUST_BASEMENT_AUTO3] -image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -landscape: false -description: 5DCalibrationAuto.ConnectAndCheck warning: none countdown: 0 info: none -placeholder: wizard-step-probe action_gcode: - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 - CALIBRATE_MODULE_FIVE_D - M400 - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 ENABLE=0 + MOVE_CALIBRATION_POINT POINT=0 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL2 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO4] -image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg +[wizard_step_jog CALIBRATE_5D_MANUAL2] +image: wizards/5d_calibration_manual/5d_calibration6.jpg landscape: false -description: 5DCalibrationAuto.Wait +description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none -countdown: 420 +countdown: 0 info: none -placeholder: waitProgress true +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL2"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL2 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 + SET_A_AXIS_OFFSET_POINT POINT=0 + MOVE_CALIBRATION_POINT POINT=3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL3 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_jog ADJUST_BASEMENT_AUTO5] -image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg +[wizard_step_jog CALIBRATE_5D_MANUAL3] +image: wizards/5d_calibration_manual/5d_calibration9.jpg landscape: false -description: 5DCalibrationAuto.MoveToSurface +description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none countdown: 0 info: none -axes: z -steps: 0.01, 0.05, 0.1, 1 +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO5"].step %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL3"].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 - {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL3 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: - ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 - SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 + SET_A_AXIS_OFFSET_POINT POINT=1 + CALC_A_AXIS_OFFSET + MOVE_WCS_ZERO WCS=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL4 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_button ADJUST_BASEMENT_AUTO6] -image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +[wizard_step_jog CALIBRATE_5D_MANUAL4] +image: wizards/5d_calibration_manual/5d_calibration6.jpg.jpg landscape: false -description: 5DCalibrationAuto.XYCorrectionDescription +description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none countdown: 0 info: none +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL4"].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL4 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 -button_xy_correction_gcode: - MOVE_TO_AUTO_WCS XY=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 + SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 + SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 + MOVE_WCS_ZERO WCS=2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL5 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_jog ADJUST_BASEMENT_AUTO7] -image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg +[wizard_step_jog CALIBRATE_5D_MANUAL5] +image: wizards/5d_calibration_manual/5d_calibration10 landscape: false -description: 5DCalibrationAuto.MoveToHole +description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none countdown: 0 info: none axes: x, y, z -steps: 0.01, 0.05, 0.1, 1 +steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog ADJUST_BASEMENT_AUTO7"].step %} + {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL5"].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 - {action_respond_info('-------------------jog_gcode ADJUST_BASEMENT_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} + {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL5 (G1 %s%s%s} F1500)' % (axis, direction, step))} action_gcode: - ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 - SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO8 + SET_WCS_OFFSET WCS=2 X=0 Y=0 Z=10 + SET_WCS_OFFSET WCS=4 X=0 Y=0 Z=10 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL6 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_AUTO8] -image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +[wizard_step CALIBRATE_5D_MANUAL6] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg landscape: false -description: 5DCalibrationAuto.Finish +description: Five Axis Calibration complete warning: none countdown: 0 info: none diff --git a/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg index 126deea7c0bd..45583f007729 100644 --- a/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_cmd.cfg @@ -1,61 +1,61 @@ # -------------------------------step 0 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 -WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 BUTTON=clear_noozle -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL0 +WIZARD_STEP_BUTTON WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL0 # # --------------------------------step0.1 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE0 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CLEAR_NOZZLE0 # --------------------------------step0.2 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=CLEAR_NOZZLE1 - +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CLEAR_NOZZLE1 # --------------------------------step1 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL1 # ---------------------------------step2 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL2 # ---------------------------------step3 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL3 # ---------------------------------step4 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL4 # ---------------------------------step5 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 -WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=z DIRECTION=0 -WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 VALUE=1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL5 # # ---------------------------------step6 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 -WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 BUTTON=xy_correction - -# ---------------------------------step7 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 -WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 AXIS=x DIRECTION=0 -WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 VALUE=0.1 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 - -# ---------------------------------step8 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO8 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL6 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL STEP=CALIBRATE_5D_MANUAL6 From 95b2758c9506377fa229203130b7a18111b59394 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 08:25:29 +0000 Subject: [PATCH 20/65] STEAPP-872: added the wizard 5d_calibration_manual_old. --- HTE530-5-4-22.cfg | 1 + .../wizards/5d_calibration_manual_old.cfg | 176 ++++++++++++++++++ .../5d_calibration_manual_old_cmd.cfg | 68 +++++++ stereotech_config/wizards/common.cfg | 6 +- 4 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 stereotech_config/wizards/5d_calibration_manual_old.cfg create mode 100644 stereotech_config/wizards/cmd_debug/5d_calibration_manual_old_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 723c6c139866..9986bb2bdfd4 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -34,6 +34,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/5d_calibration.cfg] [include stereotech_config/wizards/5d_calibration_auto.cfg] [include stereotech_config/wizards/5d_calibration_manual.cfg] +[include stereotech_config/wizards/5d_calibration_manual_old.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg new file mode 100644 index 000000000000..561651dfd157 --- /dev/null +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -0,0 +1,176 @@ +[wizard CALIBRATE_5D_MANUAL_OLD] +image: wizards/5d_calibration_manual/5d_calibration1.jpg +type: 5d +steps: CALIBRATE_5D_MANUAL_OLD0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL_OLD1, CALIBRATE_5D_MANUAL_OLD2, CALIBRATE_5D_MANUAL_OLD3, CALIBRATE_5D_MANUAL_OLD4, CALIBRATE_5D_MANUAL_OLD5, CALIBRATE_5D_MANUAL_OLD6, CALIBRATE_5D_MANUAL_OLD7 +variable_continue_from_step: '' +variable_diameter: 0.2 + +[wizard_step_button CALIBRATE_5D_MANUAL_OLD0] +image: wizards/5d_calibration_manual/5d_calibration.jpg +landscape: false +description: This wizard will help you calibrate five axis module +warning: 5DCalibrationManualOld.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + TURN_OFF_HEATERS + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD1 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_MANUAL_OLD1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider CALIBRATE_5D_MANUAL_OLD1] +image:wizards/5d_calibration_manual/5d_calibration2-02.jpg +landscape: false +description: Check the diameter of the calibration tool and press Next +warning: none +countdown: 0 +info: none +slider_set_diameter_min: 0.1 +slider_set_diameter_max: 3 +slider_set_diameter_step: 0.1 +slider_set_diameter_default: 0.2 +action_gcode: + {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=diameter VALUE={diameter} + {action_respond_info('-------------------action_gcode %s, diameter=%s' % (wizard.wizard_step_name, diameter))} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD2 +cancel_gcode: + {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CALIBRATE_5D_MANUAL_OLD2] +image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg +landscape: false +description: Place the calibration tool into the five axis module and press Next +warning: none +countdown: 0 +info: none +action_gcode: + MOVE_CALIBRATION_POINT POINT=0 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog CALIBRATE_5D_MANUAL_OLD3] +image: wizards/5d_calibration_manual/5d_calibration2.jpg +landscape: false +description: Move nozzle to the nearest tip of the calibration tool and press Next +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + SET_A_AXIS_OFFSET_POINT POINT=0 + MOVE_CALIBRATION_POINT POINT=3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD4 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog CALIBRATE_5D_MANUAL_OLD4] +image: wizards/5d_calibration_manual/5d_calibration3.jpg +landscape: false +description: Move nozzle to the nearest tip of the calibration tool and press Next +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + SET_A_AXIS_OFFSET_POINT POINT=1 + CALC_A_AXIS_OFFSET + MOVE_WCS_ZERO WCS=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD5 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog CALIBRATE_5D_MANUAL_OLD5] +image: wizards/5d_calibration_manual/5d_calibration2.jpg +landscape: false +description: Move nozzle to the nearest tip of the calibration tool and press Next +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 + SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 + MOVE_WCS_ZERO WCS=2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD6 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog CALIBRATE_5D_MANUAL_OLD6] +image: wizards/5d_calibration_manual/5d_calibration2-01.jpg +landscape: false +description: Move nozzle to the nearest tip of the calibration tool and press Next +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1.0, 10.0 +default_step: 1 +jog_gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} + G91 + G1 {axis ~ direction ~ step} F1500 + G90 + {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} +action_gcode: + {% set diameter = printer['wizard ' ~ wizard.name].variables.diameter|float %} + {action_respond_info('--------------diameter=%s' % (diameter / 2.0, ))} + SET_WCS_OFFSET WCS=2 X=0 Y=0 Z={diameter / 2.0} + SET_WCS_OFFSET WCS=4 X=0 Y=0 Z={diameter / 2.0} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD7 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CALIBRATE_5D_MANUAL_OLD7] +image: wizards/5d_calibration_manual/5d_calibration.jpg +landscape: false +description: Five Axis Calibration complete +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/5d_calibration_manual_old_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_old_cmd.cfg new file mode 100644 index 000000000000..d34745871428 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/5d_calibration_manual_old_cmd.cfg @@ -0,0 +1,68 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD0 +WIZARD_STEP_BUTTON WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CLEAR_NOZZLE1 + + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD1 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CALIBRATE_5D_MANUAL_OLD1 SLIDER=set_diameter VALUE=0.4 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD1 + +# --------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD2 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD6 + +# # ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD7 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D_MANUAL_OLD STEP=CALIBRATE_5D_MANUAL_OLD7 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index b03a17532d00..7aca0ff2760e 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -15,8 +15,10 @@ rename_existing: RESET_WIZARD_OLD gcode: {% set wizard = params.WIZARD %} {% set abort = params.ABORT|default(1)|int %} - CANCEL_TEST_PROBE - UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 + {% if printer["probe"] %} + CANCEL_TEST_PROBE + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 + {% endif %} TURN_OFF_HEATERS HOME_POSITION ABORT={abort} RESET_WIZARD_OLD WIZARD={wizard} From 029c20ee30ab2a825e6aa610adee98a9f104055f Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 08:27:38 +0000 Subject: [PATCH 21/65] STEAPP-872: added the wizard 5d_calibration_manual. --- stereotech_config/wizards/5d_calibration_manual.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index e6ca6f10fdee..720ec0866ccc 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -51,7 +51,7 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL2"].step %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 @@ -76,7 +76,7 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL3"].step %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 @@ -90,7 +90,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step_jog CALIBRATE_5D_MANUAL4] -image: wizards/5d_calibration_manual/5d_calibration6.jpg.jpg +image: wizards/5d_calibration_manual/5d_calibration6.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none @@ -102,7 +102,7 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL4"].step %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 @@ -116,7 +116,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step_jog CALIBRATE_5D_MANUAL5] -image: wizards/5d_calibration_manual/5d_calibration10 +image: wizards/5d_calibration_manual/5d_calibration10.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next warning: none @@ -128,7 +128,7 @@ default_step: 1 jog_gcode: {% set axis = params.AXIS|default('X')|upper %} {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_MANUAL5"].step %} + {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} G91 G1 {axis ~ direction ~ step} F1500 G90 From 35d95ca295ee185f3084a81169489a7d7b508274 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 08:42:51 +0000 Subject: [PATCH 22/65] STEAPP-872: added the macro JOG_DO_MOVE. --- .../wizards/5d_calibration_auto.cfg | 16 ++-------- .../wizards/5d_calibration_manual.cfg | 32 +++---------------- .../wizards/5d_calibration_manual_old.cfg | 32 +++---------------- stereotech_config/wizards/common.cfg | 11 +++++++ 4 files changed, 21 insertions(+), 70 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index 0e78092771a2..f108c9ed41cd 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -90,13 +90,7 @@ axes: z steps: 0.01, 0.05, 0.1, 1 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_AUTO5"].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_AUTO5 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS @@ -130,13 +124,7 @@ axes: x, y, z steps: 0.01, 0.05, 0.1, 1 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog CALIBRATE_5D_AUTO7"].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_AUTO7 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index 720ec0866ccc..035c4591486d 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -49,13 +49,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL2 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_A_AXIS_OFFSET_POINT POINT=0 MOVE_CALIBRATION_POINT POINT=3 @@ -74,13 +68,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL3 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_A_AXIS_OFFSET_POINT POINT=1 CALC_A_AXIS_OFFSET @@ -100,13 +88,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL4 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 @@ -126,13 +108,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode CALIBRATE_5D_MANUAL5 (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_WCS_OFFSET WCS=2 X=0 Y=0 Z=10 SET_WCS_OFFSET WCS=4 X=0 Y=0 Z=10 diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index 561651dfd157..dea555ef5179 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -70,13 +70,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_A_AXIS_OFFSET_POINT POINT=0 MOVE_CALIBRATION_POINT POINT=3 @@ -95,13 +89,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_A_AXIS_OFFSET_POINT POINT=1 CALC_A_AXIS_OFFSET @@ -121,13 +109,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 @@ -147,13 +129,7 @@ axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 jog_gcode: - {% set axis = params.AXIS|default('X')|upper %} - {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} - {% set step = printer["wizard_step_jog " ~ wizard.wizard_step_name].step %} - G91 - G1 {axis ~ direction ~ step} F1500 - G90 - {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, step))} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: {% set diameter = printer['wizard ' ~ wizard.name].variables.diameter|float %} {action_respond_info('--------------diameter=%s' % (diameter / 2.0, ))} diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 7aca0ff2760e..7cd45da4b76e 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -76,3 +76,14 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={continue_from_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} + +[gcode_macro JOG_DO_MOVE] +gcode: + {% set axis = params.AXIS|default('X')|upper %} + {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} + {% set step_name = params.STEP_NAME %} + {% set val = printer["wizard_step_jog " ~ step_name].step %} + G91 + G1 {axis ~ direction ~ val} F1500 + G90 + {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, val))} From 579ef170fecbf574e9b273b254ad9dc147e92ef1 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 09:19:15 +0000 Subject: [PATCH 23/65] STEAPP-872: added the wizard adjust_basement. --- stereotech_config/wizards/5d_calibration.cfg | 2 +- stereotech_config/wizards/adjust_basement.cfg | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/adjust_basement.cfg diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index 8827a9ce2370..0a812c5f7454 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -12,6 +12,6 @@ countdown: 0 info: none wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 + MOVE_SERVICE_POSITION cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg new file mode 100644 index 000000000000..ee3725baada0 --- /dev/null +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -0,0 +1,17 @@ +[wizard ADJUST_BASEMENT] +image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +type: 5d +steps: ADJUST_BASEMENT0 + +[wizard_step_wizards ADJUST_BASEMENT0] +image: none +landscape: false +description: AdjustManadger.ManagersChoiceDescription +warning: none +countdown: 0 +info: none +wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL +action_gcode: + MOVE_SERVICE_POSITION +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} From da70da87544eef99102d199e8f6a11c7cb849180 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 09:20:53 +0000 Subject: [PATCH 24/65] STEAPP-872: added the wizard adjust_basement. --- stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg | 4 ++-- stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg diff --git a/stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg b/stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg index d87ca471dc29..da7384f3a87c 100644 --- a/stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/5d_calibration_cmd.cfg @@ -1,4 +1,4 @@ # -------------------------------step 0 -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 +EXECUTE_WIZARD_STEP WIZARD=CALIBRATE_5D STEP=CALIBRATE_5D_0 +CANCEL_WIZARD_STEP WIZARD=CALIBRATE_5D STEP=CALIBRATE_5D_0 diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg new file mode 100644 index 000000000000..d87ca471dc29 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_cmd.cfg @@ -0,0 +1,4 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT STEP=ADJUST_BASEMENT0 From fd2c5c9ce2b66913264078a8d74e03012342ffc4 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 24 Jan 2024 14:38:25 +0000 Subject: [PATCH 25/65] STEAPP-872: added the wizard adjust_basement_auto. --- HTE530-5-4-22.cfg | 2 +- .../wizards/adjust_basement_auto.cfg | 137 ++++++++++++++++++ .../cmd_debug/adjust_basement_auto_cmd.cfg | 45 ++++++ stereotech_config/wizards/common.cfg | 26 ++-- 4 files changed, 196 insertions(+), 14 deletions(-) create mode 100644 stereotech_config/wizards/adjust_basement_auto.cfg create mode 100644 stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 9986bb2bdfd4..25bbea5c3cb1 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -35,7 +35,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/5d_calibration_auto.cfg] [include stereotech_config/wizards/5d_calibration_manual.cfg] [include stereotech_config/wizards/5d_calibration_manual_old.cfg] - +[include stereotech_config/wizards/adjust_basement_auto.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg new file mode 100644 index 000000000000..72fd07dd02c5 --- /dev/null +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -0,0 +1,137 @@ +[wizard ADJUST_BASEMENT_AUTO] +image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +type: 5d +steps: ADJUST_BASEMENT_AUTO0, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7 +variable_mode: '' +variable_wcs: 0 + +[wizard_step ADJUST_BASEMENT_AUTO0] +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg +landscape: false +description: This wizard helps you to setup zero point for proper 5D printing +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO1] +image: wizards/zero_point_setup/zero_point_setup04.jpg +landscape: false +description: Please place needed base in the 5D Module and press Next +warning: AdjustBasementAuto.MakeSureBaseProtrudes +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO2] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: Connect probe and press Next +warning: AdjustBasementAuto.WarningScrew +countdown: 0 +info: none +action_gcode: + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO3] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: AdjustBasementAuto.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_selector ADJUST_BASEMENT_AUTO4] +image: wizards/zero_point_setup/zero_point_setup.jpg +landscape: false +description: Please select Printing mode which you want to use +warning: none +countdown: 0 +info: none +items: 5D_spiral, 5D_spiral_full +placeholder: wizard-step-probe +action_gcode: + {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} + {% if mode == '5D_spiral' %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=1 + AUTO_BASEMENT_WCS_MOVE WCS=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 + {% else %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=0 + # enable loading state + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 + AUTO_BASEMENT_WCS + M400 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=0 + {% endif %} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +select_gcode: + {action_respond_info('-------------------select_gcode selected=%s' % (selected, ))} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} + +[wizard_step_jog ADJUST_BASEMENT_AUTO5] +image: wizards/adjust_basement_auto/move-sensor-to-center.jpg +landscape: false +description: AdjustBasementAuto.MoveSensorToCenter +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + # enable loading state + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 + AUTO_BASEMENT_WCS WCS={wcs} + M400 + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO6] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: AdjustBasementAuto.Disable +warning: none +countdown: 0 +info: none +placeholder: waitProgress true +action_gcode: + {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + ADJUST_BASEMENT_WCS WCS={wcs} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_AUTO7] +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg +landscape: false +description: Adjust basement completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg new file mode 100644 index 000000000000..1a2e3eef78dc --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_auto_cmd.cfg @@ -0,0 +1,45 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 ITEM=5D_spiral +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 ITEM=5D_spiral_full +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO5 + +# # ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_AUTO STEP=ADJUST_BASEMENT_AUTO7 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 7cd45da4b76e..33fabd001640 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -10,19 +10,6 @@ gcode: M109 S{temperature} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 -[gcode_macro RESET_WIZARD] -rename_existing: RESET_WIZARD_OLD -gcode: - {% set wizard = params.WIZARD %} - {% set abort = params.ABORT|default(1)|int %} - {% if printer["probe"] %} - CANCEL_TEST_PROBE - UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 - {% endif %} - TURN_OFF_HEATERS - HOME_POSITION ABORT={abort} - RESET_WIZARD_OLD WIZARD={wizard} - [gcode_macro CHANGE_STEP_AND_WAIT_PROBE] variable_wizard: '' variable_step: '' @@ -36,6 +23,19 @@ gcode: UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=1.0 TEST_PROBE +[gcode_macro RESET_WIZARD] +rename_existing: RESET_WIZARD_OLD +gcode: + {% set wizard = params.WIZARD %} + {% set abort = params.ABORT|default(1)|int %} + {% if printer["probe"] %} + CANCEL_TEST_PROBE + UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 + {% endif %} + TURN_OFF_HEATERS + HOME_POSITION ABORT={abort} + RESET_WIZARD_OLD WIZARD={wizard} + [delayed_gcode test_probe_loop_two] gcode: {% if printer["probe"].last_query %} From c8b7e58296deae94227200ff2ff7e979499e73cd Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 07:51:25 +0000 Subject: [PATCH 26/65] STEAPP-872: added the wizard adjust_basement_auto. --- .../wizards/adjust_basement_auto.cfg | 17 ++++------------- stereotech_config/wizards/common.cfg | 11 +++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 72fd07dd02c5..2e0e3012549f 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -73,17 +73,12 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 {% else %} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=0 - # enable loading state - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 - AUTO_BASEMENT_WCS - M400 - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=0 + {% set cmd = 'AUTO_BASEMENT_WCS' %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 CMD={cmd} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: - {action_respond_info('-------------------select_gcode selected=%s' % (selected, ))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} [wizard_step_jog ADJUST_BASEMENT_AUTO5] @@ -100,12 +95,8 @@ jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} - # enable loading state - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 - AUTO_BASEMENT_WCS WCS={wcs} - M400 - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 ENABLE=0 + {% set cmd = 'AUTO_BASEMENT_WCS WCS=' ~ wcs %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 CMD={cmd} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 33fabd001640..69925d35ca1f 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -23,6 +23,17 @@ gcode: UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=1.0 TEST_PROBE +[gcode_macro CHANGE_STEP_AND_WAIT_RUN_CMD] +gcode: + {% set wizard = params.WIZARD %} + {% set step = params.STEP %} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard} STEP={step} + {action_respond_info('-------------------CHANGE_STEP_AND_WAIT_RUN_CMD cmd=%s' % (params.CMD, rawparams))} + {params.CMD} {rawparams} + M400 + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 + [gcode_macro RESET_WIZARD] rename_existing: RESET_WIZARD_OLD gcode: From 86e93173acf1d8564af71d093beb0c6f39d19806 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 07:54:26 +0000 Subject: [PATCH 27/65] STEAPP-872: added macro the CHANGE_STEP_AND_WAIT_RUN_CMD. --- stereotech_config/wizards/5d_calibration_auto.cfg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index f108c9ed41cd..d8672d4174b4 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -58,11 +58,8 @@ countdown: 0 info: none placeholder: wizard-step-probe action_gcode: - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 - CALIBRATE_MODULE_FIVE_D - M400 - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 ENABLE=0 + {% set cmd = 'CALIBRATE_MODULE_FIVE_D' %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 CMD={cmd} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} From 4481226972624e4978cb0c1b1b10baf69f6bb59f Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 07:59:53 +0000 Subject: [PATCH 28/65] STEAPP-872: added the wizard adjust_basement_manual. --- .../wizards/adjust_basement_manual.cfg | 128 ++++++++++++++++++ .../cmd_debug/adjust_basement_manual_cmd.cfg | 45 ++++++ 2 files changed, 173 insertions(+) create mode 100644 stereotech_config/wizards/adjust_basement_manual.cfg create mode 100644 stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg new file mode 100644 index 000000000000..91d8ab61eafe --- /dev/null +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -0,0 +1,128 @@ +[wizard ADJUST_BASEMENT_MANUAL] +image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +type: 5d +steps: ADJUST_BASEMENT_MANUAL0, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL6, ADJUST_BASEMENT_MANUAL7 +variable_mode: '' +variable_wcs: 0 + +[wizard_step ADJUST_BASEMENT_MANUAL0] +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg +landscape: false +description: This wizard helps you to setup zero point for proper 5D printing +warning: none +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL1 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL1] +image: wizards/zero_point_setup/zero_point_setup04.jpg +landscape: false +description: Please place needed base in the 5D Module and press Next +warning: AdjustBasementAuto.MakeSureBaseProtrudes +countdown: 0 +info: none +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL2] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: Connect probe and press Next +warning: AdjustBasementAuto.WarningScrew +countdown: 0 +info: none +action_gcode: + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL3] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: AdjustBasementAuto.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL4 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_selector ADJUST_BASEMENT_MANUAL4] +image: wizards/zero_point_setup/zero_point_setup.jpg +landscape: false +description: Please select Printing mode which you want to use +warning: none +countdown: 0 +info: none +items: 5D_spiral, 5D_spiral_full +placeholder: wizard-step-probe +action_gcode: + {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} + {% if mode == '5D_spiral' %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=1 + AUTO_BASEMENT_WCS_MOVE WCS=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL5 + {% else %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=0 + {% set cmd = 'AUTO_BASEMENT_WCS' %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 CMD={cmd} + {% endif %} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +select_gcode: + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} + +[wizard_step_jog ADJUST_BASEMENT_MANUAL5] +image: wizards/adjust_basement_auto/move-sensor-to-center.jpg +landscape: false +description: AdjustBasementAuto.MoveSensorToCenter +warning: none +countdown: 0 +info: none +axes: x, y, z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + {% set cmd = 'AUTO_BASEMENT_WCS WCS=' ~ wcs %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 CMD={cmd} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL6] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: AdjustBasementAuto.Disable +warning: none +countdown: 0 +info: none +placeholder: waitProgress true +action_gcode: + {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + ADJUST_BASEMENT_WCS WCS={wcs} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL7 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL7] +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg +landscape: false +description: Adjust basement completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg new file mode 100644 index 000000000000..342b26082b1b --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg @@ -0,0 +1,45 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL2 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 ITEM=5D_spiral +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 ITEM=5D_spiral_full +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 + +# # ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL6 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL7 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL7 From 28bd2809dd8f6cca8bb08039f7446b6615b68b20 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 09:22:01 +0000 Subject: [PATCH 29/65] STEAPP-872: added the wizard adjust_basement_manual. --- HTE530-5-4-22.cfg | 4 +- .../wizards/adjust_basement_auto.cfg | 1 - .../wizards/adjust_basement_manual.cfg | 109 ++++++++---------- .../cmd_debug/adjust_basement_manual_cmd.cfg | 29 +++-- 4 files changed, 74 insertions(+), 69 deletions(-) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 25bbea5c3cb1..d9d8fc871897 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -34,8 +34,10 @@ path: /home/ste/uploads [include stereotech_config/wizards/5d_calibration.cfg] [include stereotech_config/wizards/5d_calibration_auto.cfg] [include stereotech_config/wizards/5d_calibration_manual.cfg] -[include stereotech_config/wizards/5d_calibration_manual_old.cfg] +# [include stereotech_config/wizards/5d_calibration_manual_old.cfg] [include stereotech_config/wizards/adjust_basement_auto.cfg] +[include stereotech_config/wizards/adjust_basement_manual.cfg] + [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 2e0e3012549f..67b17a88ee0c 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -64,7 +64,6 @@ warning: none countdown: 0 info: none items: 5D_spiral, 5D_spiral_full -placeholder: wizard-step-probe action_gcode: {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} {% if mode == '5D_spiral' %} diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 91d8ab61eafe..30c095fc4d75 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -1,124 +1,117 @@ [wizard ADJUST_BASEMENT_MANUAL] -image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +image: wizards/zero_point_setup/zero_point_setup01.jpg type: 5d -steps: ADJUST_BASEMENT_MANUAL0, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL6, ADJUST_BASEMENT_MANUAL7 +steps: ADJUST_BASEMENT_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL6 variable_mode: '' variable_wcs: 0 +variable_continue_from_step: '' +variable_diameter: 6.0 -[wizard_step ADJUST_BASEMENT_MANUAL0] -image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -landscape: false +[wizard_step_button ADJUST_BASEMENT_MANUAL0] +image: wizards/zero_point_setup/zero_point_setup.jpg description: This wizard helps you to setup zero point for proper 5D printing +landscape: false warning: none countdown: 0 -info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL1 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_MANUAL1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_MANUAL1] -image: wizards/zero_point_setup/zero_point_setup04.jpg +[wizard_step_slider ADJUST_BASEMENT_MANUAL1] +image: wizards/zero_point_setup/zero_point_setup02.jpg +description: Set basement diameter and press Next landscape: false -description: Please place needed base in the 5D Module and press Next -warning: AdjustBasementAuto.MakeSureBaseProtrudes +warning: none countdown: 0 -info: none +slider_set_diameter_min: 3 +slider_set_diameter_max: 200 +slider_set_diameter_step: 0.1 +slider_set_diameter_default: 6 action_gcode: + {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=diameter VALUE={diameter} SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL2 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step ADJUST_BASEMENT_MANUAL2] -image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false -description: Connect probe and press Next -warning: AdjustBasementAuto.WarningScrew -countdown: 0 -info: none -action_gcode: - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL3 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step ADJUST_BASEMENT_MANUAL3] -image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +image: wizards/zero_point_setup/zero_point_setup04.jpg +description: Please place needed base in the 5D Module and press Next landscape: false -description: AdjustBasementAuto.ConnectAndCheck warning: none countdown: 0 -info: none -placeholder: wizard-step-probe action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL3 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_selector ADJUST_BASEMENT_MANUAL4] +[wizard_step_selector ADJUST_BASEMENT_MANUAL3] image: wizards/zero_point_setup/zero_point_setup.jpg -landscape: false description: Please select Printing mode which you want to use +landscape: false warning: none countdown: 0 -info: none items: 5D_spiral, 5D_spiral_full placeholder: wizard-step-probe action_gcode: {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} - {% if mode == '5D_spiral' %} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=1 - AUTO_BASEMENT_WCS_MOVE WCS=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL5 - {% else %} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=0 - {% set cmd = 'AUTO_BASEMENT_WCS' %} - CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 CMD={cmd} - {% endif %} + {% set wcs = 2 if mode == '5D_spiral' else 1 %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE={wcs} + MOVE_WCS_ZERO WCS={wcs} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={'ADJUST_BASEMENT_MANUAL' ~ (3 + wcs)} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} -[wizard_step_jog ADJUST_BASEMENT_MANUAL5] -image: wizards/adjust_basement_auto/move-sensor-to-center.jpg +[wizard_step_jog ADJUST_BASEMENT_MANUAL4] +image: wizards/zero_point_setup/zero_point_setup01.jpg +description: Move nozzle to the center of the base and press Next landscape: false -description: AdjustBasementAuto.MoveSensorToCenter warning: none countdown: 0 -info: none axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} - {% set cmd = 'AUTO_BASEMENT_WCS WCS=' ~ wcs %} - CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 CMD={cmd} + SET_WCS_OFFSET WCS=1 ADJUST_WCS=2 X=0 Y=0 Z=0 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_MANUAL6] -image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +[wizard_step_jog ADJUST_BASEMENT_MANUAL5] +image: wizards/zero_point_setup/zero_point_setup02.jpg +description: Move nozzle to the center of the base and press Next landscape: false -description: AdjustBasementAuto.Disable warning: none countdown: 0 -info: none -placeholder: waitProgress true +axes: x, y, z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} - ADJUST_BASEMENT_WCS WCS={wcs} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL7 + {% set diameter = printer['wizard ' ~ wizard.name].variables.diameter|float %} + SET_WCS_OFFSET WCS=2 ADJUST_WCS=1 X=0 Y=0 Z={diameter / 2.0} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step ADJUST_BASEMENT_MANUAL7] -image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -landscape: false +[wizard_step ADJUST_BASEMENT_MANUAL6] +image: wizards/zero_point_setup/zero_point_setup.jpg description: Adjust basement completed +landscape: false warning: none countdown: 0 info: none diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg index 342b26082b1b..e7a1c1f34575 100644 --- a/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_manual_cmd.cfg @@ -1,11 +1,23 @@ # -------------------------------step 0 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL0 +WIZARD_STEP_BUTTON WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL0 BUTTON=clear_noozle CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL0 +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=CLEAR_NOZZLE1 + # --------------------------------step1 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL1 +WIZARD_STEP_SLIDER WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL1 SLIDER=set_diameter VALUE=7 CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL1 # ---------------------------------step2 @@ -16,16 +28,20 @@ CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL2 # ---------------------------------step3 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 ITEM=5D_spiral +WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 ITEM=5D_spiral_full CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL3 # ---------------------------------step4 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 -WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 ITEM=5D_spiral -WIZARD_STEP_SELECT WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 ITEM=5D_spiral_full +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 VALUE=1 CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 -# ---------------------------------step5 +# # ---------------------------------step5 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 AXIS=x DIRECTION=0 @@ -34,12 +50,7 @@ WIZARD_STEP_JOG WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 AXIS= WIZARD_STEP_SET_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 VALUE=1 CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL5 -# # ---------------------------------step6 +# ---------------------------------step6 EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL6 CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL6 - -# ---------------------------------step7 - -EXECUTE_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL7 -CANCEL_WIZARD_STEP WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL7 From d4469e9a72810fdf7b335bb7900ee1a382a6998c Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 11:19:50 +0000 Subject: [PATCH 30/65] STEAPP-872: added the wizard zero_point_calibration. --- HTE530-5-4-22.cfg | 2 +- .../cmd_debug/zero_point_calibration_cmd.cfg | 38 ++++++++ .../wizards/zero_point_calibration.cfg | 93 +++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg create mode 100644 stereotech_config/wizards/zero_point_calibration.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index d9d8fc871897..417510e51f27 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -37,7 +37,7 @@ path: /home/ste/uploads # [include stereotech_config/wizards/5d_calibration_manual_old.cfg] [include stereotech_config/wizards/adjust_basement_auto.cfg] [include stereotech_config/wizards/adjust_basement_manual.cfg] - +[include stereotech_config/wizards/zero_point_calibration.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg b/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg new file mode 100644 index 000000000000..ccb934d9d8ab --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg @@ -0,0 +1,38 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE0 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE1 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 AXIS=x DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 AXIS=y DIRECTION=0 +WIZARD_STEP_JOG WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE4 +WIZARD_STEP_SLIDER WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 SLIDER=set_diameter VALUE=7 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE4 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE5 +CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE5 diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg new file mode 100644 index 000000000000..8a0a02f24a43 --- /dev/null +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -0,0 +1,93 @@ +[wizard ZERO_POINT_CALIBRATE] +image: wizards/zero_point_setup/zero_point_setup05.jpg +type: 5d +steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO_POINT_CALIBRATE3, ZERO_POINT_CALIBRATE4, ZERO_POINT_CALIBRATE5 + +[wizard_step ZERO_POINT_CALIBRATE0] +image: wizards/zero_point_setup/zero_point_setup05.jpg +description: This wizard helps you to setup zero point for proper 5D printing +landscape: false +warning: none +countdown: 0 +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE1 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ZERO_POINT_CALIBRATE1] +image: wizards/5d_calibration_manual/5d_calibration1.jpg +description: Place the calibration tool into the five axis module and press Next +landscape: false +warning: none +countdown: 0 +action_gcode: + MOVE_WCS_ZERO WCS=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE2 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ZERO_POINT_CALIBRATE2] +image: wizards/5d_calibration_manual/5d_calibration2.jpg +description: Move nozzle to the nearest tip of the calibration tool and press Next +landscape: false +warning: none +countdown: 0 +axes: x, y, z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 + MOVE_WCS_ZERO WCS=2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE3 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog ZERO_POINT_CALIBRATE3] +image: wizards/5d_calibration_manual/5d_calibration2.jpg +description: Move nozzle to the nearest tip of the calibration tool and press Next +landscape: false +warning: none +countdown: 0 +axes: x, y, z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE4 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider ZERO_POINT_CALIBRATE4] +image: wizards/zero_point_setup/zero_point_setup03.jpg +landscape: false +description: Check the diameter of the calibration tool and press Next +warning: none +countdown: 0 +info: none +slider_set_diameter_min: 0.1 +slider_set_diameter_max: 3 +slider_set_diameter_step: 0.1 +slider_set_diameter_default: 0.2 +action_gcode: + {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} + SET_WCS_OFFSET WCS=2 X=0 Y=0 Z={diameter / 2.0} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE5 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ZERO_POINT_CALIBRATE5] +image: wizards/zero_point_setup/zero_point_setup.jpg +description: Zero Point Calibration completed +landscape: false +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} From 3c042596bf134a5a8e877d98f76a8c93078d0b38 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 11:20:00 +0000 Subject: [PATCH 31/65] STEAPP-872: added the wizard zero_point_calibration. --- .../wizards/cmd_debug/zero_point_calibration_cmd.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg b/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg index ccb934d9d8ab..d9504483e620 100644 --- a/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg +++ b/stereotech_config/wizards/cmd_debug/zero_point_calibration_cmd.cfg @@ -29,10 +29,10 @@ CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE3 # ---------------------------------step4 EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE4 -WIZARD_STEP_SLIDER WIZARD=ADJUST_BASEMENT_MANUAL STEP=ADJUST_BASEMENT_MANUAL4 SLIDER=set_diameter VALUE=7 +WIZARD_STEP_SLIDER WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE4 SLIDER=set_diameter VALUE=7 CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE4 -# ---------------------------------step6 +# ---------------------------------step5 EXECUTE_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE5 CANCEL_WIZARD_STEP WIZARD=ZERO_POINT_CALIBRATE STEP=ZERO_POINT_CALIBRATE5 From 00612512c5f31cacc19bad5e972e68ff6a603d9a Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 25 Jan 2024 12:09:42 +0000 Subject: [PATCH 32/65] STEAPP-872: added the wizard change_material. --- stereotech_config/wizards/change_material.cfg | 55 ++++--------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index bbd89c12d5a0..3f1974888efd 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -14,16 +14,14 @@ countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION_HEAD {% if printer.extruder and printer.extruder1 %} - {action_respond_info('-------------------action_gcode %s, extruder > 1' % (wizard.wizard_step_name, ))} SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 {% else %} - {action_respond_info('-------------------action_gcode %s, extruder == 1' % (wizard.wizard_step_name, ))} SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ACTIVATE_EXTRUDER EXTRUDER=extruder {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step_selector CHANGE_MATERIAL1] @@ -35,15 +33,12 @@ countdown: 0 info: none items: extruder, extruder1 action_gcode: - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - {action_respond_info('-------------------wizard_step_selector %s, selected_e=%s' % (wizard.wizard_step_name, selected_e))} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} ACTIVATE_EXTRUDER EXTRUDER={selected_e} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL2 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} select_gcode: - {action_respond_info('-------------------select_gcode %s selected=%s, wizard=%s' % (wizard.wizard_step_name, selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=selected_e VALUE={selected} [wizard_step_selector CHANGE_MATERIAL2] @@ -56,23 +51,20 @@ info: none items: insert, eject, all action_gcode: {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} - {action_respond_info('-------------------wizard_step_selector CHANGE_MATERIAL2 action=%s' % action)} {% if action == 'insert' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode CHANGE_MATERIAL_2')} RESET_WIZARD WIZARD={wizard.name} select_gcode: - {action_respond_info('-------------------select_gcode CHANGE_MATERIAL2 selected=%s, wizard=%s' % (selected, wizard.name))} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} [wizard_step_tree CHANGE_MATERIAL3] image: wizards/change_material/change_material02.jpg landscape: false -description: Select Current Material +description: ChangeMaterial.UnloadedMaterialSelect warning: none countdown: 0 info: none @@ -80,16 +72,14 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL3'].value|float %} - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% set temperature = printer['wizard_step_tree ' ~ wizard.step_name].value|float %} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step_slider CHANGE_MATERIAL4] @@ -105,11 +95,9 @@ slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|float %} - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step_button CHANGE_MATERIAL5] @@ -122,26 +110,22 @@ info: none placeholder: wizard-step-preheat action_gcode: {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} - {action_respond_info('-------------------action_gcode %s, action=%s' % (wizard.wizard_step_name, action))} {% if action == 'remove' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} button_unload_gcode: - {action_respond_info('-------------------button_eject_gcode')} EJECT_MATERIAL button_load_gcode: - {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL [wizard_step_tree CHANGE_MATERIAL6] image: wizards/change_material/change_material02.jpg landscape: false -description: Select loaded material +description: ChangeMaterial.LoadedMaterialSelect warning: none countdown: 0 info: none @@ -149,16 +133,14 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set temperature = printer['wizard_step_tree CHANGE_MATERIAL6'].value|float %} - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% set temperature = printer['wizard_step_tree ' ~ wizard.step_name].value|float %} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 {% endif %} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step_slider CHANGE_MATERIAL7] @@ -174,11 +156,9 @@ slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step CHANGE_MATERIAL8] @@ -190,12 +170,10 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set selected_e = printer['wizard CHANGE_MATERIAL'].variables.selected_e %} + {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} {% set temperature = printer[selected_e].target|float %} - {action_respond_info('-------------------action_gcode %s, temperature=%s' % (wizard.wizard_step_name, temperature))} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} [wizard_step_button CHANGE_MATERIAL9] @@ -207,19 +185,14 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: - {action_respond_info('-------------------button_retract_gcode')} RETRACT_MATERIAL button_load_gcode: - {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL button_insert_gcode: - {action_respond_info('-------------------button_insert_gcode')} INSERT_MATERIAL # FOR FIBER @@ -232,16 +205,12 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: - {action_respond_info('-------------------button_retract_gcode')} RETRACT_MATERIAL button_load_gcode: - {action_respond_info('-------------------button_load_gcode')} LOAD_MATERIAL [wizard_step CHANGE_MATERIAL11] @@ -252,8 +221,6 @@ warning: none countdown: 0 info: none action_gcode: - {action_respond_info('-------------------action_gcode %s' % (wizard.wizard_step_name))} RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} RESET_WIZARD WIZARD={wizard.name} From 7ae2aa8135e5fdf6e486ee9764205abac45e310b Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:18:00 +0000 Subject: [PATCH 33/65] STEAPP-872: added the wizard change_material_fiber. --- HTE530-5-4-22.cfg | 1 + stereotech_config/wizards/change_material.cfg | 6 +- .../wizards/change_material_fiber.cfg | 189 ++++++++++++++++++ .../cmd_debug/change_material_fiber_cmd.cfg | 58 ++++++ stereotech_config/wizards/common.cfg | 20 +- 5 files changed, 269 insertions(+), 5 deletions(-) create mode 100644 stereotech_config/wizards/change_material_fiber.cfg create mode 100644 stereotech_config/wizards/cmd_debug/change_material_fiber_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 417510e51f27..c40299ed6d84 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -30,6 +30,7 @@ path: /home/ste/uploads # [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/common.cfg] [include stereotech_config/wizards/change_material.cfg] +[include stereotech_config/wizards/change_material_fiber.cfg] [include stereotech_config/wizards/change_module.cfg] [include stereotech_config/wizards/5d_calibration.cfg] [include stereotech_config/wizards/5d_calibration_auto.cfg] diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 3f1974888efd..08d9d7101454 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -72,7 +72,7 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set temperature = printer['wizard_step_tree ' ~ wizard.step_name].value|float %} + {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} @@ -133,7 +133,7 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set temperature = printer['wizard_step_tree ' ~ wizard.step_name].value|float %} + {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} @@ -155,7 +155,7 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL7"].slider1|float %} + {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].slider1|float %} {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg new file mode 100644 index 000000000000..721804dadcf3 --- /dev/null +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -0,0 +1,189 @@ +[wizard CHANGE_MATERIAL_FIBER] +image: wizards/change_fiber/change_fiber.jpg +type: any +steps: CHANGE_MATERIAL_FIBER0, CHANGE_MATERIAL_FIBER1, CHANGE_MATERIAL_FIBER2, CHANGE_MATERIAL_FIBER3, CHANGE_MATERIAL_FIBER4, CHANGE_MATERIAL_FIBER5, CHANGE_MATERIAL_FIBER6, CHANGE_MATERIAL_FIBER7, CHANGE_MATERIAL_FIBER8 +variable_action: 'all' +variable_selected_e: 'extruder1' +variable_temperature: 240 +variable_cooldown_temp: 50 + +[wizard_step CHANGE_MATERIAL_FIBER0] +image: wizards/change_fiber/change_fiber.jpg +landscape: false +description: ChangeMaterialFiber.WelcomeStep +warning: ChangeMaterialFiber.stepOneWarning +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set selected_e = wizard.variables.selected_e %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION_HEAD + ACTIVATE_EXTRUDER EXTRUDER={selected_e} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_selector CHANGE_MATERIAL_FIBER1] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select the needed action +warning: none +countdown: 0 +info: none +items: insert, eject, all +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set action = wizard.variables.action %} + {% set selected_e = wizard.variables.selected_e %} + {% set cooldown_temp = wizard.variables.cooldown_temp %} + {% if action == 'insert' %} + TURN_OFF_HEATERS + CHANGE_STEP_AND_WAIT_COOLING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FIBER4 TEMP={cooldown_temp} EXTRUDER={selected_e} + {% else %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + {% endif %} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +select_gcode: + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} + +[wizard_step_slider CHANGE_MATERIAL_FIBER2] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select the needed temperature of the material which could be found on the filament package or on the manufacturers website +warning: none +countdown: 0 +info: none +slider_set_temp_min: 150 +slider_set_temp_max: 300 +slider_set_temp_step: 5 +slider_set_temp_default: 240 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set selected_e = wizard.variables.selected_e %} + {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp|float %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=temperature VALUE={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button CHANGE_MATERIAL_FIBER3] +image: wizards/change_material/change_material03.jpg +landscape: false +description: ChangeMaterialFiber.WaitHeater +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set selected_e = wizard.variables.selected_e %} + {% set cooldown_temp = wizard.variables.cooldown_temp %} + {% set action = wizard.variables.action %} + {% if action == 'remove' %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FIBER8 + {% else %} + TURN_OFF_HEATERS + CHANGE_STEP_AND_WAIT_COOLING WIZARD={wizard.name} STEP={next_step} TEMP={cooldown_temp} EXTRUDER={selected_e} + {% endif %} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +button_unload_gcode: + EJECT_MATERIAL +button_load_gcode: + LOAD_MATERIAL +button_cut_gcode: + CUT_FIBER + G4 P1000 + PRIME_FIBER + +[wizard_step CHANGE_MATERIAL_FIBER4] +image: wizards/change_material/change_material.jpg +landscape: false +description: ChangeMaterialFiber.InstallMaterialSpool +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat # COOL DOWN +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set temperature = wizard.variables.temperature %} + {% set selected_e = wizard.variables.selected_e %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button CHANGE_MATERIAL_FIBER5] +image: wizards/change_material/change_material04.jpg +landscape: false +description: ChangeMaterialFiber.LoadPushPull +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +button_retract_gcode: + RETRACT_MATERIAL +button_load_gcode: + LOAD_MATERIAL +button_insert_gcode: + INSERT_MATERIAL + +[wizard_step_slider CHANGE_MATERIAL_FIBER6] +image: wizards/change_material/change_material02.jpg +landscape: false +description: Select loading temperature +warning: none +countdown: 0 +info: none +slider_set_temp_min: 150 +slider_set_temp_max: 300 +slider_set_temp_step: 5 +slider_set_temp_default: 240 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp|float %} + {% set selected_e = wizard.variables.selected_e %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=temperature VALUE={temperature} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button CHANGE_MATERIAL_FIBER7] +image: wizards/change_material/change_material04.jpg +landscape: false +description: ChangeMaterialFiber.FiberFromSoplo +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +button_load_gcode: + LOAD_MATERIAL +button_cut_gcode: + CUT_FIBER + G4 P1000 + PRIME_FIBER +button_retract_gcode: + RETRACT_MATERIAL + +[wizard_step CHANGE_MATERIAL_FIBER8] +image: wizards/change_material/change_material.jpg +landscape: false +description: Material change completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/change_material_fiber_cmd.cfg b/stereotech_config/wizards/cmd_debug/change_material_fiber_cmd.cfg new file mode 100644 index 000000000000..06dccf7ba197 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/change_material_fiber_cmd.cfg @@ -0,0 +1,58 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER1 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER1 ITEM=all +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER1 ITEM=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER1 ITEM=eject +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER2 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER2 SLIDER=set_temp VALUE=120 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER3 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER3 BUTTON=cut +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER3 BUTTON=unload +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER3 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER4 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER5 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER5 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER5 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER5 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER6 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER6 SLIDER=set_temp VALUE=120 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER7 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER7 BUTTON=cut +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER7 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER7 BUTTON=retract +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER8 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FIBER STEP=CHANGE_MATERIAL_FIBER8 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 69925d35ca1f..048d1ffd42a1 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -10,6 +10,24 @@ gcode: M109 S{temperature} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 +[gcode_macro CHANGE_STEP_AND_WAIT_COOLING] +gcode: + {% set wizard = params.WIZARD %} + {% set step = params.STEP %} + {% set selected_e = params.EXTRUDER %} + {% set curr_temp = printer[selected_e].temperature|float %} + {% set need_temp = params.TEMP|float %} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard} STEP={step} + {% if curr_temp > need_temp %} + SET_HEATER_TEMPERATURE HEATER={selected_e} TARGET={need_temp} + M106 S255 + M109 S{need_temp} + M106 S0 + TURN_OFF_HEATERS + {% endif %} + WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 + [gcode_macro CHANGE_STEP_AND_WAIT_PROBE] variable_wizard: '' variable_step: '' @@ -29,7 +47,6 @@ gcode: {% set step = params.STEP %} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 SET_WIZARD_STEP WIZARD={wizard} STEP={step} - {action_respond_info('-------------------CHANGE_STEP_AND_WAIT_RUN_CMD cmd=%s' % (params.CMD, rawparams))} {params.CMD} {rawparams} M400 WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 @@ -97,4 +114,3 @@ gcode: G91 G1 {axis ~ direction ~ val} F1500 G90 - {action_respond_info('-------------------jog_gcode (G1 %s%s%s} F1500)' % (axis, direction, val))} From 429b1cf2b91897d0e81febce9b1fb91149f3c88c Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:28:54 +0000 Subject: [PATCH 34/65] STEAPP-872: added the wizard change_material_filament. --- ...erial.cfg => change_material_filament.cfg} | 89 +++++++++++-------- .../wizards/cmd_debug/change_material_cmd.cfg | 75 ---------------- .../change_material_filament_cmd.cfg | 75 ++++++++++++++++ 3 files changed, 125 insertions(+), 114 deletions(-) rename stereotech_config/wizards/{change_material.cfg => change_material_filament.cfg} (61%) delete mode 100644 stereotech_config/wizards/cmd_debug/change_material_cmd.cfg create mode 100644 stereotech_config/wizards/cmd_debug/change_material_filament_cmd.cfg diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material_filament.cfg similarity index 61% rename from stereotech_config/wizards/change_material.cfg rename to stereotech_config/wizards/change_material_filament.cfg index 08d9d7101454..ae6109542b6a 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -1,11 +1,11 @@ -[wizard CHANGE_MATERIAL] +[wizard CHANGE_MATERIAL_FILAMENT] image: wizards/change_material/change_material.jpg type: any -steps: CHANGE_MATERIAL0, CHANGE_MATERIAL1, CHANGE_MATERIAL2, CHANGE_MATERIAL3, CHANGE_MATERIAL4, CHANGE_MATERIAL5, CHANGE_MATERIAL6, CHANGE_MATERIAL7, CHANGE_MATERIAL8, CHANGE_MATERIAL9, CHANGE_MATERIAL10, , CHANGE_MATERIAL11 +steps: CHANGE_MATERIAL_FILAMENT0, CHANGE_MATERIAL_FILAMENT1, CHANGE_MATERIAL_FILAMENT2, CHANGE_MATERIAL_FILAMENT3, CHANGE_MATERIAL_FILAMENT4, CHANGE_MATERIAL_FILAMENT5, CHANGE_MATERIAL_FILAMENT6, CHANGE_MATERIAL_FILAMENT7, CHANGE_MATERIAL_FILAMENT8, CHANGE_MATERIAL_FILAMENT9, CHANGE_MATERIAL_FILAMENT10, , CHANGE_MATERIAL_FILAMENT11 variable_selected_e: 'extruder' variable_action: 'all' -[wizard_step CHANGE_MATERIAL0] +[wizard_step CHANGE_MATERIAL_FILAMENT0] image: wizards/change_material/change_material.jpg landscape: false description: This wizard will help you to change insert or remove the material @@ -13,18 +13,19 @@ warning: Missing extruder countdown: 0 info: none action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION_HEAD {% if printer.extruder and printer.extruder1 %} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% else %} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 + SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 ACTIVATE_EXTRUDER EXTRUDER=extruder {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_selector CHANGE_MATERIAL1] +[wizard_step_selector CHANGE_MATERIAL_FILAMENT1] image: wizards/change_material/change_material01.jpg landscape: false description: Select the extruder where you want change the material @@ -33,15 +34,16 @@ countdown: 0 info: none items: extruder, extruder1 action_gcode: - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set selected_e = wizard.variables.selected_e %} ACTIVATE_EXTRUDER EXTRUDER={selected_e} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=selected_e VALUE={selected} -[wizard_step_selector CHANGE_MATERIAL2] +[wizard_step_selector CHANGE_MATERIAL_FILAMENT2] image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed action @@ -50,18 +52,19 @@ countdown: 0 info: none items: insert, eject, all action_gcode: - {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set action = wizard.variables.action %} {% if action == 'insert' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT7 {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} -[wizard_step_tree CHANGE_MATERIAL3] +[wizard_step_tree CHANGE_MATERIAL_FILAMENT3] image: wizards/change_material/change_material02.jpg landscape: false description: ChangeMaterial.UnloadedMaterialSelect @@ -72,17 +75,18 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} + {% set selected_e = wizard.variables.selected_e %} {% if temperature >= 110.0 %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT5 TEMP={temperature} EXTRUDER={selected_e} {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_slider CHANGE_MATERIAL4] +[wizard_step_slider CHANGE_MATERIAL_FILAMENT4] image: wizards/change_material/change_material02.jpg landscape: false description: Select unloading temperature @@ -94,13 +98,14 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set temperature = printer["wizard_step_slider CHANGE_MATERIAL4"].slider1|float %} - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL5 TEMP={temperature} EXTRUDER={selected_e} + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set temperature = printer["wizard_step_slider " ~ wizard_step_name].slider1|float %} + {% set selected_e = wizard.variables.selected_e %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_button CHANGE_MATERIAL5] +[wizard_step_button CHANGE_MATERIAL_FILAMENT5] image: wizards/change_material/change_material03.jpg landscape: false description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading @@ -109,11 +114,12 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set action = printer['wizard CHANGE_MATERIAL'].variables.action %} + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set action = wizard.variables.action %} {% if action == 'remove' %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -122,7 +128,7 @@ button_unload_gcode: button_load_gcode: LOAD_MATERIAL -[wizard_step_tree CHANGE_MATERIAL6] +[wizard_step_tree CHANGE_MATERIAL_FILAMENT6] image: wizards/change_material/change_material02.jpg landscape: false description: ChangeMaterial.LoadedMaterialSelect @@ -133,17 +139,18 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} + {% set selected_e = wizard.variables.selected_e %} {% if temperature >= 110.0 %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT8 TEMP={temperature} EXTRUDER={selected_e} {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_slider CHANGE_MATERIAL7] +[wizard_step_slider CHANGE_MATERIAL_FILAMENT7] image: wizards/change_material/change_material02.jpg landscape: false description: Select loading temperature @@ -155,13 +162,14 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].slider1|float %} - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL8 TEMP={temperature} EXTRUDER={selected_e} + {% set selected_e = wizard.variables.selected_e %} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step CHANGE_MATERIAL8] +[wizard_step CHANGE_MATERIAL_FILAMENT8] image: wizards/change_material/change_material.jpg landscape: false description: Load new spool insert material into bowden tube and press Next button @@ -170,13 +178,14 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set selected_e = printer['wizard ' ~ wizard.name].variables.selected_e %} + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set selected_e = wizard.variables.selected_e %} {% set temperature = printer[selected_e].target|float %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL9 TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} -[wizard_step_button CHANGE_MATERIAL9] +[wizard_step_button CHANGE_MATERIAL_FILAMENT9] image: wizards/change_material/change_material04.jpg landscape: false description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle @@ -185,7 +194,8 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: @@ -196,7 +206,7 @@ button_insert_gcode: INSERT_MATERIAL # FOR FIBER -[wizard_step_button CHANGE_MATERIAL10] +[wizard_step_button CHANGE_MATERIAL_FILAMENT10] image: wizards/change_material/change_material04.jpg landscape: false description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times @@ -205,7 +215,8 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL11 + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: @@ -213,7 +224,7 @@ button_retract_gcode: button_load_gcode: LOAD_MATERIAL -[wizard_step CHANGE_MATERIAL11] +[wizard_step CHANGE_MATERIAL_FILAMENT11] image: wizards/change_material/change_material.jpg landscape: false description: Material change completed diff --git a/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg b/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg deleted file mode 100644 index c875c877a0da..000000000000 --- a/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg +++ /dev/null @@ -1,75 +0,0 @@ -# -------------------------------step 0 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 - -# --------------------------------step1 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 ITEM=extruder1 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL1 - -# ---------------------------------step2 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=all -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=insert -WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 ITEM=eject -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL2 - -# ---------------------------------step3 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 -WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 KEY=pva -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL3 - -# ---------------------------------step4 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 -WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 SLIDER=slider1 VALUE=125 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL4 - -# ---------------------------------step5 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=unload -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 BUTTON=load -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL5 - -# ---------------------------------step6 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 -WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL6 KEY=pla - -# ---------------------------------step7 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 -WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 SLIDER=slider1 VALUE=125 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL7 - -# ---------------------------------step8 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL8 - -# ---------------------------------step9 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=load -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 BUTTON=insert -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL9 - -# ---------------------------------step10 ( FOR FIBER ) - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=retract -WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 BUTTON=load -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL10 - -# ---------------------------------step11 - -EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 -CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL11 diff --git a/stereotech_config/wizards/cmd_debug/change_material_filament_cmd.cfg b/stereotech_config/wizards/cmd_debug/change_material_filament_cmd.cfg new file mode 100644 index 000000000000..854eb5e5eb64 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/change_material_filament_cmd.cfg @@ -0,0 +1,75 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT0 + +# --------------------------------step1 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT1 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT1 ITEM=extruder +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT1 ITEM=extruder1 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 ITEM=all +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 ITEM=insert +WIZARD_STEP_SELECT WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 ITEM=eject +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT3 +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT3 KEY=pva +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT4 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT4 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT5 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT5 BUTTON=unload +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT5 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT6 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT6 +WIZARD_STEP_TREE WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT6 KEY=pla + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT7 +WIZARD_STEP_SLIDER WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT7 SLIDER=slider1 VALUE=125 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT8 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT8 + +# ---------------------------------step9 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT9 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT9 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT9 BUTTON=load +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT9 BUTTON=insert +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT9 + +# ---------------------------------step10 ( FOR FIBER ) + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT10 +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT10 BUTTON=retract +WIZARD_STEP_BUTTON WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT10 BUTTON=load +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT10 + +# ---------------------------------step11 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT11 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT11 From 8027858abf9f701d3425f03e6f15db7de5c2ce41 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:35:40 +0000 Subject: [PATCH 35/65] STEAPP-872: added the wizard change_material_filament. --- stereotech_config/wizards/change_material_filament.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index ae6109542b6a..f1df48713e91 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -19,7 +19,7 @@ action_gcode: {% if printer.extruder and printer.extruder1 %} SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} {% else %} - SET_WIZARD_STEP WIZARD=CHANGE_MATERIAL_FILAMENT STEP=CHANGE_MATERIAL_FILAMENT2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT2 ACTIVATE_EXTRUDER EXTRUDER=extruder {% endif %} cancel_gcode: @@ -67,7 +67,7 @@ select_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT3] image: wizards/change_material/change_material02.jpg landscape: false -description: ChangeMaterial.UnloadedMaterialSelect +description: ChangeMaterialFilament.UnloadedMaterialSelect warning: none countdown: 0 info: none @@ -131,7 +131,7 @@ button_load_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT6] image: wizards/change_material/change_material02.jpg landscape: false -description: ChangeMaterial.LoadedMaterialSelect +description: ChangeMaterialFilament.LoadedMaterialSelect warning: none countdown: 0 info: none From 8a59250088e6914a5f0291caa310e492f8c5ec60 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:36:05 +0000 Subject: [PATCH 36/65] STEAPP-872: added the wizard change_material. --- stereotech_config/wizards/change_material.cfg | 19 +++++++++++++++++++ .../cmd_debug/adjust_basement_cmd copy.cfg | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 stereotech_config/wizards/change_material.cfg create mode 100644 stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg new file mode 100644 index 000000000000..78f90e7c4f27 --- /dev/null +++ b/stereotech_config/wizards/change_material.cfg @@ -0,0 +1,19 @@ +[wizard CHANGE_MATERIAL] +image: wizards/change_material/change_material.jpg +type: any +steps: CHANGE_MATERIAL0 +variable_selected_e: 'extruder' +variable_action: 'all' + +[wizard_step_wizard CHANGE_MATERIAL0] +image: none +landscape: false +description: ChangeMaterialFilament.ManagersChoiceDescription +warning: none +countdown: 0 +info: none +wizards: CHANGE_MATERIAL_FILAMENT, CHANGE_MATERIAL_FIBER +action_gcode: + MOVE_SERVICE_POSITION +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg b/stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg new file mode 100644 index 000000000000..cc19677b5e8d --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg @@ -0,0 +1,4 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 +CANCEL_WIZARD_STEP WIZARD=CHANGE_MATERIAL STEP=CHANGE_MATERIAL0 From e5ca548a92f4f36c4b6833d43fb97685ae179401 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:40:42 +0000 Subject: [PATCH 37/65] STEAPP-872: added the wizard change_material. --- .../{adjust_basement_cmd copy.cfg => change_material_cmd.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename stereotech_config/wizards/cmd_debug/{adjust_basement_cmd copy.cfg => change_material_cmd.cfg} (100%) diff --git a/stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg b/stereotech_config/wizards/cmd_debug/change_material_cmd.cfg similarity index 100% rename from stereotech_config/wizards/cmd_debug/adjust_basement_cmd copy.cfg rename to stereotech_config/wizards/cmd_debug/change_material_cmd.cfg From 5352560c2d64bf519330fb607db4b4f97947c653 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:42:00 +0000 Subject: [PATCH 38/65] STEAPP-872: added the wizard change_material_filament. --- HTE530-5-4-22.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index c40299ed6d84..40511a9913c2 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -30,6 +30,7 @@ path: /home/ste/uploads # [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/common.cfg] [include stereotech_config/wizards/change_material.cfg] +[include stereotech_config/wizards/change_material_filament.cfg] [include stereotech_config/wizards/change_material_fiber.cfg] [include stereotech_config/wizards/change_module.cfg] [include stereotech_config/wizards/5d_calibration.cfg] From 8d323fa7fd565f329b8a1df2c8a6d4e1ac495664 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 11:53:01 +0000 Subject: [PATCH 39/65] STEAPP-872: added params the attributes to macro the RESET_WIZARD --- stereotech_config/wizards/5d_calibration.cfg | 1 + stereotech_config/wizards/adjust_basement.cfg | 1 + stereotech_config/wizards/change_material.cfg | 2 -- stereotech_config/wizards/common.cfg | 5 ++++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index 0a812c5f7454..b819b27fc8b5 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -13,5 +13,6 @@ info: none wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: MOVE_SERVICE_POSITION + RESET_WIZARD WIZARD={wizard.name} HOME=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index ee3725baada0..6c36b24a1cce 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -13,5 +13,6 @@ info: none wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL action_gcode: MOVE_SERVICE_POSITION + RESET_WIZARD WIZARD={wizard.name} HOME=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 78f90e7c4f27..36bbb6cd38ac 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -2,8 +2,6 @@ image: wizards/change_material/change_material.jpg type: any steps: CHANGE_MATERIAL0 -variable_selected_e: 'extruder' -variable_action: 'all' [wizard_step_wizard CHANGE_MATERIAL0] image: none diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 048d1ffd42a1..2b730a7d5ca6 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -56,12 +56,15 @@ rename_existing: RESET_WIZARD_OLD gcode: {% set wizard = params.WIZARD %} {% set abort = params.ABORT|default(1)|int %} + {% set home = params.HOME|default(1)|int %} {% if printer["probe"] %} CANCEL_TEST_PROBE UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 {% endif %} TURN_OFF_HEATERS - HOME_POSITION ABORT={abort} + {% if home %} + HOME_POSITION ABORT={abort} + {% endif %} RESET_WIZARD_OLD WIZARD={wizard} [delayed_gcode test_probe_loop_two] From cb01f11c4a1c08e834cb908d8bb9a6690fcaf7c3 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 12:21:27 +0000 Subject: [PATCH 40/65] STEAPP-872: added the wizard bed_level. --- HTE530-5-4-22.cfg | 3 +++ stereotech_config/wizards/bed_level.cfg | 18 ++++++++++++++++++ .../cmd_debug/change_material_cmd copy.cfg | 4 ++++ 3 files changed, 25 insertions(+) create mode 100644 stereotech_config/wizards/bed_level.cfg create mode 100644 stereotech_config/wizards/cmd_debug/change_material_cmd copy.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 40511a9913c2..f06b001c32a4 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -40,6 +40,9 @@ path: /home/ste/uploads [include stereotech_config/wizards/adjust_basement_auto.cfg] [include stereotech_config/wizards/adjust_basement_manual.cfg] [include stereotech_config/wizards/zero_point_calibration.cfg] +[include stereotech_config/wizards/bed_level.cfg] +# [include stereotech_config/wizards/bed_level_manual.cfg] +# [include stereotech_config/wizards/bed_level_auto.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/bed_level.cfg b/stereotech_config/wizards/bed_level.cfg new file mode 100644 index 000000000000..40b3c880adc2 --- /dev/null +++ b/stereotech_config/wizards/bed_level.cfg @@ -0,0 +1,18 @@ +[wizard BED_LEVEL] +image: wizards/change_material/change_material.jpg +type: 3d +steps: BED_LEVEL0 + +[wizard_step_wizard BED_LEVEL0] +image: none +landscape: false +description: ChangeMaterialFilament.ManagersChoiceDescription +warning: none +countdown: 0 +info: none +wizards: BED_LEVEL_AUTO, BED_LEVEL_MANUAL +action_gcode: + MOVE_SERVICE_POSITION + RESET_WIZARD WIZARD={wizard.name} HOME=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/change_material_cmd copy.cfg b/stereotech_config/wizards/cmd_debug/change_material_cmd copy.cfg new file mode 100644 index 000000000000..3cc36008e3b3 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/change_material_cmd copy.cfg @@ -0,0 +1,4 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL STEP=BED_LEVEL0 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL STEP=BED_LEVEL0 From 1dd7b1a1d62f00dbccbf68d7bd7bf570328ef4e1 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 12:53:56 +0000 Subject: [PATCH 41/65] STEAPP-872: fixed bug --- stereotech_config/wizards/change_material.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 36bbb6cd38ac..397b3a905c1a 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -3,7 +3,7 @@ image: wizards/change_material/change_material.jpg type: any steps: CHANGE_MATERIAL0 -[wizard_step_wizard CHANGE_MATERIAL0] +[wizard_step_wizards CHANGE_MATERIAL0] image: none landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription From 080748fa3657ea074890659dc2c2d0c14b754baf Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 29 Jan 2024 12:27:52 +0000 Subject: [PATCH 42/65] STEAPP-872: added the wizard bed_level_manual. --- HTE530-5-4-22.cfg | 4 +- stereotech_config/wizards/bed_level.cfg | 4 +- .../wizards/bed_level_manual.cfg | 87 +++++++++++++++++++ .../cmd_debug/bed_level_manual_cmd.cfg | 38 ++++++++ stereotech_config/wizards/common.cfg | 13 ++- 5 files changed, 137 insertions(+), 9 deletions(-) create mode 100644 stereotech_config/wizards/bed_level_manual.cfg create mode 100644 stereotech_config/wizards/cmd_debug/bed_level_manual_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index f06b001c32a4..edf4348a6b44 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -41,7 +41,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/adjust_basement_manual.cfg] [include stereotech_config/wizards/zero_point_calibration.cfg] [include stereotech_config/wizards/bed_level.cfg] -# [include stereotech_config/wizards/bed_level_manual.cfg] +[include stereotech_config/wizards/bed_level_manual.cfg] # [include stereotech_config/wizards/bed_level_auto.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] @@ -60,8 +60,6 @@ path: /home/ste/uploads [include stereotech_config/common/variables.cfg] [include stereotech_config/common/diagnostics.cfg] - - [gcode_macro CONSTANTS] description: Holds printer constants variable_probe_a_horizontal: 159, 246.5, 40 diff --git a/stereotech_config/wizards/bed_level.cfg b/stereotech_config/wizards/bed_level.cfg index 40b3c880adc2..d9424a690dd3 100644 --- a/stereotech_config/wizards/bed_level.cfg +++ b/stereotech_config/wizards/bed_level.cfg @@ -1,9 +1,9 @@ [wizard BED_LEVEL] -image: wizards/change_material/change_material.jpg +image: wizards/bed_level_manual/bed_leveling.jpg type: 3d steps: BED_LEVEL0 -[wizard_step_wizard BED_LEVEL0] +[wizard_step_wizards BED_LEVEL0] image: none landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg new file mode 100644 index 000000000000..6bb3eac6f38b --- /dev/null +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -0,0 +1,87 @@ +[wizard BED_LEVEL_MANUAL] +image: wizards/change_material/change_material.jpg +type: 3d +steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_LEVEL_MANUAL2, BED_LEVEL_MANUAL3, BED_LEVEL_MANUAL4 +variable_continue_from_step: '' + +[wizard_step_button BED_LEVEL_MANUAL0] +image: wizards/bed_level_manual/bed_leveling.jpg +landscape: false +description: Perform bed leveling if there is too much distance between the nozzles and the build plate +warning: BedLevelManual.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + Z_ENDSTOP_CALIBRATE + SET_WIZARD_STEP WIZARD={wizard.name} STEP=BED_LEVEL_MANUAL2 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=BED_LEVEL_MANUAL1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +# this step is added because clear_nozzle cannot run additional commands in action_gcode (Z_ENDSTOP_CALIBRATE) +[wizard_step BED_LEVEL_MANUAL1] +image: wizards/bed_level_manual/bed_leveling.jpg +landscape: false +description: Perform bed leveling if there is too much distance between the nozzles and the build plate +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + Z_ENDSTOP_CALIBRATE + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog BED_LEVEL_MANUAL2] +image: wizards/bed_level_manual/bed_leveling05.jpg +description: Adjust gap between left nozzle and bed using controls +landscape: false +warning: none +countdown: 0 +axes: z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ACCEPT_Z_ENDSTOP + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button BED_LEVEL_MANUAL3] +image: wizards/bed_level_manual/bed_leveling04.jpg +landscape: false +description: Wait until bed and printhead stop and adjust nearest thumb wheel +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ABORT + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +button_next_point_gcode: + ADJUSTED + +[wizard_step BED_LEVEL_MANUAL4] +image: wizards/bed_level_manual/bed_leveling.jpg +landscape: false +description: Bed level completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/bed_level_manual_cmd.cfg b/stereotech_config/wizards/cmd_debug/bed_level_manual_cmd.cfg new file mode 100644 index 000000000000..7f502901ff56 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/bed_level_manual_cmd.cfg @@ -0,0 +1,38 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL0 +WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=CLEAR_NOZZLE1 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL2 +WIZARD_STEP_JOG WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL2 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL2 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL3 +WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL3 BUTTON=next_point +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL4 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_MANUAL STEP=BED_LEVEL_MANUAL4 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 2b730a7d5ca6..68e47e76e3b9 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -103,7 +103,7 @@ info: none action_gcode: TURN_OFF_HEATERS MOVE_SERVICE_POSITION - {% set continue_from_step = printer['wizard ' ~ wizard.name].variables.continue_from_step %} + {% set continue_from_step = wizard.variables.continue_from_step %} SET_WIZARD_STEP WIZARD={wizard.name} STEP={continue_from_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -114,6 +114,11 @@ gcode: {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} {% set step_name = params.STEP_NAME %} {% set val = printer["wizard_step_jog " ~ step_name].step %} - G91 - G1 {axis ~ direction ~ val} F1500 - G90 + {% set mode = params.MODE|default('5d') %} + {% if mode == '5d' %} + G91 + G1 {axis ~ direction ~ val} F1500 + G90 + {% elif mode == '3d' %} + TESTZ Z={direction ~ val} + {% endif %} From df4a38c22eb47fc2114a1950f664625196e21f18 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 29 Jan 2024 14:40:56 +0000 Subject: [PATCH 43/65] STEAPP-872: added the wizard bed_level_auto. --- HTE530-5-4-22.cfg | 2 +- stereotech_config/wizards/bed_level_auto.cfg | 143 ++++++++++++++++++ .../wizards/cmd_debug/bed_level_auto_cmd .cfg | 59 ++++++++ 3 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/bed_level_auto.cfg create mode 100644 stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index edf4348a6b44..e1c93d11cee4 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -42,7 +42,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/zero_point_calibration.cfg] [include stereotech_config/wizards/bed_level.cfg] [include stereotech_config/wizards/bed_level_manual.cfg] -# [include stereotech_config/wizards/bed_level_auto.cfg] +[include stereotech_config/wizards/bed_level_auto.cfg] [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg new file mode 100644 index 000000000000..51c8e50e4a08 --- /dev/null +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -0,0 +1,143 @@ +[wizard BED_LEVEL_AUTO] +image: wizards/change_material/change_material.jpg +type: 3d +steps: BED_LEVEL_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_AUTO1, BED_LEVEL_AUTO2, BED_LEVEL_AUTO3, BED_LEVEL_AUTO4, BED_LEVEL_AUTO5, BED_LEVEL_AUTO6, BED_LEVEL_AUTO7, BED_LEVEL_AUTO8 +variable_continue_from_step: '' + +[wizard_step_button BED_LEVEL_AUTO0] +image: wizards/BED_LEVEL_AUTO/bed_leveling.jpg +landscape: false +description: Perform bed leveling if there is too much distance between the nozzles and the build plate +warning: BedLevelManual.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + Z_ENDSTOP_CALIBRATE + SET_WIZARD_STEP WIZARD={wizard.name} STEP=BED_LEVEL_AUTO2 +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=BED_LEVEL_AUTO1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +# this step is added because clear_nozzle cannot run additional commands in action_gcode (Z_ENDSTOP_CALIBRATE) +[wizard_step BED_LEVEL_AUTO1] +image: wizards/BED_LEVEL_AUTO/bed_leveling.jpg +landscape: false +description: Perform bed leveling if there is too much distance between the nozzles and the build plate +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + Z_ENDSTOP_CALIBRATE + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog BED_LEVEL_AUTO2] +image: wizards/BED_LEVEL_AUTO/bed_leveling05.jpg +description: Adjust gap between left nozzle and bed using controls +landscape: false +warning: none +countdown: 0 +axes: z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ACCEPT_Z_ENDSTOP + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_button BED_LEVEL_AUTO3] +image: wizards/BED_LEVEL_AUTO/bed_leveling04.jpg +landscape: false +description: Wait until bed and printhead stop and adjust nearest thumb wheel +warning: none +countdown: 0 +info: none +placeholder: wizard-step-preheat +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ABORT + ACCEPT_Z_ENDSTOP PROBE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} +button_next_point_gcode: + ADJUSTED + +[wizard_step BED_LEVEL_AUTO4] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: Connect probe and press Next +warning: BedLevelAuto.WarningScrew +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step BED_LEVEL_AUTO5] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: BedLevelAuto.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set cmd = 'CALIBRATE_MODULE_THREE_D' %} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={next_step} CMD={cmd} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step BED_LEVEL_AUTO6] +image: wizards/bed_level_auto/auto_bed_leveling_02.jpg +landscape: false +description: BedLevelAuto.Wait +warning: none +countdown: 420 +info: none +placeholder: waitProgress true +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step BED_LEVEL_AUTO7] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: BedLevelAuto.Disable +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step BED_LEVEL_AUTO8] +image: wizards/bed_level_auto/auto_bed_leveling_01.jpg +landscape: false +description: Bed level completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg b/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg new file mode 100644 index 000000000000..f2a4dd1dcf4d --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg @@ -0,0 +1,59 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 +WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=CLEAR_NOZZLE1 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 +WIZARD_STEP_JOG WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO3 +WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO3 BUTTON=next_point +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO4 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO4 + + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO5 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO6 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO7 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO7 + +# ---------------------------------step8 + +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO8 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO8 From cef47baebdc62d3a52b1e2a85c2704baf424eec8 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 30 Jan 2024 07:07:15 +0000 Subject: [PATCH 44/65] STEAPP-872: added the wizard nozzle_offset_5d. --- HTE530-5-4-22.cfg | 14 ++- .../cmd_debug/nozzle_offset_5d_cmd.cfg | 42 ++++++++ .../wizards/nozzle_offset_5d.cfg | 98 +++++++++++++++++++ 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/cmd_debug/nozzle_offset_5d_cmd.cfg create mode 100644 stereotech_config/wizards/nozzle_offset_5d.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index e1c93d11cee4..0c8feb7915d3 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -29,21 +29,33 @@ path: /home/ste/uploads # wizards # [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/common.cfg] + [include stereotech_config/wizards/change_material.cfg] [include stereotech_config/wizards/change_material_filament.cfg] [include stereotech_config/wizards/change_material_fiber.cfg] + [include stereotech_config/wizards/change_module.cfg] + [include stereotech_config/wizards/5d_calibration.cfg] [include stereotech_config/wizards/5d_calibration_auto.cfg] [include stereotech_config/wizards/5d_calibration_manual.cfg] -# [include stereotech_config/wizards/5d_calibration_manual_old.cfg] +[include stereotech_config/wizards/5d_calibration_manual_old.cfg] + + +[include stereotech_config/wizards/adjust_basement.cfg] [include stereotech_config/wizards/adjust_basement_auto.cfg] [include stereotech_config/wizards/adjust_basement_manual.cfg] [include stereotech_config/wizards/zero_point_calibration.cfg] + [include stereotech_config/wizards/bed_level.cfg] [include stereotech_config/wizards/bed_level_manual.cfg] [include stereotech_config/wizards/bed_level_auto.cfg] +[include stereotech_config/wizards/nozzle_offset_5d.cfg] + + + + [include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] [include stereotech_config/common/nozzle_offset.cfg] diff --git a/stereotech_config/wizards/cmd_debug/nozzle_offset_5d_cmd.cfg b/stereotech_config/wizards/cmd_debug/nozzle_offset_5d_cmd.cfg new file mode 100644 index 000000000000..c410d5341093 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/nozzle_offset_5d_cmd.cfg @@ -0,0 +1,42 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D0 +WIZARD_STEP_BUTTON WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D0 + +# # --------------------------------step0.1 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=CLEAR_NOZZLE0 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=CLEAR_NOZZLE0 + +# --------------------------------step0.2 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=CLEAR_NOZZLE1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=CLEAR_NOZZLE1 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D2 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D3 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D4 +WIZARD_STEP_JOG WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D4 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D4 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D5 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_5D STEP=NOZZLE_OFFSET_5D5 diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg new file mode 100644 index 000000000000..2a19c1c960ef --- /dev/null +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -0,0 +1,98 @@ +[wizard NOZZLE_OFFSET_5D] +image: wizards/change_material/change_material.jpg +type: 5d +steps: NOZZLE_OFFSET_5D0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, NOZZLE_OFFSET_5D1, NOZZLE_OFFSET_5D2, NOZZLE_OFFSET_5D3, NOZZLE_OFFSET_5D4, NOZZLE_OFFSET_5D5 +variable_continue_from_step: '' + +[wizard_step_button NOZZLE_OFFSET_5D0] +image: none +landscape: false +description: NozzleOffset5D.Description +warning: NozzleOffset5D.MakeSureFreeOfPlastic +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +button_clear_noozle_gcode: + {% set extruder = printer.toolhead.extruder|default('extruder') %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' + MOVE_SERVICE_POSITION_HEAD + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=NOZZLE_OFFSET_5D1 + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_5D1] +image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg +landscape: false +description: Place the calibration tool into the five axis module and press Next +warning: NozzleOffset5D.GapBetweenTemplateModule +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_5D2] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +description: Connect probe and press Next +landscape: false +warning: NozzleOffset5D.WarningScrew +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_5D3] +image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg +landscape: false +description: NozzleOffset5D.ConnectAndCheck +warning: none +countdown: 0 +info: none +placeholder: wizard-step-probe +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ADJUST_NOZZLE_OFFSET_Z + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog NOZZLE_OFFSET_5D4] +image: wizards/nozzle_offset/chup_3d.jpg +description: NozzleOffset5D.MoveToSurface +landscape: false +warning: none +countdown: 0 +axes: z +steps: 0.05, 0.1, 1, 10 +default_step: 1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='5d' +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 + SET_WCS_FROM_AUTO_WCS + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_5D5] +image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg +landscape: false +description: NozzleOffset5D.Finish +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} From 5d5564802ca4c1ec2393ddc00a68a9e504a0bce9 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 30 Jan 2024 08:06:20 +0000 Subject: [PATCH 45/65] STEAPP-872: added the wizard align_nozzles. --- HTE530-5-4-22.cfg | 2 +- stereotech_config/wizards/align_nozzles.cfg | 107 ++++++++++++++++++ .../wizards/cmd_debug/align_nozzles_cmd.cfg | 25 ++++ stereotech_config/wizards/common.cfg | 1 + 4 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/align_nozzles.cfg create mode 100644 stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 0c8feb7915d3..55b6ff5617a6 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -52,7 +52,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/bed_level_auto.cfg] [include stereotech_config/wizards/nozzle_offset_5d.cfg] - +[include stereotech_config/wizards/align_nozzles.cfg] diff --git a/stereotech_config/wizards/align_nozzles.cfg b/stereotech_config/wizards/align_nozzles.cfg new file mode 100644 index 000000000000..2c8d92efdb8b --- /dev/null +++ b/stereotech_config/wizards/align_nozzles.cfg @@ -0,0 +1,107 @@ +[wizard ALIGN_NOZZLES] +image: wizards/change_material/change_material.jpg +type: 5d +steps: ALIGN_NOZZLES0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ALIGN_NOZZLES1, ALIGN_NOZZLES2, ALIGN_NOZZLES3, ALIGN_NOZZLES4 +variable_continue_from_step: '' + +[wizard_step_button ALIGN_NOZZLES0] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: AlignNozzles.Description +warning: AlignNozzles.Prerequisites +countdown: 0 +info: none +action_gcode: + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION + {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} + # 3d + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ALIGN_NOZZLES2 + {% else %} + # 5d + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ALIGN_NOZZLES1 + {% endif %} +button_calibarate_module_gcode: + {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} + # 3d + {% if printer.probe %} + SET_WIZARD_ENABLE WIZARD=BED_LEAVEL_AUTO ENABLE=1 + {% else %} + SET_WIZARD_ENABLE WIZARD=BED_LEAVEL_MANUAL ENABLE=1 + {% endif %} + {% else %} + # 5d + {% if printer.probe %} + SET_WIZARD_ENABLE WIZARD=CALIBRATE_5D_AUTO ENABLE=1 + {% else %} + SET_WIZARD_ENABLE WIZARD=CALIBRATE_5D_MANUAL ENABLE=1 + {% endif %} + {% endif %} + M400 + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ALIGN_NOZZLES1] +image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg +landscape: false +description: Place the calibration tool into the five axis module and press Next +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ALIGN_NOZZLES2] +image: wizards/nozzle_offset/release_nozzle.jpg +description: AlignNozzles.ReleaseNozzle +landscape: false +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} + # 3d + G54 + G0 Z0 F600 + {% else %} + # 5d + G55 + G0 X0 Y0 A0 F600 + {% endif %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ALIGN_NOZZLES3] +image: wizards/nozzle_offset/adjust_nozzle.jpg +landscape: false +description: AlignNozzles.TightNozzle +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + G91 + G0 Z30 F600 + G90 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ALIGN_NOZZLES4] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: AlignNozzles.Completed +warning: none +countdown: 0 +info: none +action_gcode: + G54 + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg b/stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg new file mode 100644 index 000000000000..c41f59809137 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg @@ -0,0 +1,25 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES0 +WIZARD_STEP_BUTTON WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES0 BUTTON=calibarate_module +CANCEL_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES0 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES1 +CANCEL_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES2 +CANCEL_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES3 +CANCEL_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES4 +CANCEL_WIZARD_STEP WIZARD=ALIGN_NOZZLES STEP=ALIGN_NOZZLES4 diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 68e47e76e3b9..7bea0eb5bb3a 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -66,6 +66,7 @@ gcode: HOME_POSITION ABORT={abort} {% endif %} RESET_WIZARD_OLD WIZARD={wizard} + G54 [delayed_gcode test_probe_loop_two] gcode: From 8bfdbd0cc6cfb9bc4402bf9d14b94d482b48fcf1 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 30 Jan 2024 12:24:00 +0000 Subject: [PATCH 46/65] STEAPP-872: added the wizard nozzle_offset_fiber. --- .../wizards/change_material_filament.cfg | 2 +- .../cmd_debug/nozzle_offset_fiber_cmd.cfg | 37 +++++ .../wizards/nozzle_offset_fiber.cfg | 131 ++++++++++++++++++ 3 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 stereotech_config/wizards/cmd_debug/nozzle_offset_fiber_cmd.cfg create mode 100644 stereotech_config/wizards/nozzle_offset_fiber.cfg diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index f1df48713e91..0de5bb672764 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -99,7 +99,7 @@ slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - {% set temperature = printer["wizard_step_slider " ~ wizard_step_name].slider1|float %} + {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].slider1|float %} {% set selected_e = wizard.variables.selected_e %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: diff --git a/stereotech_config/wizards/cmd_debug/nozzle_offset_fiber_cmd.cfg b/stereotech_config/wizards/cmd_debug/nozzle_offset_fiber_cmd.cfg new file mode 100644 index 000000000000..c29ebf74fc57 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/nozzle_offset_fiber_cmd.cfg @@ -0,0 +1,37 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER0 +WIZARD_STEP_BUTTON WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER0 BUTTON=load_material +WIZARD_STEP_BUTTON WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER0 BUTTON=bed_level +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER0 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER2 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER2 SLIDER=set_temp_main_e VALUE=151 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER2 SLIDER=set_temp_second_e VALUE=152 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER2 SLIDER=set_temp_bed VALUE=40 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER3 +WIZARD_STEP_JOG WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER3 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER3 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER4 +WIZARD_STEP_NOZZLE_OFFSET WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER4 STEP_X=8 STEP_Y=8 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER5 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER5 diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg new file mode 100644 index 000000000000..6a7a49dda46a --- /dev/null +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -0,0 +1,131 @@ +[wizard NOZZLE_OFFSET_FIBER] +image: wizards/change_material/change_material.jpg +type: 5d +steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_OFFSET_FIBER3, NOZZLE_OFFSET_FIBER4, NOZZLE_OFFSET_FIBER5 +variable_continue_from_step: '' + +[wizard_step_button NOZZLE_OFFSET_FIBER0] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.Description +warning: NozzleOffset.Prerequisites +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION + G0 Z0 F600 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +button_load_material_gcode: + SET_WIZARD_ENABLE WIZARD=CHANGE_MATERIAL_FIBER ENABLE=1 ERROR='' +button_bed_level_gcode: + SET_WIZARD_ENABLE WIZARD=BED_LEVEL_MANUAL ENABLE=1 ERROR='' +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_FIBER1] +image: wizards/nozzle_offset/chup_3d.jpg +landscape: false +description: NozzleOffset.GapBetweenNozzleAndGlass +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + G0 Z30 F600 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider NOZZLE_OFFSET_FIBER2] +image: wizards/nozzle_offset/select_temp.jpg +description: NozzleOffset.SetTemperatures +landscape: false +warning: none +countdown: 0 +info: none +slider_set_temp_main_e_min: 150 +slider_set_temp_main_e_max: 290 +slider_set_temp_main_e_step: 5 +slider_set_temp_main_e_default: 220 +slider_set_temp_second_e_min: 150 +slider_set_temp_second_e_max: 290 +slider_set_temp_second_e_step: 5 +slider_set_temp_second_e_default: 220 +slider_set_temp_bed_min: 40 +slider_set_temp_bed_max: 120 +slider_set_temp_bed_step: 5 +slider_set_temp_bed_default: 60 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set main_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_main_e|float %} + {% set second_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_second_e|float %} + {% set bed = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_bed|float %} + # {% set cmd = 'PRINT_NOZZLE_OFFSET MAIN_E=' ~ main_e ~ ' SECOND_E=' ~ second_e ~ ' BED=' ~ bed %} + # CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={next_step} CMD={'"' ~ cmd ~ '"'} + + + + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={next_step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + + PRINT_NOZZLE_OFFSET MAIN_E={main_e} SECOND_E={second_e} BED={bed} + +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog NOZZLE_OFFSET_FIBER3] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.WaitForPrint +warning: none +countdown: 1140 +info: none +placeholder: wizard-step-preheat +axes: z +steps: 0.05, 0.1, 1 +default_step: 0.1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_nozzle_offset NOZZLE_OFFSET_FIBER4] +image: none +landscape: false +description: NozzleOffset.NozzleOffsetDescription +warning: none +countdown: 1140 +info: none +placeholder: wizard-step-preheat +steps: 15 +default_step: 8 +step_value: 0.1 +min_value: -0.7 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set step_x = printer["wizard_step_nozzle_offset " ~ wizard.wizard_step_name].step_x|float %} + {% set step_y = printer["wizard_step_nozzle_offset " ~ wizard.wizard_step_name].step_y|float %} + SET_NOZZLE_OFFSET AXIS=X VALUE={step_x} + SET_NOZZLE_OFFSET AXIS=Y VALUE={step_y} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_FIBER5] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.Completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + + From 34cb434bcd62655eef5b61a528620d15c72c2250 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 30 Jan 2024 12:33:09 +0000 Subject: [PATCH 47/65] STEAPP-872: added the wizard nozzle_offset_fiber. --- stereotech_config/common/model_fiber_nozzle_offset.gcode | 1 + stereotech_config/wizards/nozzle_offset_fiber.cfg | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stereotech_config/common/model_fiber_nozzle_offset.gcode b/stereotech_config/common/model_fiber_nozzle_offset.gcode index 6c385e82cc98..1ae1bdcb33ac 100644 --- a/stereotech_config/common/model_fiber_nozzle_offset.gcode +++ b/stereotech_config/common/model_fiber_nozzle_offset.gcode @@ -3933,3 +3933,4 @@ M73 P100 M82 ;absolute extrusion mode M104 S0 ;End of Gcode +WIZARD_STEP_LOADING_STATE WIZARD=NOZZLE_OFFSET_FIBER STEP=NOZZLE_OFFSET_FIBER3 ENABLE=0 diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index 6a7a49dda46a..9fd1e5442862 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -62,16 +62,9 @@ action_gcode: {% set main_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_main_e|float %} {% set second_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_second_e|float %} {% set bed = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_bed|float %} - # {% set cmd = 'PRINT_NOZZLE_OFFSET MAIN_E=' ~ main_e ~ ' SECOND_E=' ~ second_e ~ ' BED=' ~ bed %} - # CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={next_step} CMD={'"' ~ cmd ~ '"'} - - - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={next_step} ENABLE=1 SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} - PRINT_NOZZLE_OFFSET MAIN_E={main_e} SECOND_E={second_e} BED={bed} - cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -127,5 +120,3 @@ action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - - From debe37b20c4ed1cd1e9b6e46e40adc2971cbc877 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 10:03:47 +0000 Subject: [PATCH 48/65] STEAPP-872: added the wizard nozzle_offset_hybrid. --- .../common/model_hybrid_nozzle_offset.gcode | 1 + .../cmd_debug/nozzle_offset_hybrid_cmd.cfg | 48 ++++++ .../wizards/nozzle_offset_fiber.cfg | 4 +- .../wizards/nozzle_offset_hybrid.cfg | 150 ++++++++++++++++++ 4 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 stereotech_config/wizards/cmd_debug/nozzle_offset_hybrid_cmd.cfg create mode 100644 stereotech_config/wizards/nozzle_offset_hybrid.cfg diff --git a/stereotech_config/common/model_hybrid_nozzle_offset.gcode b/stereotech_config/common/model_hybrid_nozzle_offset.gcode index f7615f47f4e6..23d13463416a 100644 --- a/stereotech_config/common/model_hybrid_nozzle_offset.gcode +++ b/stereotech_config/common/model_hybrid_nozzle_offset.gcode @@ -187,3 +187,4 @@ M73 P100 M82 ;absolute extrusion mode M104 S0 ;End of Gcode +WIZARD_STEP_LOADING_STATE WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID4 ENABLE=0 diff --git a/stereotech_config/wizards/cmd_debug/nozzle_offset_hybrid_cmd.cfg b/stereotech_config/wizards/cmd_debug/nozzle_offset_hybrid_cmd.cfg new file mode 100644 index 000000000000..1d2566723847 --- /dev/null +++ b/stereotech_config/wizards/cmd_debug/nozzle_offset_hybrid_cmd.cfg @@ -0,0 +1,48 @@ +# -------------------------------step 0 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID0 +WIZARD_STEP_BUTTON WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID0 BUTTON=load_material +WIZARD_STEP_BUTTON WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID0 BUTTON=bed_level +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID0 + +# -------------------------------step 1 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID1 + +# ---------------------------------step2 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID2 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID2 + +# ---------------------------------step3 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID3 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID3 SLIDER=set_temp_main_e VALUE=151 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID3 SLIDER=set_temp_second_e VALUE=152 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID3 SLIDER=set_temp_bed VALUE=40 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID3 + +# ---------------------------------step4 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID4 +WIZARD_STEP_JOG WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID4 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID4 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID4 + +# ---------------------------------step5 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID5 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID5 SLIDER=y_offset VALUE=7 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID5 + +# ---------------------------------step6 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID6 +WIZARD_STEP_SLIDER WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID6 SLIDER=x_offset VALUE=7 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID6 + +# ---------------------------------step7 + +EXECUTE_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID7 +CANCEL_WIZARD_STEP WIZARD=NOZZLE_OFFSET_HYBRID STEP=NOZZLE_OFFSET_HYBRID7 diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index 9fd1e5442862..f7b6c54d32aa 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -2,7 +2,6 @@ image: wizards/change_material/change_material.jpg type: 5d steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_OFFSET_FIBER3, NOZZLE_OFFSET_FIBER4, NOZZLE_OFFSET_FIBER5 -variable_continue_from_step: '' [wizard_step_button NOZZLE_OFFSET_FIBER0] image: wizards/nozzle_offset/wait_for_print.jpg @@ -92,9 +91,8 @@ image: none landscape: false description: NozzleOffset.NozzleOffsetDescription warning: none -countdown: 1140 +countdown: 0 info: none -placeholder: wizard-step-preheat steps: 15 default_step: 8 step_value: 0.1 diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg new file mode 100644 index 000000000000..dbfbcbf5c9d5 --- /dev/null +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -0,0 +1,150 @@ +[wizard NOZZLE_OFFSET_HYBRID] +image: wizards/change_material/change_material.jpg +type: 5d +steps: NOZZLE_OFFSET_HYBRID0, NOZZLE_OFFSET_HYBRID1, NOZZLE_OFFSET_HYBRID2, NOZZLE_OFFSET_HYBRID3, NOZZLE_OFFSET_HYBRID4, NOZZLE_OFFSET_HYBRID5, NOZZLE_OFFSET_HYBRID6, NOZZLE_OFFSET_HYBRID7 + +[wizard_step_button NOZZLE_OFFSET_HYBRID0] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.Description +warning: NozzleOffset.Prerequisites +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 + MOVE_SERVICE_POSITION + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +button_load_material_gcode: + SET_WIZARD_ENABLE WIZARD=CHANGE_MATERIAL_FILAMENT ENABLE=1 ERROR='' +button_bed_level_gcode: + SET_WIZARD_ENABLE WIZARD=BED_LEVEL_MANUAL ENABLE=1 ERROR='' +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_HYBRID1] +image: wizards/nozzle_offset/release_nozzle.jpg +landscape: false +description: NozzleOffset.ReleaseNozzle +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + G0 Z0 F600 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_HYBRID2] +image: wizards/nozzle_offset/adjust_nozzle.jpg +landscape: false +description: NozzleOffset.TightNozzle +warning: none +countdown: 0 +info: none +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + G0 Z30 F600 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider NOZZLE_OFFSET_HYBRID3] +image: wizards/nozzle_offset/select_temp.jpg +description: NozzleOffset.SetTemperatures +landscape: false +warning: none +countdown: 0 +info: none +slider_set_temp_main_e_min: 150 +slider_set_temp_main_e_max: 290 +slider_set_temp_main_e_step: 5 +slider_set_temp_main_e_default: 220 +slider_set_temp_second_e_min: 150 +slider_set_temp_second_e_max: 290 +slider_set_temp_second_e_step: 5 +slider_set_temp_second_e_default: 220 +slider_set_temp_bed_min: 40 +slider_set_temp_bed_max: 120 +slider_set_temp_bed_step: 5 +slider_set_temp_bed_default: 60 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set main_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_main_e|float %} + {% set second_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_second_e|float %} + {% set bed = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_bed|float %} + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={next_step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + PRINT_NOZZLE_OFFSET MAIN_E={main_e} SECOND_E={second_e} BED={bed} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_jog NOZZLE_OFFSET_HYBRID4] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.WaitForPrint +warning: none +countdown: 540 +info: none +placeholder: wizard-step-preheat +axes: z +steps: 0.05, 0.1, 1 +default_step: 0.1 +jog_gcode: + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider NOZZLE_OFFSET_HYBRID5] +image: wizards/nozzle_offset/grid_vertical.jpg +landscape: false +description: NozzleOffset.AdjustVertical +warning: none +countdown: 0 +info: none +slider_y_offset_min: 1 +slider_y_offset_max: 15 +slider_y_offset_step: 1 +slider_y_offset_default: 8 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set y_offset = printer["wizard_step_slider " ~ wizard.wizard_step_name].y_offset|float %} + SET_NOZZLE_OFFSET AXIS=Y VALUE={y_offset} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step_slider NOZZLE_OFFSET_HYBRID6] +image: wizards/nozzle_offset/grid_horizontal.jpg +landscape: false +description: NozzleOffset.AdjustHorizontal +warning: none +countdown: 0 +info: none +slider_x_offset_min: 1 +slider_x_offset_max: 15 +slider_x_offset_step: 1 +slider_x_offset_default: 8 +action_gcode: + {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} + {% set x_offset = printer["wizard_step_slider " ~ wizard.wizard_step_name].x_offset|float %} + SET_NOZZLE_OFFSET AXIS=X VALUE={x_offset} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_HYBRID7] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.Completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} From 2b1648dd5ad9159709afecf33168c1efef649b78 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 26 Jan 2024 10:04:35 +0000 Subject: [PATCH 49/65] STEAPP-872: added the wizard nozzle_offset_hybrid. --- HTE530-5-4-22.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 55b6ff5617a6..773e35f91f45 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -53,6 +53,8 @@ path: /home/ste/uploads [include stereotech_config/wizards/nozzle_offset_5d.cfg] [include stereotech_config/wizards/align_nozzles.cfg] +[include stereotech_config/wizards/nozzle_offset_fiber.cfg] +[include stereotech_config/wizards/nozzle_offset_hybrid.cfg] From 38b46c000ce31648ce96611dc8791f30adb655e4 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 31 Jan 2024 09:43:56 +0000 Subject: [PATCH 50/65] STEAPP-872: refactoring the code. --- klippy/extras/wizard/wizard.py | 12 ++++++-- .../wizards/adjust_basement_manual.cfg | 29 +++++++++---------- stereotech_config/wizards/common.cfg | 16 ++++------ 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/klippy/extras/wizard/wizard.py b/klippy/extras/wizard/wizard.py index cb97ccbdd291..cbc59118658a 100644 --- a/klippy/extras/wizard/wizard.py +++ b/klippy/extras/wizard/wizard.py @@ -29,6 +29,7 @@ def __init__(self, config): self.type = config.getlists('type', []) self.steps = config.getlists('steps', []) self.current_step = self.steps[0] + self.next_step = self.steps[1] if len(self.steps) > 2 else self.steps[0] # load objects self.printer = printer = config.get_printer() self.gcode = printer.lookup_object('gcode') @@ -53,7 +54,8 @@ def get_status(self, eventtime=None): 'variables': self.variables, 'name': self.name, 'steps': self.steps, - 'type': self.type} + 'type': self.type, + 'next_step': self.next_step} cmd_SET_WIZARD_VARIABLE_help = "Set the value of a wizard variable to wizard" @@ -65,8 +67,8 @@ def cmd_SET_WIZARD_VARIABLE(self, gcmd): "2051: Unknown wizard variable '%s'" % (variable,)) try: pass - # literal = ast.literal_eval(value) - # json.dumps(literal, separators=(',', ':')) + literal = ast.literal_eval(value) + json.dumps(literal, separators=(',', ':')) except (SyntaxError, TypeError, ValueError) as e: raise gcmd.error("2052: Unable to parse '%s' as a literal: %s" % (value, e)) @@ -87,6 +89,9 @@ def cmd_SET_WIZARD_STEP(self, gcmd): if step not in self.steps: raise gcmd.error("2053: Unknown step: '%s'" % step) self.current_step = step + if self.current_step != self.steps[-1]: + current_step_idx = self.steps.index(self.current_step) + self.next_step = self.steps[current_step_idx + 1] cmd_RESET_WIZARD_help = "Reset state the wizard" @@ -94,6 +99,7 @@ def cmd_RESET_WIZARD(self, gcmd): self.error = '' self.enabled = False self.current_step = self.steps[0] + self.next_step = self.steps[1] if len(self.steps) > 2 else self.steps[0] self.variables = dict(self._variables_bk) diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 30c095fc4d75..680428dc7078 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -2,9 +2,7 @@ image: wizards/zero_point_setup/zero_point_setup01.jpg type: 5d steps: ADJUST_BASEMENT_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL6 -variable_mode: '' -variable_wcs: 0 -variable_continue_from_step: '' +variable_wcs: 1 variable_diameter: 6.0 [wizard_step_button ADJUST_BASEMENT_MANUAL0] @@ -20,9 +18,7 @@ action_gcode: button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=ADJUST_BASEMENT_MANUAL1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -39,7 +35,7 @@ slider_set_diameter_default: 6 action_gcode: {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=diameter VALUE={diameter} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -50,7 +46,7 @@ landscape: false warning: none countdown: 0 action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -63,15 +59,18 @@ countdown: 0 items: 5D_spiral, 5D_spiral_full placeholder: wizard-step-probe action_gcode: - {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} - {% set wcs = 2 if mode == '5D_spiral' else 1 %} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE={wcs} + {% set wcs = wizard.variables.wcs|int %} MOVE_WCS_ZERO WCS={wcs} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={'ADJUST_BASEMENT_MANUAL' ~ (3 + wcs)} + {% if wcs == 1 %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} + {% else %} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL5 + {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} + {% set wcs = 2 if selected == '5D_spiral' else 1 %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE={wcs} [wizard_step_jog ADJUST_BASEMENT_MANUAL4] image: wizards/zero_point_setup/zero_point_setup01.jpg @@ -102,9 +101,9 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set diameter = printer['wizard ' ~ wizard.name].variables.diameter|float %} + {% set diameter = wizard.variables.diameter|float %} SET_WCS_OFFSET WCS=2 ADJUST_WCS=1 X=0 Y=0 Z={diameter / 2.0} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_MANUAL6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 7bea0eb5bb3a..7ca990f05a71 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -4,6 +4,9 @@ gcode: {% set step = params.STEP %} {% set temperature = params.TEMP %} {% set selected_e = params.EXTRUDER %} + {% if step == 'CLEAR_NOZZLE0' %} + MOVE_SERVICE_POSITION_HEAD + {% endif %} SET_HEATER_TEMPERATURE HEATER={selected_e} TARGET={temperature} WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=1 SET_WIZARD_STEP WIZARD={wizard} STEP={step} @@ -58,15 +61,10 @@ gcode: {% set abort = params.ABORT|default(1)|int %} {% set home = params.HOME|default(1)|int %} {% if printer["probe"] %} - CANCEL_TEST_PROBE UPDATE_DELAYED_GCODE ID=test_probe_loop_two DURATION=0.0 {% endif %} - TURN_OFF_HEATERS - {% if home %} - HOME_POSITION ABORT={abort} - {% endif %} + HOME_POSITION ABORT={abort} RESET_WIZARD_OLD WIZARD={wizard} - G54 [delayed_gcode test_probe_loop_two] gcode: @@ -90,7 +88,7 @@ info: none placeholder: wizard-step-preheat action_gcode: RETRACT_MATERIAL - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CLEAR_NOZZLE1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -102,10 +100,8 @@ warning: none countdown: 0 info: none action_gcode: - TURN_OFF_HEATERS MOVE_SERVICE_POSITION - {% set continue_from_step = wizard.variables.continue_from_step %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={continue_from_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} From 9aaf5705b31b1b16445d43145f5a680425632265 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 31 Jan 2024 12:40:51 +0000 Subject: [PATCH 51/65] STEAPP-872: refactoring the code. --- klippy/extras/wizard/wizard.py | 2 +- .../wizards/5d_calibration_auto.cfg | 20 ++++---- .../wizards/5d_calibration_manual.cfg | 16 +++---- .../wizards/5d_calibration_manual_old.cfg | 23 ++++----- .../wizards/adjust_basement_auto.cfg | 32 ++++++------- stereotech_config/wizards/align_nozzles.cfg | 15 ++---- stereotech_config/wizards/bed_level_auto.cfg | 26 ++++------ .../wizards/bed_level_manual.cfg | 14 ++---- .../wizards/change_material_fiber.cfg | 42 ++++------------- .../wizards/change_material_filament.cfg | 47 +++++-------------- stereotech_config/wizards/change_module.cfg | 4 +- stereotech_config/wizards/common.cfg | 14 +++++- .../wizards/nozzle_offset_5d.cfg | 20 +++----- .../wizards/nozzle_offset_fiber.cfg | 17 +++---- .../wizards/nozzle_offset_hybrid.cfg | 23 ++++----- .../wizards/zero_point_calibration.cfg | 10 ++-- 16 files changed, 117 insertions(+), 208 deletions(-) diff --git a/klippy/extras/wizard/wizard.py b/klippy/extras/wizard/wizard.py index cbc59118658a..39cec543434b 100644 --- a/klippy/extras/wizard/wizard.py +++ b/klippy/extras/wizard/wizard.py @@ -73,7 +73,7 @@ def cmd_SET_WIZARD_VARIABLE(self, gcmd): raise gcmd.error("2052: Unable to parse '%s' as a literal: %s" % (value, e)) v = dict(self.variables) - v[variable] = value + v[variable] = literal self.variables = v cmd_SET_WIZARD_ENABLE_help = "Set the enable to WIZARD" diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index d8672d4174b4..a34e0c9e4d3b 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -2,7 +2,6 @@ image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg type: 5d steps: CALIBRATE_5D_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_AUTO1, CALIBRATE_5D_AUTO2, CALIBRATE_5D_AUTO3, CALIBRATE_5D_AUTO4, CALIBRATE_5D_AUTO5, CALIBRATE_5D_AUTO6, CALIBRATE_5D_AUTO7, CALIBRATE_5D_AUTO8 -variable_continue_from_step: '' [wizard_step_button CALIBRATE_5D_AUTO0] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg @@ -13,15 +12,12 @@ countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - TURN_OFF_HEATERS MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_AUTO1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -33,7 +29,7 @@ warning: 5DCalibrationAuto.GapBetweenTemplateModule countdown: 0 info: none action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -45,7 +41,7 @@ warning: 5DCalibrationAuto.WarningScrew countdown: 0 info: none action_gcode: - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO3 + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -59,7 +55,7 @@ info: none placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_FIVE_D' %} - CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO4 CMD={cmd} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={wizard.next_step} CMD={cmd} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -72,7 +68,7 @@ countdown: 420 info: none placeholder: waitProgress true action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO5 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -91,7 +87,7 @@ jog_gcode: action_gcode: ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -106,7 +102,7 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 button_xy_correction_gcode: MOVE_TO_AUTO_WCS XY=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -125,7 +121,7 @@ jog_gcode: action_gcode: ADJUST_PROBE_OFFSET_XY ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index 035c4591486d..e91c0ecb5154 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -2,7 +2,6 @@ image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg type: 5d steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, CALIBRATE_5D_MANUAL2, CALIBRATE_5D_MANUAL3, CALIBRATE_5D_MANUAL4, CALIBRATE_5D_MANUAL5, CALIBRATE_5D_MANUAL6 -variable_continue_from_step: '' [wizard_step_button CALIBRATE_5D_MANUAL0] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg @@ -13,15 +12,12 @@ countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - TURN_OFF_HEATERS MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_MANUAL1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -34,7 +30,7 @@ countdown: 0 info: none action_gcode: MOVE_CALIBRATION_POINT POINT=0 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -53,7 +49,7 @@ jog_gcode: action_gcode: SET_A_AXIS_OFFSET_POINT POINT=0 MOVE_CALIBRATION_POINT POINT=3 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -73,7 +69,7 @@ action_gcode: SET_A_AXIS_OFFSET_POINT POINT=1 CALC_A_AXIS_OFFSET MOVE_WCS_ZERO WCS=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -93,7 +89,7 @@ action_gcode: SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 MOVE_WCS_ZERO WCS=2 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL5 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -112,7 +108,7 @@ jog_gcode: action_gcode: SET_WCS_OFFSET WCS=2 X=0 Y=0 Z=10 SET_WCS_OFFSET WCS=4 X=0 Y=0 Z=10 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index dea555ef5179..380fc74a9b3c 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -2,7 +2,6 @@ image: wizards/5d_calibration_manual/5d_calibration1.jpg type: 5d steps: CALIBRATE_5D_MANUAL_OLD0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL_OLD1, CALIBRATE_5D_MANUAL_OLD2, CALIBRATE_5D_MANUAL_OLD3, CALIBRATE_5D_MANUAL_OLD4, CALIBRATE_5D_MANUAL_OLD5, CALIBRATE_5D_MANUAL_OLD6, CALIBRATE_5D_MANUAL_OLD7 -variable_continue_from_step: '' variable_diameter: 0.2 [wizard_step_button CALIBRATE_5D_MANUAL_OLD0] @@ -14,15 +13,12 @@ countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - TURN_OFF_HEATERS MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=CALIBRATE_5D_MANUAL_OLD1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -40,10 +36,8 @@ slider_set_diameter_default: 0.2 action_gcode: {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=diameter VALUE={diameter} - {action_respond_info('-------------------action_gcode %s, diameter=%s' % (wizard.wizard_step_name, diameter))} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % (wizard.wizard_step_name, ))} RESET_WIZARD WIZARD={wizard.name} [wizard_step CALIBRATE_5D_MANUAL_OLD2] @@ -55,7 +49,7 @@ countdown: 0 info: none action_gcode: MOVE_CALIBRATION_POINT POINT=0 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -74,7 +68,7 @@ jog_gcode: action_gcode: SET_A_AXIS_OFFSET_POINT POINT=0 MOVE_CALIBRATION_POINT POINT=3 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -94,7 +88,7 @@ action_gcode: SET_A_AXIS_OFFSET_POINT POINT=1 CALC_A_AXIS_OFFSET MOVE_WCS_ZERO WCS=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD5 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -114,7 +108,7 @@ action_gcode: SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 SET_WCS_OFFSET WCS=3 X=0 Y=0 Z=0 MOVE_WCS_ZERO WCS=2 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD6 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -131,11 +125,10 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set diameter = printer['wizard ' ~ wizard.name].variables.diameter|float %} - {action_respond_info('--------------diameter=%s' % (diameter / 2.0, ))} + {% set diameter = wizard.variables.diameter|float %} SET_WCS_OFFSET WCS=2 X=0 Y=0 Z={diameter / 2.0} SET_WCS_OFFSET WCS=4 X=0 Y=0 Z={diameter / 2.0} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_MANUAL_OLD7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 67b17a88ee0c..0ff9e54fbda4 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -2,8 +2,7 @@ image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg type: 5d steps: ADJUST_BASEMENT_AUTO0, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7 -variable_mode: '' -variable_wcs: 0 +variable_wcs: 1 [wizard_step ADJUST_BASEMENT_AUTO0] image: wizards/adjust_basement_auto/adjust_basement_auto.jpg @@ -15,7 +14,7 @@ info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -27,7 +26,7 @@ warning: AdjustBasementAuto.MakeSureBaseProtrudes countdown: 0 info: none action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -39,7 +38,7 @@ warning: AdjustBasementAuto.WarningScrew countdown: 0 info: none action_gcode: - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO3 + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -52,7 +51,7 @@ countdown: 0 info: none placeholder: wizard-step-probe action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -65,20 +64,19 @@ countdown: 0 info: none items: 5D_spiral, 5D_spiral_full action_gcode: - {% set mode = printer['wizard ' ~ wizard.name].variables.mode %} - {% if mode == '5D_spiral' %} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=1 - AUTO_BASEMENT_WCS_MOVE WCS=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO5 + {% set wcs = wizard.variables.wcs|int %} + {% if wcs == 1 %} + AUTO_BASEMENT_WCS_MOVE WCS={wcs} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% else %} - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE=0 {% set cmd = 'AUTO_BASEMENT_WCS' %} CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 CMD={cmd} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=mode VALUE={selected} + {% set wcs = 1 if selected == '5D_spiral' else 0 %} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=wcs VALUE={wcs} [wizard_step_jog ADJUST_BASEMENT_AUTO5] image: wizards/adjust_basement_auto/move-sensor-to-center.jpg @@ -93,9 +91,9 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + {% set wcs = wizard.variables.wcs %} {% set cmd = 'AUTO_BASEMENT_WCS WCS=' ~ wcs %} - CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO6 CMD={cmd} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={wizard.next_step} CMD={cmd} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -108,9 +106,9 @@ countdown: 0 info: none placeholder: waitProgress true action_gcode: - {% set wcs = printer['wizard ' ~ wizard.name].variables.wcs %} + {% set wcs = wizard.variables.wcs %} ADJUST_BASEMENT_WCS WCS={wcs} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ADJUST_BASEMENT_AUTO7 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/align_nozzles.cfg b/stereotech_config/wizards/align_nozzles.cfg index 2c8d92efdb8b..633016651b7e 100644 --- a/stereotech_config/wizards/align_nozzles.cfg +++ b/stereotech_config/wizards/align_nozzles.cfg @@ -1,8 +1,7 @@ [wizard ALIGN_NOZZLES] image: wizards/change_material/change_material.jpg type: 5d -steps: ALIGN_NOZZLES0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ALIGN_NOZZLES1, ALIGN_NOZZLES2, ALIGN_NOZZLES3, ALIGN_NOZZLES4 -variable_continue_from_step: '' +steps: ALIGN_NOZZLES0, ALIGN_NOZZLES1, ALIGN_NOZZLES2, ALIGN_NOZZLES3, ALIGN_NOZZLES4 [wizard_step_button ALIGN_NOZZLES0] image: wizards/nozzle_offset/wait_for_print.jpg @@ -19,7 +18,7 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=ALIGN_NOZZLES2 {% else %} # 5d - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ALIGN_NOZZLES1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} button_calibarate_module_gcode: {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} @@ -50,8 +49,7 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -63,7 +61,6 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} # 3d G54 @@ -73,7 +70,7 @@ action_gcode: G55 G0 X0 Y0 A0 F600 {% endif %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -85,11 +82,10 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} G91 G0 Z30 F600 G90 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -101,7 +97,6 @@ warning: none countdown: 0 info: none action_gcode: - G54 RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg index 51c8e50e4a08..ee10057317e9 100644 --- a/stereotech_config/wizards/bed_level_auto.cfg +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -2,7 +2,6 @@ image: wizards/change_material/change_material.jpg type: 3d steps: BED_LEVEL_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_AUTO1, BED_LEVEL_AUTO2, BED_LEVEL_AUTO3, BED_LEVEL_AUTO4, BED_LEVEL_AUTO5, BED_LEVEL_AUTO6, BED_LEVEL_AUTO7, BED_LEVEL_AUTO8 -variable_continue_from_step: '' [wizard_step_button BED_LEVEL_AUTO0] image: wizards/BED_LEVEL_AUTO/bed_leveling.jpg @@ -18,9 +17,7 @@ action_gcode: button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=BED_LEVEL_AUTO1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -33,9 +30,8 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} Z_ENDSTOP_CALIBRATE - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -51,9 +47,8 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ACCEPT_Z_ENDSTOP - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -66,10 +61,9 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ABORT ACCEPT_Z_ENDSTOP PROBE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_next_point_gcode: @@ -83,8 +77,7 @@ warning: BedLevelAuto.WarningScrew countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={next_step} + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -97,9 +90,8 @@ countdown: 0 info: none placeholder: wizard-step-probe action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set cmd = 'CALIBRATE_MODULE_THREE_D' %} - CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={next_step} CMD={cmd} + CHANGE_STEP_AND_WAIT_RUN_CMD WIZARD={wizard.name} STEP={wizard.next_step} CMD={cmd} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -112,8 +104,7 @@ countdown: 420 info: none placeholder: waitProgress true action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -125,8 +116,7 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg index 6bb3eac6f38b..13136556cadc 100644 --- a/stereotech_config/wizards/bed_level_manual.cfg +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -2,7 +2,6 @@ image: wizards/change_material/change_material.jpg type: 3d steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_LEVEL_MANUAL2, BED_LEVEL_MANUAL3, BED_LEVEL_MANUAL4 -variable_continue_from_step: '' [wizard_step_button BED_LEVEL_MANUAL0] image: wizards/bed_level_manual/bed_leveling.jpg @@ -18,9 +17,7 @@ action_gcode: button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=BED_LEVEL_MANUAL1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -33,9 +30,8 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} Z_ENDSTOP_CALIBRATE - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -51,9 +47,8 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ACCEPT_Z_ENDSTOP - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -66,9 +61,8 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ABORT - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_next_point_gcode: diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg index 721804dadcf3..72b449b930f2 100644 --- a/stereotech_config/wizards/change_material_fiber.cfg +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -1,7 +1,7 @@ [wizard CHANGE_MATERIAL_FIBER] image: wizards/change_fiber/change_fiber.jpg type: any -steps: CHANGE_MATERIAL_FIBER0, CHANGE_MATERIAL_FIBER1, CHANGE_MATERIAL_FIBER2, CHANGE_MATERIAL_FIBER3, CHANGE_MATERIAL_FIBER4, CHANGE_MATERIAL_FIBER5, CHANGE_MATERIAL_FIBER6, CHANGE_MATERIAL_FIBER7, CHANGE_MATERIAL_FIBER8 +steps: CHANGE_MATERIAL_FIBER0, CHANGE_MATERIAL_FIBER1, CHANGE_MATERIAL_FIBER2, CHANGE_MATERIAL_FIBER3, CHANGE_MATERIAL_FIBER4, CHANGE_MATERIAL_FIBER5, CHANGE_MATERIAL_FIBER6, CHANGE_MATERIAL_FIBER7, CHANGE_MATERIAL_COMPLETED variable_action: 'all' variable_selected_e: 'extruder1' variable_temperature: 240 @@ -15,12 +15,11 @@ warning: ChangeMaterialFiber.stepOneWarning countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set selected_e = wizard.variables.selected_e %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION_HEAD ACTIVATE_EXTRUDER EXTRUDER={selected_e} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -33,20 +32,18 @@ countdown: 0 info: none items: insert, eject, all action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set action = wizard.variables.action %} {% set selected_e = wizard.variables.selected_e %} {% set cooldown_temp = wizard.variables.cooldown_temp %} {% if action == 'insert' %} - TURN_OFF_HEATERS CHANGE_STEP_AND_WAIT_COOLING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FIBER4 TEMP={cooldown_temp} EXTRUDER={selected_e} {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE='"{selected}"' [wizard_step_slider CHANGE_MATERIAL_FIBER2] image: wizards/change_material/change_material02.jpg @@ -60,11 +57,10 @@ slider_set_temp_max: 300 slider_set_temp_step: 5 slider_set_temp_default: 240 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set selected_e = wizard.variables.selected_e %} {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp|float %} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=temperature VALUE={temperature} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -77,15 +73,13 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set selected_e = wizard.variables.selected_e %} {% set cooldown_temp = wizard.variables.cooldown_temp %} {% set action = wizard.variables.action %} {% if action == 'remove' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FIBER8 {% else %} - TURN_OFF_HEATERS - CHANGE_STEP_AND_WAIT_COOLING WIZARD={wizard.name} STEP={next_step} TEMP={cooldown_temp} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_COOLING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={cooldown_temp} EXTRUDER={selected_e} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -107,10 +101,9 @@ countdown: 0 info: none placeholder: wizard-step-preheat # COOL DOWN action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = wizard.variables.temperature %} {% set selected_e = wizard.variables.selected_e %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -123,8 +116,7 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: @@ -146,11 +138,10 @@ slider_set_temp_max: 300 slider_set_temp_step: 5 slider_set_temp_default: 240 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp|float %} {% set selected_e = wizard.variables.selected_e %} SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=temperature VALUE={temperature} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -163,8 +154,7 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_load_gcode: @@ -175,15 +165,3 @@ button_cut_gcode: PRIME_FIBER button_retract_gcode: RETRACT_MATERIAL - -[wizard_step CHANGE_MATERIAL_FIBER8] -image: wizards/change_material/change_material.jpg -landscape: false -description: Material change completed -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index 0de5bb672764..8bc0b4b65381 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -1,7 +1,7 @@ [wizard CHANGE_MATERIAL_FILAMENT] image: wizards/change_material/change_material.jpg type: any -steps: CHANGE_MATERIAL_FILAMENT0, CHANGE_MATERIAL_FILAMENT1, CHANGE_MATERIAL_FILAMENT2, CHANGE_MATERIAL_FILAMENT3, CHANGE_MATERIAL_FILAMENT4, CHANGE_MATERIAL_FILAMENT5, CHANGE_MATERIAL_FILAMENT6, CHANGE_MATERIAL_FILAMENT7, CHANGE_MATERIAL_FILAMENT8, CHANGE_MATERIAL_FILAMENT9, CHANGE_MATERIAL_FILAMENT10, , CHANGE_MATERIAL_FILAMENT11 +steps: CHANGE_MATERIAL_FILAMENT0, CHANGE_MATERIAL_FILAMENT1, CHANGE_MATERIAL_FILAMENT2, CHANGE_MATERIAL_FILAMENT3, CHANGE_MATERIAL_FILAMENT4, CHANGE_MATERIAL_FILAMENT5, CHANGE_MATERIAL_FILAMENT6, CHANGE_MATERIAL_FILAMENT7, CHANGE_MATERIAL_FILAMENT8, CHANGE_MATERIAL_FILAMENT9, CHANGE_MATERIAL_FILAMENT10 variable_selected_e: 'extruder' variable_action: 'all' @@ -13,11 +13,10 @@ warning: Missing extruder countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION_HEAD {% if printer.extruder and printer.extruder1 %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% else %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT2 ACTIVATE_EXTRUDER EXTRUDER=extruder @@ -34,10 +33,9 @@ countdown: 0 info: none items: extruder, extruder1 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set selected_e = wizard.variables.selected_e %} ACTIVATE_EXTRUDER EXTRUDER={selected_e} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: @@ -52,17 +50,16 @@ countdown: 0 info: none items: insert, eject, all action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set action = wizard.variables.action %} {% if action == 'insert' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT7 {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} select_gcode: - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE={selected} + SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=action VALUE='"{selected}"' [wizard_step_tree CHANGE_MATERIAL_FILAMENT3] image: wizards/change_material/change_material02.jpg @@ -75,13 +72,12 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} {% set selected_e = wizard.variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT5 TEMP={temperature} EXTRUDER={selected_e} {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -98,10 +94,9 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].slider1|float %} {% set selected_e = wizard.variables.selected_e %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -114,12 +109,11 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set action = wizard.variables.action %} {% if action == 'remove' %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -139,13 +133,12 @@ tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer['wizard_step_tree ' ~ wizard.wizard_step_name].value|float %} {% set selected_e = wizard.variables.selected_e %} {% if temperature >= 110.0 %} CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT8 TEMP={temperature} EXTRUDER={selected_e} {% else %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} {% endif %} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -162,10 +155,9 @@ slider_slider1_max: 300 slider_slider1_step: 5 slider_slider1_default: 240 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set temperature = printer["wizard_step_slider " ~ wizard.wizard_step_name].slider1|float %} {% set selected_e = wizard.variables.selected_e %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -178,10 +170,9 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set selected_e = wizard.variables.selected_e %} {% set temperature = printer[selected_e].target|float %} - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={next_step} TEMP={temperature} EXTRUDER={selected_e} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP={temperature} EXTRUDER={selected_e} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -194,7 +185,6 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -215,23 +205,10 @@ countdown: 0 info: none placeholder: wizard-step-preheat action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_retract_gcode: RETRACT_MATERIAL button_load_gcode: LOAD_MATERIAL - -[wizard_step CHANGE_MATERIAL_FILAMENT11] -image: wizards/change_material/change_material.jpg -landscape: false -description: Material change completed -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index fda5a05ea853..d8e32add5382 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -11,7 +11,7 @@ countdown: 0 info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 - SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP=CHANGE_MODULE1 + SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -23,7 +23,7 @@ warning: Calibration required after module change countdown: 0 info: none action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MODULE2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} button_power_off_gcode: diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 7ca990f05a71..5b74b439b991 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -27,8 +27,8 @@ gcode: M106 S255 M109 S{need_temp} M106 S0 - TURN_OFF_HEATERS {% endif %} + TURN_OFF_HEATERS WIZARD_STEP_LOADING_STATE WIZARD={wizard} STEP={step} ENABLE=0 [gcode_macro CHANGE_STEP_AND_WAIT_PROBE] @@ -119,3 +119,15 @@ gcode: {% elif mode == '3d' %} TESTZ Z={direction ~ val} {% endif %} + +[wizard_step CHANGE_MATERIAL_COMPLETED] +image: wizards/change_material/change_material.jpg +landscape: false +description: Material change completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg index 2a19c1c960ef..6deeab221f0d 100644 --- a/stereotech_config/wizards/nozzle_offset_5d.cfg +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -2,7 +2,6 @@ image: wizards/change_material/change_material.jpg type: 5d steps: NOZZLE_OFFSET_5D0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, NOZZLE_OFFSET_5D1, NOZZLE_OFFSET_5D2, NOZZLE_OFFSET_5D3, NOZZLE_OFFSET_5D4, NOZZLE_OFFSET_5D5 -variable_continue_from_step: '' [wizard_step_button NOZZLE_OFFSET_5D0] image: none @@ -12,16 +11,13 @@ warning: NozzleOffset5D.MakeSureFreeOfPlastic countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP=NOZZLE_OFFSET_5D1 button_clear_noozle_gcode: {% set extruder = printer.toolhead.extruder|default('extruder') %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - MOVE_SERVICE_POSITION_HEAD - SET_WIZARD_VARIABLE WIZARD={wizard.name} VARIABLE=continue_from_step VALUE=NOZZLE_OFFSET_5D1 - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP=CLEAR_NOZZLE0 TEMP=200 EXTRUDER={extruder} + CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -33,8 +29,7 @@ warning: NozzleOffset5D.GapBetweenTemplateModule countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -46,8 +41,7 @@ warning: NozzleOffset5D.WarningScrew countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={next_step} + CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -60,9 +54,8 @@ countdown: 0 info: none placeholder: wizard-step-probe action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ADJUST_NOZZLE_OFFSET_Z - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -78,10 +71,9 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='5d' action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index f7b6c54d32aa..4cd8f116c075 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -11,11 +11,10 @@ warning: NozzleOffset.Prerequisites countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION G0 Z0 F600 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} button_load_material_gcode: SET_WIZARD_ENABLE WIZARD=CHANGE_MATERIAL_FIBER ENABLE=1 ERROR='' button_bed_level_gcode: @@ -31,9 +30,8 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} G0 Z30 F600 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -57,12 +55,11 @@ slider_set_temp_bed_max: 120 slider_set_temp_bed_step: 5 slider_set_temp_bed_default: 60 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set main_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_main_e|float %} {% set second_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_second_e|float %} {% set bed = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_bed|float %} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={next_step} ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={wizard.next_step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} PRINT_NOZZLE_OFFSET MAIN_E={main_e} SECOND_E={second_e} BED={bed} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -81,8 +78,7 @@ default_step: 0.1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -98,12 +94,11 @@ default_step: 8 step_value: 0.1 min_value: -0.7 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set step_x = printer["wizard_step_nozzle_offset " ~ wizard.wizard_step_name].step_x|float %} {% set step_y = printer["wizard_step_nozzle_offset " ~ wizard.wizard_step_name].step_y|float %} SET_NOZZLE_OFFSET AXIS=X VALUE={step_x} SET_NOZZLE_OFFSET AXIS=Y VALUE={step_y} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index dbfbcbf5c9d5..66b3fe323a4c 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -11,10 +11,9 @@ warning: NozzleOffset.Prerequisites countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} button_load_material_gcode: SET_WIZARD_ENABLE WIZARD=CHANGE_MATERIAL_FILAMENT ENABLE=1 ERROR='' button_bed_level_gcode: @@ -30,9 +29,8 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} G0 Z0 F600 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -44,9 +42,8 @@ warning: none countdown: 0 info: none action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} G0 Z30 F600 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -70,12 +67,11 @@ slider_set_temp_bed_max: 120 slider_set_temp_bed_step: 5 slider_set_temp_bed_default: 60 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set main_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_main_e|float %} {% set second_e = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_second_e|float %} {% set bed = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_temp_bed|float %} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={next_step} ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={wizard.next_step} ENABLE=1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} PRINT_NOZZLE_OFFSET MAIN_E={main_e} SECOND_E={second_e} BED={bed} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -94,8 +90,7 @@ default_step: 0.1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -111,10 +106,9 @@ slider_y_offset_max: 15 slider_y_offset_step: 1 slider_y_offset_default: 8 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set y_offset = printer["wizard_step_slider " ~ wizard.wizard_step_name].y_offset|float %} SET_NOZZLE_OFFSET AXIS=Y VALUE={y_offset} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -130,10 +124,9 @@ slider_x_offset_max: 15 slider_x_offset_step: 1 slider_x_offset_default: 8 action_gcode: - {% set next_step = wizard.name ~ (wizard.wizard_step_name[-1]|int + 1) %} {% set x_offset = printer["wizard_step_slider " ~ wizard.wizard_step_name].x_offset|float %} SET_NOZZLE_OFFSET AXIS=X VALUE={x_offset} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={next_step} + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg index 8a0a02f24a43..9d7fa92be518 100644 --- a/stereotech_config/wizards/zero_point_calibration.cfg +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -12,7 +12,7 @@ countdown: 0 action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE1 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -24,7 +24,7 @@ warning: none countdown: 0 action_gcode: MOVE_WCS_ZERO WCS=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE2 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -42,7 +42,7 @@ jog_gcode: action_gcode: SET_WCS_OFFSET WCS=1 X=0 Y=0 Z=0 MOVE_WCS_ZERO WCS=2 - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE3 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -58,7 +58,7 @@ default_step: 1 jog_gcode: JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE4 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} @@ -76,7 +76,7 @@ slider_set_diameter_default: 0.2 action_gcode: {% set diameter = printer["wizard_step_slider " ~ wizard.wizard_step_name].set_diameter|float %} SET_WCS_OFFSET WCS=2 X=0 Y=0 Z={diameter / 2.0} - SET_WIZARD_STEP WIZARD={wizard.name} STEP=ZERO_POINT_CALIBRATE5 + SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} From f3dff14476405dca39e21d17c2252562cf912292 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 31 Jan 2024 13:10:16 +0000 Subject: [PATCH 52/65] STEAPP-872: duplicate code in the wizards has been removed --- .../wizards/5d_calibration_manual.cfg | 14 +---- .../wizards/5d_calibration_manual_old.cfg | 14 +---- .../wizards/adjust_basement_manual.cfg | 15 +----- stereotech_config/wizards/bed_level_auto.cfg | 53 +------------------ .../wizards/change_material_filament.cfg | 2 +- stereotech_config/wizards/common.cfg | 36 +++++++++++++ .../wizards/nozzle_offset_fiber.cfg | 14 +---- .../wizards/nozzle_offset_hybrid.cfg | 14 +---- .../wizards/zero_point_calibration.cfg | 14 +---- 9 files changed, 46 insertions(+), 130 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index e91c0ecb5154..600b00051f4e 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -1,7 +1,7 @@ [wizard CALIBRATE_5D_MANUAL] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg type: 5d -steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, CALIBRATE_5D_MANUAL2, CALIBRATE_5D_MANUAL3, CALIBRATE_5D_MANUAL4, CALIBRATE_5D_MANUAL5, CALIBRATE_5D_MANUAL6 +steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, CALIBRATE_5D_MANUAL2, CALIBRATE_5D_MANUAL3, CALIBRATE_5D_MANUAL4, CALIBRATE_5D_MANUAL5, CALIBRATE_5D_MANUAL_COMPLETED [wizard_step_button CALIBRATE_5D_MANUAL0] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg @@ -111,15 +111,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step CALIBRATE_5D_MANUAL6] -image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -landscape: false -description: Five Axis Calibration complete -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index 380fc74a9b3c..92beba37d59d 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -1,7 +1,7 @@ [wizard CALIBRATE_5D_MANUAL_OLD] image: wizards/5d_calibration_manual/5d_calibration1.jpg type: 5d -steps: CALIBRATE_5D_MANUAL_OLD0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL_OLD1, CALIBRATE_5D_MANUAL_OLD2, CALIBRATE_5D_MANUAL_OLD3, CALIBRATE_5D_MANUAL_OLD4, CALIBRATE_5D_MANUAL_OLD5, CALIBRATE_5D_MANUAL_OLD6, CALIBRATE_5D_MANUAL_OLD7 +steps: CALIBRATE_5D_MANUAL_OLD0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL_OLD1, CALIBRATE_5D_MANUAL_OLD2, CALIBRATE_5D_MANUAL_OLD3, CALIBRATE_5D_MANUAL_OLD4, CALIBRATE_5D_MANUAL_OLD5, CALIBRATE_5D_MANUAL_OLD6, CALIBRATE_5D_MANUAL_COMPLETED variable_diameter: 0.2 [wizard_step_button CALIBRATE_5D_MANUAL_OLD0] @@ -131,15 +131,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step CALIBRATE_5D_MANUAL_OLD7] -image: wizards/5d_calibration_manual/5d_calibration.jpg -landscape: false -description: Five Axis Calibration complete -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 680428dc7078..8adf4fc32b08 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -1,7 +1,7 @@ [wizard ADJUST_BASEMENT_MANUAL] image: wizards/zero_point_setup/zero_point_setup01.jpg type: 5d -steps: ADJUST_BASEMENT_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL6 +steps: ADJUST_BASEMENT_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, ADJUST_BASEMENT_MANUAL1, ADJUST_BASEMENT_MANUAL2, ADJUST_BASEMENT_MANUAL3, ADJUST_BASEMENT_MANUAL4, ADJUST_BASEMENT_MANUAL5, ADJUST_BASEMENT_MANUAL_COMPLETED variable_wcs: 1 variable_diameter: 6.0 @@ -11,6 +11,7 @@ description: This wizard helps you to setup zero point for proper 5D printing landscape: false warning: none countdown: 0 +info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -106,15 +107,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step ADJUST_BASEMENT_MANUAL6] -image: wizards/zero_point_setup/zero_point_setup.jpg -description: Adjust basement completed -landscape: false -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg index ee10057317e9..46220b61267c 100644 --- a/stereotech_config/wizards/bed_level_auto.cfg +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -1,59 +1,10 @@ [wizard BED_LEVEL_AUTO] image: wizards/change_material/change_material.jpg type: 3d -steps: BED_LEVEL_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_AUTO1, BED_LEVEL_AUTO2, BED_LEVEL_AUTO3, BED_LEVEL_AUTO4, BED_LEVEL_AUTO5, BED_LEVEL_AUTO6, BED_LEVEL_AUTO7, BED_LEVEL_AUTO8 - -[wizard_step_button BED_LEVEL_AUTO0] -image: wizards/BED_LEVEL_AUTO/bed_leveling.jpg -landscape: false -description: Perform bed leveling if there is too much distance between the nozzles and the build plate -warning: BedLevelManual.MakeSureFreeOfPlastic -countdown: 0 -info: none -action_gcode: - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 - Z_ENDSTOP_CALIBRATE - SET_WIZARD_STEP WIZARD={wizard.name} STEP=BED_LEVEL_AUTO2 -button_clear_noozle_gcode: - {% set extruder = printer.toolhead.extruder|default('extruder') %} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' - CHANGE_STEP_AND_WAIT_HEATING WIZARD={wizard.name} STEP={wizard.next_step} TEMP=200 EXTRUDER={extruder} -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -# this step is added because clear_nozzle cannot run additional commands in action_gcode (Z_ENDSTOP_CALIBRATE) -[wizard_step BED_LEVEL_AUTO1] -image: wizards/BED_LEVEL_AUTO/bed_leveling.jpg -landscape: false -description: Perform bed leveling if there is too much distance between the nozzles and the build plate -warning: none -countdown: 0 -info: none -action_gcode: - Z_ENDSTOP_CALIBRATE - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_jog BED_LEVEL_AUTO2] -image: wizards/BED_LEVEL_AUTO/bed_leveling05.jpg -description: Adjust gap between left nozzle and bed using controls -landscape: false -warning: none -countdown: 0 -axes: z -steps: 0.05, 0.1, 1, 10 -default_step: 1 -jog_gcode: - JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' -action_gcode: - ACCEPT_Z_ENDSTOP - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} +steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_LEVEL_MANUAL2, BED_LEVEL_AUTO3, BED_LEVEL_AUTO4, BED_LEVEL_AUTO5, BED_LEVEL_AUTO6, BED_LEVEL_AUTO7, BED_LEVEL_AUTO8 [wizard_step_button BED_LEVEL_AUTO3] -image: wizards/BED_LEVEL_AUTO/bed_leveling04.jpg +image: wizards/bed_level_manual/bed_leveling04.jpg landscape: false description: Wait until bed and printhead stop and adjust nearest thumb wheel warning: none diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index 8bc0b4b65381..1aac0787acc0 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -1,7 +1,7 @@ [wizard CHANGE_MATERIAL_FILAMENT] image: wizards/change_material/change_material.jpg type: any -steps: CHANGE_MATERIAL_FILAMENT0, CHANGE_MATERIAL_FILAMENT1, CHANGE_MATERIAL_FILAMENT2, CHANGE_MATERIAL_FILAMENT3, CHANGE_MATERIAL_FILAMENT4, CHANGE_MATERIAL_FILAMENT5, CHANGE_MATERIAL_FILAMENT6, CHANGE_MATERIAL_FILAMENT7, CHANGE_MATERIAL_FILAMENT8, CHANGE_MATERIAL_FILAMENT9, CHANGE_MATERIAL_FILAMENT10 +steps: CHANGE_MATERIAL_FILAMENT0, CHANGE_MATERIAL_FILAMENT1, CHANGE_MATERIAL_FILAMENT2, CHANGE_MATERIAL_FILAMENT3, CHANGE_MATERIAL_FILAMENT4, CHANGE_MATERIAL_FILAMENT5, CHANGE_MATERIAL_FILAMENT6, CHANGE_MATERIAL_FILAMENT7, CHANGE_MATERIAL_FILAMENT8, CHANGE_MATERIAL_FILAMENT9, CHANGE_MATERIAL_FILAMENT10, CHANGE_MATERIAL_COMPLETED variable_selected_e: 'extruder' variable_action: 'all' diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 5b74b439b991..dca7f7cfd2f9 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -131,3 +131,39 @@ action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: RESET_WIZARD WIZARD={wizard.name} + +[wizard_step NOZZLE_OFFSET_COMPLETED] +image: wizards/nozzle_offset/wait_for_print.jpg +landscape: false +description: NozzleOffset.Completed +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step ADJUST_BASEMENT_MANUAL_COMPLETED] +image: wizards/zero_point_setup/zero_point_setup.jpg +description: Adjust basement completed +landscape: false +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} + +[wizard_step CALIBRATE_5D_MANUAL_COMPLETED] +image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg +landscape: false +description: Five Axis Calibration complete +warning: none +countdown: 0 +info: none +action_gcode: + RESET_WIZARD WIZARD={wizard.name} ABORT=0 +cancel_gcode: + RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index 4cd8f116c075..337e808cc696 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -1,7 +1,7 @@ [wizard NOZZLE_OFFSET_FIBER] image: wizards/change_material/change_material.jpg type: 5d -steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_OFFSET_FIBER3, NOZZLE_OFFSET_FIBER4, NOZZLE_OFFSET_FIBER5 +steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_OFFSET_FIBER3, NOZZLE_OFFSET_FIBER4, NOZZLE_OFFSET_COMPLETED [wizard_step_button NOZZLE_OFFSET_FIBER0] image: wizards/nozzle_offset/wait_for_print.jpg @@ -101,15 +101,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step NOZZLE_OFFSET_FIBER5] -image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false -description: NozzleOffset.Completed -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index 66b3fe323a4c..c65cf4424236 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -1,7 +1,7 @@ [wizard NOZZLE_OFFSET_HYBRID] image: wizards/change_material/change_material.jpg type: 5d -steps: NOZZLE_OFFSET_HYBRID0, NOZZLE_OFFSET_HYBRID1, NOZZLE_OFFSET_HYBRID2, NOZZLE_OFFSET_HYBRID3, NOZZLE_OFFSET_HYBRID4, NOZZLE_OFFSET_HYBRID5, NOZZLE_OFFSET_HYBRID6, NOZZLE_OFFSET_HYBRID7 +steps: NOZZLE_OFFSET_HYBRID0, NOZZLE_OFFSET_HYBRID1, NOZZLE_OFFSET_HYBRID2, NOZZLE_OFFSET_HYBRID3, NOZZLE_OFFSET_HYBRID4, NOZZLE_OFFSET_HYBRID5, NOZZLE_OFFSET_HYBRID6, NOZZLE_OFFSET_COMPLETED [wizard_step_button NOZZLE_OFFSET_HYBRID0] image: wizards/nozzle_offset/wait_for_print.jpg @@ -129,15 +129,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step NOZZLE_OFFSET_HYBRID7] -image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false -description: NozzleOffset.Completed -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg index 9d7fa92be518..3f5185de0e8c 100644 --- a/stereotech_config/wizards/zero_point_calibration.cfg +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -1,7 +1,7 @@ [wizard ZERO_POINT_CALIBRATE] image: wizards/zero_point_setup/zero_point_setup05.jpg type: 5d -steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO_POINT_CALIBRATE3, ZERO_POINT_CALIBRATE4, ZERO_POINT_CALIBRATE5 +steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO_POINT_CALIBRATE3, ZERO_POINT_CALIBRATE4, ADJUST_BASEMENT_MANUAL_COMPLETED [wizard_step ZERO_POINT_CALIBRATE0] image: wizards/zero_point_setup/zero_point_setup05.jpg @@ -79,15 +79,3 @@ action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: RESET_WIZARD WIZARD={wizard.name} - -[wizard_step ZERO_POINT_CALIBRATE5] -image: wizards/zero_point_setup/zero_point_setup.jpg -description: Zero Point Calibration completed -landscape: false -warning: none -countdown: 0 -info: none -action_gcode: - RESET_WIZARD WIZARD={wizard.name} ABORT=0 -cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} From a4ce5fd05c4b46d087a16fef8611991e498e920f Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Wed, 31 Jan 2024 13:35:43 +0000 Subject: [PATCH 53/65] STEAPP-872: duplicate code in the wizards has been removed --- HTE530-5-4-22.cfg | 1 - .../wizards/cmd_debug/clear_nozzle_cmd.cfg | 9 - stereotech_config/wizards/wizards.cfg | 199 ------------------ 3 files changed, 209 deletions(-) delete mode 100644 stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg delete mode 100644 stereotech_config/wizards/wizards.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 773e35f91f45..7fff71d8cacb 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -27,7 +27,6 @@ path: /home/ste/uploads [include stereotech_config/calibrate/probe_v2.cfg] # wizards -# [include stereotech_config/wizards/wizards.cfg] [include stereotech_config/wizards/common.cfg] [include stereotech_config/wizards/change_material.cfg] diff --git a/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg b/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg deleted file mode 100644 index d38a60c0fdc6..000000000000 --- a/stereotech_config/wizards/cmd_debug/clear_nozzle_cmd.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# -------------------------------step 0 - -EXECUTE_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE0 -CANCEL_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE0 - -# --------------------------------step1 - -EXECUTE_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE1 -CANCEL_WIZARD_STEP WIZARD= STEP=CLEAR_NOZZLE1 diff --git a/stereotech_config/wizards/wizards.cfg b/stereotech_config/wizards/wizards.cfg deleted file mode 100644 index 5bf60610cd2b..000000000000 --- a/stereotech_config/wizards/wizards.cfg +++ /dev/null @@ -1,199 +0,0 @@ -# wizard -# SET_WIZARD_ENABLE WIZARD=CALIBRATE ENABLE=1 ERROR=error_message -# SET_WIZARD_STEP WIZARD=CALIBRATE STEP=step1 -# SET_WIZARD_VARIABLE WIZARD=CALIBRATE VARIABLE=a VALUE=17 -# RESET_WIZARD WIZARD=CALIBRATE - -# wizard_step -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_0 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_0 - -# wizard_step_button -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_BUTTON_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_BUTTON_1 -# WIZARD_STEP_BUTTON WIZARD=CALIBRATE STEP=STEP_BUTTON_1 BUTTON=button_1 -# WIZARD_STEP_BUTTON WIZARD=CALIBRATE STEP=STEP_BUTTON_1 BUTTON=button2 - -# wizard_step_wizards -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_WIZARDS_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_WIZARDS_1 - -# wizard_step_selector -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_SELECTOR_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_SELECTOR_1 -# WIZARD_STEP_SELECT WIZARD=CALIBRATE STEP=STEP_SELECTOR_1 ITEM=item3 - -# wizard_step_slider -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_SLIDER_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_SLIDER_1 -# WIZARD_STEP_SLIDER WIZARD=CALIBRATE STEP=STEP_SLIDER_1 SLIDER=slider1 VALUE=12 -# WIZARD_STEP_SLIDER WIZARD=CALIBRATE STEP=STEP_SLIDER_1 SLIDER=slider_2 VALUE=40 - -# wizard_step_jog -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_JOG_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_JOG_1 -# WIZARD_STEP_JOG WIZARD=CALIBRATE STEP=STEP_JOG_1 AXIS=z DIRECTION=0 -# WIZARD_STEP_SET_STEP WIZARD=CALIBRATE STEP=STEP_JOG_1 VALUE=20 - -# wizard_step_nozzle_offset -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_NOZZLE_OFFSET_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_NOZZLE_OFFSET_1 -# WIZARD_STEP_NOZZLE_OFFSET WIZARD=CALIBRATE STEP=STEP_NOZZLE_OFFSET_1 STEP_X=9 STEP_Y=10 - -# wizard_step_tree -# CANCEL_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_TREE_1 -# EXECUTE_WIZARD_STEP WIZARD=CALIBRATE STEP=STEP_TREE_1 -# WIZARD_STEP_TREE WIZARD=CALIBRATE STEP=STEP_TREE_1 KEY=pla - -[wizard CALIBRATE] -image: path/to/image/wizard/CALIBRATE -type: 3d, 5d, any -steps: STEP_0, STEP_BUTTON_1, STEP_WIZARDS_1, STEP_SELECTOR_1, STEP_SLIDER_1, STEP_JOG_1, STEP_NOZZLE_OFFSET_1 -variable_a: 1 -variable_b: 2 - -[wizard_step STEP_0] -image: path/to/image/wizard/STEP_0 -landscape: false -description: description STEP_0 -warning: warning STEP_0 -countdown: 10 -info: info about STSTEP_0 -placeholder: wizard-step-preheat -action_gcode: - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} - {action_respond_info('-------------------start STEP_0')} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=STEP_0 ENABLE=1 -cancel_gcode: - {action_respond_info('------------------CANCEL STEP_0')} - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_button STEP_BUTTON_1] -image: path/to/image/wizard/STEP_BUTTON_1 -landscape: false -description: description STEP_BUTTON_1 -warning: warning STEP_BUTTON_1 -countdown: 20 -info: info about STEP_BUTTON_1 -placeholder: wizard-step-preheat -button_button_1_gcode: - {action_respond_info('-------------------button_button_1_gcode')} -button_button2_gcode: - {action_respond_info('-------------------button_button2_gcode')} -action_gcode: - {action_respond_info('-------------------action_gcode STEP_BUTTON_1')} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=STEP_BUTTON_1 ENABLE=1 - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode STEP_BUTTON_1')} - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_wizards STEP_WIZARDS_1] -image: path/to/image/wizard/STEP_WIZARDS_1 -landscape: false -description: description STEP_WIZARDS_1 -warning: warning STEP_WIZARDS_1 -countdown: 20 -info: info about STEP_WIZARDS_1 -wizards: wizard1, wizard2 -action_gcode: - {action_respond_info('-------------------action_gcode STEP_WIZARDS_1')} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode STEP_WIZARDS_1')} - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_selector STEP_SELECTOR_1] -image: path/to/image/wizard/STEP_SELECTOR_1 -landscape: false -description: description STEP_SELECTOR_1 -warning: warning STEP_SELECTOR_1 -countdown: 20 -info: info about STEP_SELECTOR_1 -items: item1, item2, item3 -select_gcode: - {action_respond_info('-------------------select_gcode STEP_SELECTOR_1 selected=%s, wizard=%s' % (selected, wizard.name))} -action_gcode: - {action_respond_info('-------------------action_gcode STEP_SELECTOR_1')} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode STEP_SELECTOR_1')} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 - -[wizard_step_slider STEP_SLIDER_1] -image: path/to/image/wizard/STEP_SLIDER_1 -landscape: false -description: description STEP_SLIDER_1 -warning: warning STEP_SLIDER_1 -countdown: 20 -info: info about STEP_SLIDER_1 -slider_slider1_min: 0 -slider_slider1_max: 100 -slider_slider1_step: 1 -slider_slider1_default: 20 -slider_slider_2_min: 4 -slider_slider_2_max: 30 -slider_slider_2_step: 23 -slider_slider_2_default: 20 -action_gcode: - {action_respond_info('-------------------action_gcode STEP_SELECTOR_1')} - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode STEP_SELECTOR_1')} - RESET_WIZARD WIZARD={wizard.name} - # HOME_POSITION ABORT=1 - -[wizard_step_jog STEP_JOG_1] -image: path/to/image/wizard/STEP_JOG_1 -landscape: false -description: description STEP_JOG_1 -warning: warning STEP_JOG_1 -countdown: 20 -info: info about STEP_JOG_1 -axes: x, y, z, a, c -steps: 0.1, 1, 10, 20 -default_step: 10 -placeholder: wizard-step-preheat -jog_gcode: - {action_respond_info('-------------------jog_gcode STEP_JOG_1 (G1 %s%s, direction=%s)' % (axis|upper, step, direction))} -action_gcode: - {action_respond_info('-------------------action_gcode STEP_JOG_1')} - SET_WIZARD_ENABLE WIZARD=CALIBRATE ENABLE=1 ERROR=error_message - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP=STEP_JOG_1 ENABLE=1 -cancel_gcode: - {action_respond_info('------------------cancel_gcode STEP_JOG_1')} - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_nozzle_offset STEP_NOZZLE_OFFSET_1] -image: path/to/image/wizard/STEP_NOZZLE_OFFSET_1 -landscape: false -description: description STEP_NOZZLE_OFFSET_1 -warning: warning STEP_NOZZLE_OFFSET_1 -countdown: 20 -info: info about STEP_NOZZLE_OFFSET_1 -steps: 15 -default_step: 7 -step_value: 0.1 -min_value: -0.7 -action_gcode: - {action_respond_info('-------------------action_gcode %s' % wizard.wizard_step_name)} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR=error_message - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} - RESET_WIZARD WIZARD={wizard.name} - -[wizard_step_tree STEP_TREE_1] -tree_file_path: /home/ste/klippy_dev/klipper/stereotech_config/wizards/data/materials.json -depth: 3 -types: manufacturer, series, name -action_gcode: - {action_respond_info('-------------------action_gcode %s' % wizard.wizard_step_name)} - SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR=error_message - SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.wizard_step_name} - WIZARD_STEP_LOADING_STATE WIZARD={wizard.name} STEP={wizard.wizard_step_name} -cancel_gcode: - {action_respond_info('------------------cancel_gcode %s' % wizard.wizard_step_name)} - RESET_WIZARD WIZARD={wizard.name} From 7bfc66e6632becb9614b806db47d1d886f722f7b Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 1 Feb 2024 13:57:41 +0000 Subject: [PATCH 54/65] STEAPP-872: deleted the info: none and warning: none --- stereotech_config/wizards/5d_calibration.cfg | 4 +- .../wizards/5d_calibration_auto.cfg | 30 ++++++------- .../wizards/5d_calibration_manual.cfg | 11 ----- .../wizards/5d_calibration_manual_old.cfg | 26 ++++++------ stereotech_config/wizards/adjust_basement.cfg | 4 +- .../wizards/adjust_basement_auto.cfg | 28 ++++++------- .../wizards/adjust_basement_manual.cfg | 14 +++---- stereotech_config/wizards/align_nozzles.cfg | 18 ++++---- stereotech_config/wizards/bed_level.cfg | 4 +- stereotech_config/wizards/bed_level_auto.cfg | 22 +++++----- .../wizards/bed_level_manual.cfg | 16 +++---- stereotech_config/wizards/change_material.cfg | 4 +- .../wizards/change_material_fiber.cfg | 30 ++++++------- .../wizards/change_material_filament.cfg | 42 +++++++++---------- stereotech_config/wizards/change_module.cfg | 8 ++-- stereotech_config/wizards/common.cfg | 24 +++++------ .../wizards/nozzle_offset_5d.cfg | 16 +++---- .../wizards/nozzle_offset_fiber.cfg | 18 ++++---- .../wizards/nozzle_offset_hybrid.cfg | 26 ++++++------ .../wizards/zero_point_calibration.cfg | 12 +++--- 20 files changed, 173 insertions(+), 184 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index b819b27fc8b5..013b84bca266 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -7,9 +7,9 @@ steps: CALIBRATE_5D_0 image: none landscape: false description: Choose the required manager -warning: none + countdown: 0 -info: none + wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index a34e0c9e4d3b..8f07c49c9e9b 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -9,7 +9,7 @@ landscape: false description: 5DCalibrationAuto.Description warning: 5DCalibrationAuto.MakeSureFreeOfPlastic countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -27,7 +27,7 @@ landscape: false description: Place the calibration tool into the five axis module and press Next warning: 5DCalibrationAuto.GapBetweenTemplateModule countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -39,7 +39,7 @@ landscape: false description: Connect probe and press Next warning: 5DCalibrationAuto.WarningScrew countdown: 0 -info: none + action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -49,9 +49,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg landscape: false description: 5DCalibrationAuto.ConnectAndCheck -warning: none + countdown: 0 -info: none + placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_FIVE_D' %} @@ -63,9 +63,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg landscape: false description: 5DCalibrationAuto.Wait -warning: none + countdown: 420 -info: none + placeholder: waitProgress true action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -76,9 +76,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg landscape: false description: 5DCalibrationAuto.MoveToSurface -warning: none + countdown: 0 -info: none + axes: z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -95,9 +95,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: 5DCalibrationAuto.XYCorrectionDescription -warning: none + countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 button_xy_correction_gcode: @@ -110,9 +110,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg landscape: false description: 5DCalibrationAuto.MoveToHole -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -129,9 +129,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: 5DCalibrationAuto.Finish -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index 600b00051f4e..6680caa7a250 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -9,7 +9,6 @@ landscape: false description: This wizard will help you calibrate five axis module warning: 5DCalibrationManual.MakeSureFreeOfPlastic countdown: 0 -info: none action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -25,9 +24,7 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg landscape: false description: Place the calibration tool into the five axis module and press Next -warning: none countdown: 0 -info: none action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -38,9 +35,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration6.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none countdown: 0 -info: none axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -57,9 +52,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration9.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none countdown: 0 -info: none axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -77,9 +70,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration6.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none countdown: 0 -info: none axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -97,9 +88,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration10.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none countdown: 0 -info: none axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index 92beba37d59d..71e4f64fa69c 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -10,7 +10,7 @@ landscape: false description: This wizard will help you calibrate five axis module warning: 5DCalibrationManualOld.MakeSureFreeOfPlastic countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -26,9 +26,9 @@ cancel_gcode: image:wizards/5d_calibration_manual/5d_calibration2-02.jpg landscape: false description: Check the diameter of the calibration tool and press Next -warning: none + countdown: 0 -info: none + slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 @@ -44,9 +44,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg landscape: false description: Place the calibration tool into the five axis module and press Next -warning: none + countdown: 0 -info: none + action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -57,9 +57,9 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration2.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -76,9 +76,9 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration3.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -96,9 +96,9 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration2.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -116,9 +116,9 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration2-01.jpg landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index 6c36b24a1cce..d59f0bddaa03 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -7,9 +7,9 @@ steps: ADJUST_BASEMENT0 image: none landscape: false description: AdjustManadger.ManagersChoiceDescription -warning: none + countdown: 0 -info: none + wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 0ff9e54fbda4..b53883d764f6 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -8,9 +8,9 @@ variable_wcs: 1 image: wizards/adjust_basement_auto/adjust_basement_auto.jpg landscape: false description: This wizard helps you to setup zero point for proper 5D printing -warning: none + countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -24,7 +24,7 @@ landscape: false description: Please place needed base in the 5D Module and press Next warning: AdjustBasementAuto.MakeSureBaseProtrudes countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -36,7 +36,7 @@ landscape: false description: Connect probe and press Next warning: AdjustBasementAuto.WarningScrew countdown: 0 -info: none + action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -46,9 +46,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg landscape: false description: AdjustBasementAuto.ConnectAndCheck -warning: none + countdown: 0 -info: none + placeholder: wizard-step-probe action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -59,9 +59,9 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup.jpg landscape: false description: Please select Printing mode which you want to use -warning: none + countdown: 0 -info: none + items: 5D_spiral, 5D_spiral_full action_gcode: {% set wcs = wizard.variables.wcs|int %} @@ -82,9 +82,9 @@ select_gcode: image: wizards/adjust_basement_auto/move-sensor-to-center.jpg landscape: false description: AdjustBasementAuto.MoveSensorToCenter -warning: none + countdown: 0 -info: none + axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -101,9 +101,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: AdjustBasementAuto.Disable -warning: none + countdown: 0 -info: none + placeholder: waitProgress true action_gcode: {% set wcs = wizard.variables.wcs %} @@ -116,9 +116,9 @@ cancel_gcode: image: wizards/adjust_basement_auto/adjust_basement_auto.jpg landscape: false description: Adjust basement completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 8adf4fc32b08..178ad09b4e09 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -9,9 +9,9 @@ variable_diameter: 6.0 image: wizards/zero_point_setup/zero_point_setup.jpg description: This wizard helps you to setup zero point for proper 5D printing landscape: false -warning: none + countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -27,7 +27,7 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup02.jpg description: Set basement diameter and press Next landscape: false -warning: none + countdown: 0 slider_set_diameter_min: 3 slider_set_diameter_max: 200 @@ -44,7 +44,7 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup04.jpg description: Please place needed base in the 5D Module and press Next landscape: false -warning: none + countdown: 0 action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -55,7 +55,7 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup.jpg description: Please select Printing mode which you want to use landscape: false -warning: none + countdown: 0 items: 5D_spiral, 5D_spiral_full placeholder: wizard-step-probe @@ -77,7 +77,7 @@ select_gcode: image: wizards/zero_point_setup/zero_point_setup01.jpg description: Move nozzle to the center of the base and press Next landscape: false -warning: none + countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 @@ -94,7 +94,7 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup02.jpg description: Move nozzle to the center of the base and press Next landscape: false -warning: none + countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 diff --git a/stereotech_config/wizards/align_nozzles.cfg b/stereotech_config/wizards/align_nozzles.cfg index 633016651b7e..c4382eb94bf6 100644 --- a/stereotech_config/wizards/align_nozzles.cfg +++ b/stereotech_config/wizards/align_nozzles.cfg @@ -9,7 +9,7 @@ landscape: false description: AlignNozzles.Description warning: AlignNozzles.Prerequisites countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -45,9 +45,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg landscape: false description: Place the calibration tool into the five axis module and press Next -warning: none + countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -57,9 +57,9 @@ cancel_gcode: image: wizards/nozzle_offset/release_nozzle.jpg description: AlignNozzles.ReleaseNozzle landscape: false -warning: none + countdown: 0 -info: none + action_gcode: {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} # 3d @@ -78,9 +78,9 @@ cancel_gcode: image: wizards/nozzle_offset/adjust_nozzle.jpg landscape: false description: AlignNozzles.TightNozzle -warning: none + countdown: 0 -info: none + action_gcode: G91 G0 Z30 F600 @@ -93,9 +93,9 @@ cancel_gcode: image: wizards/nozzle_offset/wait_for_print.jpg landscape: false description: AlignNozzles.Completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/bed_level.cfg b/stereotech_config/wizards/bed_level.cfg index d9424a690dd3..dfe7cd8162b8 100644 --- a/stereotech_config/wizards/bed_level.cfg +++ b/stereotech_config/wizards/bed_level.cfg @@ -7,9 +7,9 @@ steps: BED_LEVEL0 image: none landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription -warning: none + countdown: 0 -info: none + wizards: BED_LEVEL_AUTO, BED_LEVEL_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg index 46220b61267c..017939cf4a5d 100644 --- a/stereotech_config/wizards/bed_level_auto.cfg +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -7,9 +7,9 @@ steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_L image: wizards/bed_level_manual/bed_leveling04.jpg landscape: false description: Wait until bed and printhead stop and adjust nearest thumb wheel -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: ABORT @@ -26,7 +26,7 @@ landscape: false description: Connect probe and press Next warning: BedLevelAuto.WarningScrew countdown: 0 -info: none + action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -36,9 +36,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg landscape: false description: BedLevelAuto.ConnectAndCheck -warning: none + countdown: 0 -info: none + placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_THREE_D' %} @@ -50,9 +50,9 @@ cancel_gcode: image: wizards/bed_level_auto/auto_bed_leveling_02.jpg landscape: false description: BedLevelAuto.Wait -warning: none + countdown: 420 -info: none + placeholder: waitProgress true action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -63,9 +63,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: BedLevelAuto.Disable -warning: none + countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -75,9 +75,9 @@ cancel_gcode: image: wizards/bed_level_auto/auto_bed_leveling_01.jpg landscape: false description: Bed level completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg index 13136556cadc..920e94e4ad8a 100644 --- a/stereotech_config/wizards/bed_level_manual.cfg +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -9,7 +9,7 @@ landscape: false description: Perform bed leveling if there is too much distance between the nozzles and the build plate warning: BedLevelManual.MakeSureFreeOfPlastic countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 Z_ENDSTOP_CALIBRATE @@ -26,9 +26,9 @@ cancel_gcode: image: wizards/bed_level_manual/bed_leveling.jpg landscape: false description: Perform bed leveling if there is too much distance between the nozzles and the build plate -warning: none + countdown: 0 -info: none + action_gcode: Z_ENDSTOP_CALIBRATE SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -39,7 +39,7 @@ cancel_gcode: image: wizards/bed_level_manual/bed_leveling05.jpg description: Adjust gap between left nozzle and bed using controls landscape: false -warning: none + countdown: 0 axes: z steps: 0.05, 0.1, 1, 10 @@ -56,9 +56,9 @@ cancel_gcode: image: wizards/bed_level_manual/bed_leveling04.jpg landscape: false description: Wait until bed and printhead stop and adjust nearest thumb wheel -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: ABORT @@ -72,9 +72,9 @@ button_next_point_gcode: image: wizards/bed_level_manual/bed_leveling.jpg landscape: false description: Bed level completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 397b3a905c1a..0ccd3047969c 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -7,9 +7,9 @@ steps: CHANGE_MATERIAL0 image: none landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription -warning: none + countdown: 0 -info: none + wizards: CHANGE_MATERIAL_FILAMENT, CHANGE_MATERIAL_FIBER action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg index 72b449b930f2..5d984211a2d9 100644 --- a/stereotech_config/wizards/change_material_fiber.cfg +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -13,7 +13,7 @@ landscape: false description: ChangeMaterialFiber.WelcomeStep warning: ChangeMaterialFiber.stepOneWarning countdown: 0 -info: none + action_gcode: {% set selected_e = wizard.variables.selected_e %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 @@ -27,9 +27,9 @@ cancel_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed action -warning: none + countdown: 0 -info: none + items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -49,9 +49,9 @@ select_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed temperature of the material which could be found on the filament package or on the manufacturers website -warning: none + countdown: 0 -info: none + slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -68,9 +68,9 @@ cancel_gcode: image: wizards/change_material/change_material03.jpg landscape: false description: ChangeMaterialFiber.WaitHeater -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -96,9 +96,9 @@ button_cut_gcode: image: wizards/change_material/change_material.jpg landscape: false description: ChangeMaterialFiber.InstallMaterialSpool -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat # COOL DOWN action_gcode: {% set temperature = wizard.variables.temperature %} @@ -111,9 +111,9 @@ cancel_gcode: image: wizards/change_material/change_material04.jpg landscape: false description: ChangeMaterialFiber.LoadPushPull -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -130,9 +130,9 @@ button_insert_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select loading temperature -warning: none + countdown: 0 -info: none + slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -149,9 +149,9 @@ cancel_gcode: image: wizards/change_material/change_material04.jpg landscape: false description: ChangeMaterialFiber.FiberFromSoplo -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index 1aac0787acc0..91f5859e46f4 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -11,7 +11,7 @@ landscape: false description: This wizard will help you to change insert or remove the material warning: Missing extruder countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION_HEAD @@ -28,9 +28,9 @@ cancel_gcode: image: wizards/change_material/change_material01.jpg landscape: false description: Select the extruder where you want change the material -warning: none + countdown: 0 -info: none + items: extruder, extruder1 action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -45,9 +45,9 @@ select_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select the needed action -warning: none + countdown: 0 -info: none + items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -65,9 +65,9 @@ select_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: ChangeMaterialFilament.UnloadedMaterialSelect -warning: none + countdown: 0 -info: none + tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -86,9 +86,9 @@ cancel_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select unloading temperature -warning: none + countdown: 0 -info: none + slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -104,9 +104,9 @@ cancel_gcode: image: wizards/change_material/change_material03.jpg landscape: false description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: {% set action = wizard.variables.action %} @@ -126,9 +126,9 @@ button_load_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: ChangeMaterialFilament.LoadedMaterialSelect -warning: none + countdown: 0 -info: none + tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -147,9 +147,9 @@ cancel_gcode: image: wizards/change_material/change_material02.jpg landscape: false description: Select loading temperature -warning: none + countdown: 0 -info: none + slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -165,9 +165,9 @@ cancel_gcode: image: wizards/change_material/change_material.jpg landscape: false description: Load new spool insert material into bowden tube and press Next button -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -180,9 +180,9 @@ cancel_gcode: image: wizards/change_material/change_material04.jpg landscape: false description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 @@ -200,9 +200,9 @@ button_insert_gcode: image: wizards/change_material/change_material04.jpg landscape: false description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index d8e32add5382..531f752b78eb 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -8,7 +8,7 @@ image: wizards/change_module/change_module.jpg landscape: false description: This wizard will help you change module. To remove the module, loosen the fixing nuts on the left and right (two on each side) using the supplied wrench, then carefully pull the module towards you until it stops. Once the nuts line up with the vertical slot, pull the module up. Disconnect the module cable from the connector. countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP={wizard.next_step} @@ -21,7 +21,7 @@ landscape: false description: Power off printer and disconnect it from power source. Then you could change module according to the manual warning: Calibration required after module change countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -33,9 +33,9 @@ button_power_off_gcode: image: wizards/change_module/change_module.jpg landscape: false description: Change Module complete -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index dca7f7cfd2f9..7434eedbbb3f 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -82,9 +82,9 @@ gcode: image: none landscape: false description: ClearNozzle.WaitHeating -warning: none + countdown: 0 -info: none + placeholder: wizard-step-preheat action_gcode: RETRACT_MATERIAL @@ -96,9 +96,9 @@ cancel_gcode: image: none landscape: false description: ClearNozzle.NozzleClear -warning: none + countdown: 0 -info: none + action_gcode: MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -124,9 +124,9 @@ gcode: image: wizards/change_material/change_material.jpg landscape: false description: Material change completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -136,9 +136,9 @@ cancel_gcode: image: wizards/nozzle_offset/wait_for_print.jpg landscape: false description: NozzleOffset.Completed -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -148,9 +148,9 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup.jpg description: Adjust basement completed landscape: false -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -160,9 +160,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg landscape: false description: Five Axis Calibration complete -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg index 6deeab221f0d..21698ecaefcf 100644 --- a/stereotech_config/wizards/nozzle_offset_5d.cfg +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -9,7 +9,7 @@ landscape: false description: NozzleOffset5D.Description warning: NozzleOffset5D.MakeSureFreeOfPlastic countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -27,7 +27,7 @@ landscape: false description: Place the calibration tool into the five axis module and press Next warning: NozzleOffset5D.GapBetweenTemplateModule countdown: 0 -info: none + action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -39,7 +39,7 @@ description: Connect probe and press Next landscape: false warning: NozzleOffset5D.WarningScrew countdown: 0 -info: none + action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -49,9 +49,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg landscape: false description: NozzleOffset5D.ConnectAndCheck -warning: none + countdown: 0 -info: none + placeholder: wizard-step-probe action_gcode: ADJUST_NOZZLE_OFFSET_Z @@ -63,7 +63,7 @@ cancel_gcode: image: wizards/nozzle_offset/chup_3d.jpg description: NozzleOffset5D.MoveToSurface landscape: false -warning: none + countdown: 0 axes: z steps: 0.05, 0.1, 1, 10 @@ -81,9 +81,9 @@ cancel_gcode: image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg landscape: false description: NozzleOffset5D.Finish -warning: none + countdown: 0 -info: none + action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index 337e808cc696..c1402dafc1c1 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -9,7 +9,7 @@ landscape: false description: NozzleOffset.Description warning: NozzleOffset.Prerequisites countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -26,9 +26,9 @@ cancel_gcode: image: wizards/nozzle_offset/chup_3d.jpg landscape: false description: NozzleOffset.GapBetweenNozzleAndGlass -warning: none + countdown: 0 -info: none + action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -39,9 +39,9 @@ cancel_gcode: image: wizards/nozzle_offset/select_temp.jpg description: NozzleOffset.SetTemperatures landscape: false -warning: none + countdown: 0 -info: none + slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -68,9 +68,9 @@ cancel_gcode: image: wizards/nozzle_offset/wait_for_print.jpg landscape: false description: NozzleOffset.WaitForPrint -warning: none + countdown: 1140 -info: none + placeholder: wizard-step-preheat axes: z steps: 0.05, 0.1, 1 @@ -86,9 +86,9 @@ cancel_gcode: image: none landscape: false description: NozzleOffset.NozzleOffsetDescription -warning: none + countdown: 0 -info: none + steps: 15 default_step: 8 step_value: 0.1 diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index c65cf4424236..f8dbce55c540 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -9,7 +9,7 @@ landscape: false description: NozzleOffset.Description warning: NozzleOffset.Prerequisites countdown: 0 -info: none + action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -25,9 +25,9 @@ cancel_gcode: image: wizards/nozzle_offset/release_nozzle.jpg landscape: false description: NozzleOffset.ReleaseNozzle -warning: none + countdown: 0 -info: none + action_gcode: G0 Z0 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -38,9 +38,9 @@ cancel_gcode: image: wizards/nozzle_offset/adjust_nozzle.jpg landscape: false description: NozzleOffset.TightNozzle -warning: none + countdown: 0 -info: none + action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -51,9 +51,9 @@ cancel_gcode: image: wizards/nozzle_offset/select_temp.jpg description: NozzleOffset.SetTemperatures landscape: false -warning: none + countdown: 0 -info: none + slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -80,9 +80,9 @@ cancel_gcode: image: wizards/nozzle_offset/wait_for_print.jpg landscape: false description: NozzleOffset.WaitForPrint -warning: none + countdown: 540 -info: none + placeholder: wizard-step-preheat axes: z steps: 0.05, 0.1, 1 @@ -98,9 +98,9 @@ cancel_gcode: image: wizards/nozzle_offset/grid_vertical.jpg landscape: false description: NozzleOffset.AdjustVertical -warning: none + countdown: 0 -info: none + slider_y_offset_min: 1 slider_y_offset_max: 15 slider_y_offset_step: 1 @@ -116,9 +116,9 @@ cancel_gcode: image: wizards/nozzle_offset/grid_horizontal.jpg landscape: false description: NozzleOffset.AdjustHorizontal -warning: none + countdown: 0 -info: none + slider_x_offset_min: 1 slider_x_offset_max: 15 slider_x_offset_step: 1 diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg index 3f5185de0e8c..8e8296562b0e 100644 --- a/stereotech_config/wizards/zero_point_calibration.cfg +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -7,7 +7,7 @@ steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO image: wizards/zero_point_setup/zero_point_setup05.jpg description: This wizard helps you to setup zero point for proper 5D printing landscape: false -warning: none + countdown: 0 action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' @@ -20,7 +20,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration1.jpg description: Place the calibration tool into the five axis module and press Next landscape: false -warning: none + countdown: 0 action_gcode: MOVE_WCS_ZERO WCS=1 @@ -32,7 +32,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration2.jpg description: Move nozzle to the nearest tip of the calibration tool and press Next landscape: false -warning: none + countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 @@ -50,7 +50,7 @@ cancel_gcode: image: wizards/5d_calibration_manual/5d_calibration2.jpg description: Move nozzle to the nearest tip of the calibration tool and press Next landscape: false -warning: none + countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 @@ -66,9 +66,9 @@ cancel_gcode: image: wizards/zero_point_setup/zero_point_setup03.jpg landscape: false description: Check the diameter of the calibration tool and press Next -warning: none + countdown: 0 -info: none + slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 From 7b3896a7d824b4ac40eac265e90e557bad0ed314 Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Thu, 1 Feb 2024 14:34:57 +0000 Subject: [PATCH 55/65] STEAPP-872: deleted lines with missing information --- klippy/extras/wizard/wizard.py | 4 +- klippy/extras/wizard/wizard_step.py | 4 +- stereotech_config/wizards/5d_calibration.cfg | 5 --- .../wizards/5d_calibration_auto.cfg | 32 -------------- .../wizards/5d_calibration_manual.cfg | 14 +----- .../wizards/5d_calibration_manual_old.cfg | 27 ------------ stereotech_config/wizards/adjust_basement.cfg | 5 --- .../wizards/adjust_basement_auto.cfg | 30 ------------- .../wizards/adjust_basement_manual.cfg | 19 -------- stereotech_config/wizards/align_nozzles.cfg | 19 -------- stereotech_config/wizards/bed_level.cfg | 5 --- stereotech_config/wizards/bed_level_auto.cfg | 22 ---------- .../wizards/bed_level_manual.cfg | 18 -------- stereotech_config/wizards/change_material.cfg | 5 --- .../wizards/change_material_fiber.cfg | 31 ------------- .../wizards/change_material_filament.cfg | 43 ------------------- stereotech_config/wizards/change_module.cfg | 14 +----- stereotech_config/wizards/common.cfg | 26 ----------- .../wizards/nozzle_offset_5d.cfg | 21 --------- .../wizards/nozzle_offset_fiber.cfg | 19 -------- .../wizards/nozzle_offset_hybrid.cfg | 26 ----------- .../wizards/zero_point_calibration.cfg | 16 ------- 22 files changed, 8 insertions(+), 397 deletions(-) diff --git a/klippy/extras/wizard/wizard.py b/klippy/extras/wizard/wizard.py index 39cec543434b..af5ca01b1ba3 100644 --- a/klippy/extras/wizard/wizard.py +++ b/klippy/extras/wizard/wizard.py @@ -25,8 +25,8 @@ def __init__(self, config): "Option '%s' in section '%s' is not a valid literal: %s" % ( option, config.get_name(), e)) # get options from config - self.image = config.get('image', 'image_path') - self.type = config.getlists('type', []) + self.image = config.get('image', '') + self.type = config.getlists('type', 'any') self.steps = config.getlists('steps', []) self.current_step = self.steps[0] self.next_step = self.steps[1] if len(self.steps) > 2 else self.steps[0] diff --git a/klippy/extras/wizard/wizard_step.py b/klippy/extras/wizard/wizard_step.py index da9997a16dc6..4e462f325d9c 100644 --- a/klippy/extras/wizard/wizard_step.py +++ b/klippy/extras/wizard/wizard_step.py @@ -13,8 +13,8 @@ def __init__(self, config): self.gcode_macro = printer.load_object(config, 'gcode_macro') self.gcode = printer.lookup_object('gcode') # get options from config - self.cmd_desc = config.get("description", "G-Code wizard") - self.image = config.get('image', 'image_path') + self.cmd_desc = config.get("description", '') + self.image = config.get('image', '') self.landscape = config.getboolean('landscape', False) self.description = config.get('description', '') self.warning = config.get('warning', '') diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index 013b84bca266..370456a58843 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -4,12 +4,7 @@ type: 5d steps: CALIBRATE_5D_0 [wizard_step_wizards CALIBRATE_5D_0] -image: none -landscape: false description: Choose the required manager - -countdown: 0 - wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index 8f07c49c9e9b..94c1f3a840bc 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -5,11 +5,8 @@ steps: CALIBRATE_5D_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_AUTO1, CAL [wizard_step_button CALIBRATE_5D_AUTO0] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg -landscape: false description: 5DCalibrationAuto.Description warning: 5DCalibrationAuto.MakeSureFreeOfPlastic -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -23,11 +20,8 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -landscape: false description: Place the calibration tool into the five axis module and press Next warning: 5DCalibrationAuto.GapBetweenTemplateModule -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -35,11 +29,8 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: Connect probe and press Next warning: 5DCalibrationAuto.WarningScrew -countdown: 0 - action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -47,11 +38,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -landscape: false description: 5DCalibrationAuto.ConnectAndCheck - -countdown: 0 - placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_FIVE_D' %} @@ -61,11 +48,8 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO4] image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg -landscape: false description: 5DCalibrationAuto.Wait - countdown: 420 - placeholder: waitProgress true action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -74,11 +58,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_AUTO5] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -landscape: false description: 5DCalibrationAuto.MoveToSurface - -countdown: 0 - axes: z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -93,11 +73,7 @@ cancel_gcode: [wizard_step_button CALIBRATE_5D_AUTO6] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: 5DCalibrationAuto.XYCorrectionDescription - -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 button_xy_correction_gcode: @@ -108,11 +84,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_AUTO7] image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg -landscape: false description: 5DCalibrationAuto.MoveToHole - -countdown: 0 - axes: x, y, z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -127,11 +99,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO8] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: 5DCalibrationAuto.Finish - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index 6680caa7a250..c8ad2fd5830e 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -5,10 +5,8 @@ steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, [wizard_step_button CALIBRATE_5D_MANUAL0] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -landscape: false description: This wizard will help you calibrate five axis module warning: 5DCalibrationManual.MakeSureFreeOfPlastic -countdown: 0 action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -22,9 +20,9 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -landscape: false + description: Place the calibration tool into the five axis module and press Next -countdown: 0 + action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -33,9 +31,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL2] image: wizards/5d_calibration_manual/5d_calibration6.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -50,9 +46,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL3] image: wizards/5d_calibration_manual/5d_calibration9.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -68,9 +62,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL4] image: wizards/5d_calibration_manual/5d_calibration6.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -86,9 +78,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL5] image: wizards/5d_calibration_manual/5d_calibration10.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index 71e4f64fa69c..ab7babc7735d 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -6,11 +6,8 @@ variable_diameter: 0.2 [wizard_step_button CALIBRATE_5D_MANUAL_OLD0] image: wizards/5d_calibration_manual/5d_calibration.jpg -landscape: false description: This wizard will help you calibrate five axis module warning: 5DCalibrationManualOld.MakeSureFreeOfPlastic -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -24,11 +21,7 @@ cancel_gcode: [wizard_step_slider CALIBRATE_5D_MANUAL_OLD1] image:wizards/5d_calibration_manual/5d_calibration2-02.jpg -landscape: false description: Check the diameter of the calibration tool and press Next - -countdown: 0 - slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 @@ -42,11 +35,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL_OLD2] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -landscape: false description: Place the calibration tool into the five axis module and press Next - -countdown: 0 - action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -55,11 +44,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD3] image: wizards/5d_calibration_manual/5d_calibration2.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next - -countdown: 0 - axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -74,11 +59,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD4] image: wizards/5d_calibration_manual/5d_calibration3.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next - -countdown: 0 - axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -94,11 +75,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD5] image: wizards/5d_calibration_manual/5d_calibration2.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next - -countdown: 0 - axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -114,11 +91,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD6] image: wizards/5d_calibration_manual/5d_calibration2-01.jpg -landscape: false description: Move nozzle to the nearest tip of the calibration tool and press Next - -countdown: 0 - axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index d59f0bddaa03..0f1b9479b986 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -4,12 +4,7 @@ type: 5d steps: ADJUST_BASEMENT0 [wizard_step_wizards ADJUST_BASEMENT0] -image: none -landscape: false description: AdjustManadger.ManagersChoiceDescription - -countdown: 0 - wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index b53883d764f6..62173e200d0f 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -6,11 +6,7 @@ variable_wcs: 1 [wizard_step ADJUST_BASEMENT_AUTO0] image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -landscape: false description: This wizard helps you to setup zero point for proper 5D printing - -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -20,11 +16,8 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO1] image: wizards/zero_point_setup/zero_point_setup04.jpg -landscape: false description: Please place needed base in the 5D Module and press Next warning: AdjustBasementAuto.MakeSureBaseProtrudes -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -32,11 +25,8 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: Connect probe and press Next warning: AdjustBasementAuto.WarningScrew -countdown: 0 - action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -44,11 +34,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -landscape: false description: AdjustBasementAuto.ConnectAndCheck - -countdown: 0 - placeholder: wizard-step-probe action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -57,11 +43,7 @@ cancel_gcode: [wizard_step_selector ADJUST_BASEMENT_AUTO4] image: wizards/zero_point_setup/zero_point_setup.jpg -landscape: false description: Please select Printing mode which you want to use - -countdown: 0 - items: 5D_spiral, 5D_spiral_full action_gcode: {% set wcs = wizard.variables.wcs|int %} @@ -80,11 +62,7 @@ select_gcode: [wizard_step_jog ADJUST_BASEMENT_AUTO5] image: wizards/adjust_basement_auto/move-sensor-to-center.jpg -landscape: false description: AdjustBasementAuto.MoveSensorToCenter - -countdown: 0 - axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -99,11 +77,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO6] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: AdjustBasementAuto.Disable - -countdown: 0 - placeholder: waitProgress true action_gcode: {% set wcs = wizard.variables.wcs %} @@ -114,11 +88,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO7] image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -landscape: false description: Adjust basement completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 178ad09b4e09..bebc86a23772 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -8,10 +8,6 @@ variable_diameter: 6.0 [wizard_step_button ADJUST_BASEMENT_MANUAL0] image: wizards/zero_point_setup/zero_point_setup.jpg description: This wizard helps you to setup zero point for proper 5D printing -landscape: false - -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -26,9 +22,6 @@ cancel_gcode: [wizard_step_slider ADJUST_BASEMENT_MANUAL1] image: wizards/zero_point_setup/zero_point_setup02.jpg description: Set basement diameter and press Next -landscape: false - -countdown: 0 slider_set_diameter_min: 3 slider_set_diameter_max: 200 slider_set_diameter_step: 0.1 @@ -43,9 +36,6 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_MANUAL2] image: wizards/zero_point_setup/zero_point_setup04.jpg description: Please place needed base in the 5D Module and press Next -landscape: false - -countdown: 0 action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -54,9 +44,6 @@ cancel_gcode: [wizard_step_selector ADJUST_BASEMENT_MANUAL3] image: wizards/zero_point_setup/zero_point_setup.jpg description: Please select Printing mode which you want to use -landscape: false - -countdown: 0 items: 5D_spiral, 5D_spiral_full placeholder: wizard-step-probe action_gcode: @@ -76,9 +63,6 @@ select_gcode: [wizard_step_jog ADJUST_BASEMENT_MANUAL4] image: wizards/zero_point_setup/zero_point_setup01.jpg description: Move nozzle to the center of the base and press Next -landscape: false - -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -93,9 +77,6 @@ cancel_gcode: [wizard_step_jog ADJUST_BASEMENT_MANUAL5] image: wizards/zero_point_setup/zero_point_setup02.jpg description: Move nozzle to the center of the base and press Next -landscape: false - -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 diff --git a/stereotech_config/wizards/align_nozzles.cfg b/stereotech_config/wizards/align_nozzles.cfg index c4382eb94bf6..9abc9a42e2da 100644 --- a/stereotech_config/wizards/align_nozzles.cfg +++ b/stereotech_config/wizards/align_nozzles.cfg @@ -5,11 +5,8 @@ steps: ALIGN_NOZZLES0, ALIGN_NOZZLES1, ALIGN_NOZZLES2, ALIGN_NOZZLES3, ALIGN_NOZ [wizard_step_button ALIGN_NOZZLES0] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: AlignNozzles.Description warning: AlignNozzles.Prerequisites -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -43,11 +40,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -landscape: false description: Place the calibration tool into the five axis module and press Next - -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -56,10 +49,6 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES2] image: wizards/nozzle_offset/release_nozzle.jpg description: AlignNozzles.ReleaseNozzle -landscape: false - -countdown: 0 - action_gcode: {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} # 3d @@ -76,11 +65,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES3] image: wizards/nozzle_offset/adjust_nozzle.jpg -landscape: false description: AlignNozzles.TightNozzle - -countdown: 0 - action_gcode: G91 G0 Z30 F600 @@ -91,11 +76,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES4] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: AlignNozzles.Completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/bed_level.cfg b/stereotech_config/wizards/bed_level.cfg index dfe7cd8162b8..3a8c178956c8 100644 --- a/stereotech_config/wizards/bed_level.cfg +++ b/stereotech_config/wizards/bed_level.cfg @@ -4,12 +4,7 @@ type: 3d steps: BED_LEVEL0 [wizard_step_wizards BED_LEVEL0] -image: none -landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription - -countdown: 0 - wizards: BED_LEVEL_AUTO, BED_LEVEL_MANUAL action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg index 017939cf4a5d..645e85e08120 100644 --- a/stereotech_config/wizards/bed_level_auto.cfg +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -5,11 +5,7 @@ steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_L [wizard_step_button BED_LEVEL_AUTO3] image: wizards/bed_level_manual/bed_leveling04.jpg -landscape: false description: Wait until bed and printhead stop and adjust nearest thumb wheel - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: ABORT @@ -22,11 +18,8 @@ button_next_point_gcode: [wizard_step BED_LEVEL_AUTO4] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: Connect probe and press Next warning: BedLevelAuto.WarningScrew -countdown: 0 - action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -34,11 +27,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO5] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -landscape: false description: BedLevelAuto.ConnectAndCheck - -countdown: 0 - placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_THREE_D' %} @@ -48,11 +37,8 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO6] image: wizards/bed_level_auto/auto_bed_leveling_02.jpg -landscape: false description: BedLevelAuto.Wait - countdown: 420 - placeholder: waitProgress true action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -61,11 +47,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO7] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: BedLevelAuto.Disable - -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -73,11 +55,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO8] image: wizards/bed_level_auto/auto_bed_leveling_01.jpg -landscape: false description: Bed level completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg index 920e94e4ad8a..b12e85db952d 100644 --- a/stereotech_config/wizards/bed_level_manual.cfg +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -5,11 +5,8 @@ steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_L [wizard_step_button BED_LEVEL_MANUAL0] image: wizards/bed_level_manual/bed_leveling.jpg -landscape: false description: Perform bed leveling if there is too much distance between the nozzles and the build plate warning: BedLevelManual.MakeSureFreeOfPlastic -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 Z_ENDSTOP_CALIBRATE @@ -24,11 +21,7 @@ cancel_gcode: # this step is added because clear_nozzle cannot run additional commands in action_gcode (Z_ENDSTOP_CALIBRATE) [wizard_step BED_LEVEL_MANUAL1] image: wizards/bed_level_manual/bed_leveling.jpg -landscape: false description: Perform bed leveling if there is too much distance between the nozzles and the build plate - -countdown: 0 - action_gcode: Z_ENDSTOP_CALIBRATE SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -38,9 +31,6 @@ cancel_gcode: [wizard_step_jog BED_LEVEL_MANUAL2] image: wizards/bed_level_manual/bed_leveling05.jpg description: Adjust gap between left nozzle and bed using controls -landscape: false - -countdown: 0 axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -54,11 +44,7 @@ cancel_gcode: [wizard_step_button BED_LEVEL_MANUAL3] image: wizards/bed_level_manual/bed_leveling04.jpg -landscape: false description: Wait until bed and printhead stop and adjust nearest thumb wheel - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: ABORT @@ -70,11 +56,7 @@ button_next_point_gcode: [wizard_step BED_LEVEL_MANUAL4] image: wizards/bed_level_manual/bed_leveling.jpg -landscape: false description: Bed level completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 0ccd3047969c..802497ab18a3 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -4,12 +4,7 @@ type: any steps: CHANGE_MATERIAL0 [wizard_step_wizards CHANGE_MATERIAL0] -image: none -landscape: false description: ChangeMaterialFilament.ManagersChoiceDescription - -countdown: 0 - wizards: CHANGE_MATERIAL_FILAMENT, CHANGE_MATERIAL_FIBER action_gcode: MOVE_SERVICE_POSITION diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg index 5d984211a2d9..be9d5b9d87b8 100644 --- a/stereotech_config/wizards/change_material_fiber.cfg +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -9,11 +9,8 @@ variable_cooldown_temp: 50 [wizard_step CHANGE_MATERIAL_FIBER0] image: wizards/change_fiber/change_fiber.jpg -landscape: false description: ChangeMaterialFiber.WelcomeStep warning: ChangeMaterialFiber.stepOneWarning -countdown: 0 - action_gcode: {% set selected_e = wizard.variables.selected_e %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 @@ -25,11 +22,7 @@ cancel_gcode: [wizard_step_selector CHANGE_MATERIAL_FIBER1] image: wizards/change_material/change_material02.jpg -landscape: false description: Select the needed action - -countdown: 0 - items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -47,11 +40,7 @@ select_gcode: [wizard_step_slider CHANGE_MATERIAL_FIBER2] image: wizards/change_material/change_material02.jpg -landscape: false description: Select the needed temperature of the material which could be found on the filament package or on the manufacturers website - -countdown: 0 - slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -66,11 +55,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER3] image: wizards/change_material/change_material03.jpg -landscape: false description: ChangeMaterialFiber.WaitHeater - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -94,11 +79,7 @@ button_cut_gcode: [wizard_step CHANGE_MATERIAL_FIBER4] image: wizards/change_material/change_material.jpg -landscape: false description: ChangeMaterialFiber.InstallMaterialSpool - -countdown: 0 - placeholder: wizard-step-preheat # COOL DOWN action_gcode: {% set temperature = wizard.variables.temperature %} @@ -109,11 +90,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER5] image: wizards/change_material/change_material04.jpg -landscape: false description: ChangeMaterialFiber.LoadPushPull - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -128,11 +105,7 @@ button_insert_gcode: [wizard_step_slider CHANGE_MATERIAL_FIBER6] image: wizards/change_material/change_material02.jpg -landscape: false description: Select loading temperature - -countdown: 0 - slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -147,11 +120,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER7] image: wizards/change_material/change_material04.jpg -landscape: false description: ChangeMaterialFiber.FiberFromSoplo - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index 91f5859e46f4..5fca1eb867a6 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -7,11 +7,8 @@ variable_action: 'all' [wizard_step CHANGE_MATERIAL_FILAMENT0] image: wizards/change_material/change_material.jpg -landscape: false description: This wizard will help you to change insert or remove the material warning: Missing extruder -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION_HEAD @@ -26,11 +23,7 @@ cancel_gcode: [wizard_step_selector CHANGE_MATERIAL_FILAMENT1] image: wizards/change_material/change_material01.jpg -landscape: false description: Select the extruder where you want change the material - -countdown: 0 - items: extruder, extruder1 action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -43,11 +36,7 @@ select_gcode: [wizard_step_selector CHANGE_MATERIAL_FILAMENT2] image: wizards/change_material/change_material02.jpg -landscape: false description: Select the needed action - -countdown: 0 - items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -63,11 +52,7 @@ select_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT3] image: wizards/change_material/change_material02.jpg -landscape: false description: ChangeMaterialFilament.UnloadedMaterialSelect - -countdown: 0 - tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -84,11 +69,7 @@ cancel_gcode: [wizard_step_slider CHANGE_MATERIAL_FILAMENT4] image: wizards/change_material/change_material02.jpg -landscape: false description: Select unloading temperature - -countdown: 0 - slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -102,11 +83,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FILAMENT5] image: wizards/change_material/change_material03.jpg -landscape: false description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: {% set action = wizard.variables.action %} @@ -124,11 +101,7 @@ button_load_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT6] image: wizards/change_material/change_material02.jpg -landscape: false description: ChangeMaterialFilament.LoadedMaterialSelect - -countdown: 0 - tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -145,11 +118,7 @@ cancel_gcode: [wizard_step_slider CHANGE_MATERIAL_FILAMENT7] image: wizards/change_material/change_material02.jpg -landscape: false description: Select loading temperature - -countdown: 0 - slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -163,11 +132,7 @@ cancel_gcode: [wizard_step CHANGE_MATERIAL_FILAMENT8] image: wizards/change_material/change_material.jpg -landscape: false description: Load new spool insert material into bowden tube and press Next button - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -178,11 +143,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FILAMENT9] image: wizards/change_material/change_material04.jpg -landscape: false description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 @@ -198,11 +159,7 @@ button_insert_gcode: # FOR FIBER [wizard_step_button CHANGE_MATERIAL_FILAMENT10] image: wizards/change_material/change_material04.jpg -landscape: false description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index 531f752b78eb..2c7c22193071 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -5,10 +5,7 @@ steps: CHANGE_MODULE0, CHANGE_MODULE1, CHANGE_MODULE2 [wizard_step CHANGE_MODULE0] image: wizards/change_module/change_module.jpg -landscape: false -description: This wizard will help you change module. To remove the module, loosen the fixing nuts on the left and right (two on each side) using the supplied wrench, then carefully pull the module towards you until it stops. Once the nuts line up with the vertical slot, pull the module up. Disconnect the module cable from the connector. -countdown: 0 - +description: ChangeModule.ChangeModuleFirstStep action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP={wizard.next_step} @@ -17,11 +14,8 @@ cancel_gcode: [wizard_step_button CHANGE_MODULE1] image: wizards/change_module/change_module1.jpg -landscape: false -description: Power off printer and disconnect it from power source. Then you could change module according to the manual +description: Then you could change module according to the manual warning: Calibration required after module change -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -31,11 +25,7 @@ button_power_off_gcode: [wizard_step CHANGE_MODULE2] image: wizards/change_module/change_module.jpg -landscape: false description: Change Module complete - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 7434eedbbb3f..86fbfb3e890c 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -79,12 +79,7 @@ gcode: {% endif %} [wizard_step CLEAR_NOZZLE0] -image: none -landscape: false description: ClearNozzle.WaitHeating - -countdown: 0 - placeholder: wizard-step-preheat action_gcode: RETRACT_MATERIAL @@ -93,12 +88,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step CLEAR_NOZZLE1] -image: none -landscape: false description: ClearNozzle.NozzleClear - -countdown: 0 - action_gcode: MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -122,11 +112,7 @@ gcode: [wizard_step CHANGE_MATERIAL_COMPLETED] image: wizards/change_material/change_material.jpg -landscape: false description: Material change completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -134,11 +120,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_COMPLETED] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: NozzleOffset.Completed - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -147,10 +129,6 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_MANUAL_COMPLETED] image: wizards/zero_point_setup/zero_point_setup.jpg description: Adjust basement completed -landscape: false - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -158,11 +136,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL_COMPLETED] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -landscape: false description: Five Axis Calibration complete - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg index 21698ecaefcf..9170c84f64da 100644 --- a/stereotech_config/wizards/nozzle_offset_5d.cfg +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -4,12 +4,8 @@ type: 5d steps: NOZZLE_OFFSET_5D0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, NOZZLE_OFFSET_5D1, NOZZLE_OFFSET_5D2, NOZZLE_OFFSET_5D3, NOZZLE_OFFSET_5D4, NOZZLE_OFFSET_5D5 [wizard_step_button NOZZLE_OFFSET_5D0] -image: none -landscape: false description: NozzleOffset5D.Description warning: NozzleOffset5D.MakeSureFreeOfPlastic -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -23,11 +19,8 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -landscape: false description: Place the calibration tool into the five axis module and press Next warning: NozzleOffset5D.GapBetweenTemplateModule -countdown: 0 - action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -36,10 +29,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg description: Connect probe and press Next -landscape: false warning: NozzleOffset5D.WarningScrew -countdown: 0 - action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -47,11 +37,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -landscape: false description: NozzleOffset5D.ConnectAndCheck - -countdown: 0 - placeholder: wizard-step-probe action_gcode: ADJUST_NOZZLE_OFFSET_Z @@ -62,9 +48,6 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_5D4] image: wizards/nozzle_offset/chup_3d.jpg description: NozzleOffset5D.MoveToSurface -landscape: false - -countdown: 0 axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -79,11 +62,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D5] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -landscape: false description: NozzleOffset5D.Finish - -countdown: 0 - action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index c1402dafc1c1..fc69b3f54710 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -5,11 +5,8 @@ steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_ [wizard_step_button NOZZLE_OFFSET_FIBER0] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: NozzleOffset.Description warning: NozzleOffset.Prerequisites -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -24,11 +21,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_FIBER1] image: wizards/nozzle_offset/chup_3d.jpg -landscape: false description: NozzleOffset.GapBetweenNozzleAndGlass - -countdown: 0 - action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -38,10 +31,6 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_FIBER2] image: wizards/nozzle_offset/select_temp.jpg description: NozzleOffset.SetTemperatures -landscape: false - -countdown: 0 - slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -66,11 +55,8 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_FIBER3] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: NozzleOffset.WaitForPrint - countdown: 1140 - placeholder: wizard-step-preheat axes: z steps: 0.05, 0.1, 1 @@ -83,12 +69,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step_nozzle_offset NOZZLE_OFFSET_FIBER4] -image: none -landscape: false description: NozzleOffset.NozzleOffsetDescription - -countdown: 0 - steps: 15 default_step: 8 step_value: 0.1 diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index f8dbce55c540..9d37f049ea8a 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -5,11 +5,8 @@ steps: NOZZLE_OFFSET_HYBRID0, NOZZLE_OFFSET_HYBRID1, NOZZLE_OFFSET_HYBRID2, NOZZ [wizard_step_button NOZZLE_OFFSET_HYBRID0] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: NozzleOffset.Description warning: NozzleOffset.Prerequisites -countdown: 0 - action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -23,11 +20,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_HYBRID1] image: wizards/nozzle_offset/release_nozzle.jpg -landscape: false description: NozzleOffset.ReleaseNozzle - -countdown: 0 - action_gcode: G0 Z0 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -36,11 +29,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_HYBRID2] image: wizards/nozzle_offset/adjust_nozzle.jpg -landscape: false description: NozzleOffset.TightNozzle - -countdown: 0 - action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -50,10 +39,6 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID3] image: wizards/nozzle_offset/select_temp.jpg description: NozzleOffset.SetTemperatures -landscape: false - -countdown: 0 - slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -78,11 +63,8 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_HYBRID4] image: wizards/nozzle_offset/wait_for_print.jpg -landscape: false description: NozzleOffset.WaitForPrint - countdown: 540 - placeholder: wizard-step-preheat axes: z steps: 0.05, 0.1, 1 @@ -96,11 +78,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID5] image: wizards/nozzle_offset/grid_vertical.jpg -landscape: false description: NozzleOffset.AdjustVertical - -countdown: 0 - slider_y_offset_min: 1 slider_y_offset_max: 15 slider_y_offset_step: 1 @@ -114,11 +92,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID6] image: wizards/nozzle_offset/grid_horizontal.jpg -landscape: false description: NozzleOffset.AdjustHorizontal - -countdown: 0 - slider_x_offset_min: 1 slider_x_offset_max: 15 slider_x_offset_step: 1 diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg index 8e8296562b0e..9c8c0835662e 100644 --- a/stereotech_config/wizards/zero_point_calibration.cfg +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -6,9 +6,6 @@ steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO [wizard_step ZERO_POINT_CALIBRATE0] image: wizards/zero_point_setup/zero_point_setup05.jpg description: This wizard helps you to setup zero point for proper 5D printing -landscape: false - -countdown: 0 action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -19,9 +16,6 @@ cancel_gcode: [wizard_step ZERO_POINT_CALIBRATE1] image: wizards/5d_calibration_manual/5d_calibration1.jpg description: Place the calibration tool into the five axis module and press Next -landscape: false - -countdown: 0 action_gcode: MOVE_WCS_ZERO WCS=1 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -31,9 +25,6 @@ cancel_gcode: [wizard_step_jog ZERO_POINT_CALIBRATE2] image: wizards/5d_calibration_manual/5d_calibration2.jpg description: Move nozzle to the nearest tip of the calibration tool and press Next -landscape: false - -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -49,9 +40,6 @@ cancel_gcode: [wizard_step_jog ZERO_POINT_CALIBRATE3] image: wizards/5d_calibration_manual/5d_calibration2.jpg description: Move nozzle to the nearest tip of the calibration tool and press Next -landscape: false - -countdown: 0 axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -64,11 +52,7 @@ cancel_gcode: [wizard_step_slider ZERO_POINT_CALIBRATE4] image: wizards/zero_point_setup/zero_point_setup03.jpg -landscape: false description: Check the diameter of the calibration tool and press Next - -countdown: 0 - slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 From dd959098d9d83f74c6fdca73c12f0c4c37d8b1bf Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Fri, 2 Feb 2024 08:09:50 +0000 Subject: [PATCH 56/65] STEAPP-875: fixed bug , file with json data not exist --- klippy/extras/wizard/wizard_step_tree.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/klippy/extras/wizard/wizard_step_tree.py b/klippy/extras/wizard/wizard_step_tree.py index 768471ea063f..5f1b4026a298 100644 --- a/klippy/extras/wizard/wizard_step_tree.py +++ b/klippy/extras/wizard/wizard_step_tree.py @@ -15,10 +15,11 @@ def __init__(self, config): self.types = config.getlist('types', []) json_path = config.get('tree_file_path', '') # read json file - filename = self.printer.get_start_args()['config_file'] - if 'printer.cfg' not in filename.split('/')[-1]: + config_path = self.printer.get_start_args()['config_file'].split('/') + if 'printer.cfg' not in config_path: config_dir_name = 'stereotech_config' - abs_json_path = os.path.join(os.path.abspath('.'), config_dir_name, json_path) + klipper_path = '/'.join(config_path[:-1]) + abs_json_path = os.path.join(klipper_path, config_dir_name, json_path) if os.path.isfile(abs_json_path): try: with open(abs_json_path, 'r') as f: @@ -26,7 +27,7 @@ def __init__(self, config): except Exception as e: raise config.error("0026: do not parse .json file, error %s" % e) else: - raise config.error("0026: file with data not exist") + raise config.error("0026: file with data not exist: %s" % abs_json_path) # register commands self.gcode.register_mux_command("WIZARD_STEP_TREE", 'STEP', self.name, self.cmd_WIZARD_STEP_TREE, From 7c4c37166258e083bd82cb0f7d4192df18f96bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Tue, 6 Feb 2024 13:03:41 +0300 Subject: [PATCH 57/65] STEAPP-871: edited the cmd for debug wizrads --- .../wizards/cmd_debug/bed_level_auto_cmd .cfg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg b/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg index f2a4dd1dcf4d..464955ed8664 100644 --- a/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg +++ b/stereotech_config/wizards/cmd_debug/bed_level_auto_cmd .cfg @@ -1,8 +1,8 @@ # -------------------------------step 0 -EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 -WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 BUTTON=clear_noozle -CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO0 +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL0 +WIZARD_STEP_BUTTON WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL0 BUTTON=clear_noozle +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL0 # # --------------------------------step0.1 @@ -16,15 +16,15 @@ CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=CLEAR_NOZZLE1 # -------------------------------step 1 -EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO1 -CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO1 +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL1 # ---------------------------------step2 -EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 -WIZARD_STEP_JOG WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 AXIS=z DIRECTION=0 -WIZARD_STEP_SET_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 VALUE=1 -CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_AUTO2 +EXECUTE_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL2 +WIZARD_STEP_JOG WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL2 AXIS=z DIRECTION=0 +WIZARD_STEP_SET_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL2 VALUE=1 +CANCEL_WIZARD_STEP WIZARD=BED_LEVEL_AUTO STEP=BED_LEVEL_MANUAL2 # ---------------------------------step3 From ccc1af53b2a93c85616b18ae4c9caca16958fce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Tue, 6 Feb 2024 18:02:44 +0300 Subject: [PATCH 58/65] STEAPP-872: fixed bug, no path to image --- stereotech_config/wizards/adjust_basement.cfg | 2 +- stereotech_config/wizards/adjust_basement_auto.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index 0f1b9479b986..8403fd140095 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -1,5 +1,5 @@ [wizard ADJUST_BASEMENT] -image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg type: 5d steps: ADJUST_BASEMENT0 diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 62173e200d0f..abcd48af1ee4 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -1,5 +1,5 @@ [wizard ADJUST_BASEMENT_AUTO] -image: wizards/5d_calibration_auto/adjust_basement_auto/adjust_basement_auto.jpg +image: wizards/adjust_basement_auto/adjust_basement_auto.jpg type: 5d steps: ADJUST_BASEMENT_AUTO0, ADJUST_BASEMENT_AUTO1, ADJUST_BASEMENT_AUTO2, ADJUST_BASEMENT_AUTO3, ADJUST_BASEMENT_AUTO4, ADJUST_BASEMENT_AUTO5, ADJUST_BASEMENT_AUTO6, ADJUST_BASEMENT_AUTO7 variable_wcs: 1 From 7eca62b8028d8662a5f8ab832404fd1eb32ff305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Fri, 9 Feb 2024 17:52:25 +0300 Subject: [PATCH 59/65] STEAPP-872: edited the description and warning lines, adapting them to the client --- HTE530-5-4-22.cfg | 2 +- .../wizards/5d_calibration_auto.cfg | 24 +++++++++---------- .../wizards/5d_calibration_manual.cfg | 16 ++++++------- .../wizards/5d_calibration_manual_old.cfg | 16 ++++++------- .../wizards/adjust_basement_auto.cfg | 20 ++++++++-------- .../wizards/adjust_basement_manual.cfg | 12 +++++----- stereotech_config/wizards/bed_level_auto.cfg | 14 +++++------ .../wizards/bed_level_manual.cfg | 12 +++++----- .../wizards/change_material_fiber.cfg | 18 +++++++------- .../wizards/change_material_filament.cfg | 22 ++++++++--------- stereotech_config/wizards/change_module.cfg | 8 +++---- ...md.cfg => nozzles_height_align_5d_cmd.cfg} | 0 stereotech_config/wizards/common.cfg | 12 +++++----- .../wizards/nozzle_offset_5d.cfg | 16 ++++++------- .../wizards/nozzle_offset_fiber.cfg | 12 +++++----- .../wizards/nozzle_offset_hybrid.cfg | 16 ++++++------- ...ozzles.cfg => nozzles_height_align_5d.cfg} | 12 +++++----- .../wizards/zero_point_calibration.cfg | 10 ++++---- 18 files changed, 120 insertions(+), 122 deletions(-) rename stereotech_config/wizards/cmd_debug/{align_nozzles_cmd.cfg => nozzles_height_align_5d_cmd.cfg} (100%) rename stereotech_config/wizards/{align_nozzles.cfg => nozzles_height_align_5d.cfg} (89%) diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 7fff71d8cacb..18d241d2f916 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -51,7 +51,7 @@ path: /home/ste/uploads [include stereotech_config/wizards/bed_level_auto.cfg] [include stereotech_config/wizards/nozzle_offset_5d.cfg] -[include stereotech_config/wizards/align_nozzles.cfg] +[include stereotech_config/wizards/nozzles_height_align_5d.cfg] [include stereotech_config/wizards/nozzle_offset_fiber.cfg] [include stereotech_config/wizards/nozzle_offset_hybrid.cfg] diff --git a/stereotech_config/wizards/5d_calibration_auto.cfg b/stereotech_config/wizards/5d_calibration_auto.cfg index 94c1f3a840bc..461b3a791f23 100644 --- a/stereotech_config/wizards/5d_calibration_auto.cfg +++ b/stereotech_config/wizards/5d_calibration_auto.cfg @@ -5,8 +5,8 @@ steps: CALIBRATE_5D_AUTO0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_AUTO1, CAL [wizard_step_button CALIBRATE_5D_AUTO0] image: wizards/5d_calibration_auto/auto_five_axis_level_main.jpg -description: 5DCalibrationAuto.Description -warning: 5DCalibrationAuto.MakeSureFreeOfPlastic +description: Wizards.5DCalibrationAuto.Description +warning: Wizards.Common.MakeSureFreeOfPlastic action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -20,8 +20,8 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -description: Place the calibration tool into the five axis module and press Next -warning: 5DCalibrationAuto.GapBetweenTemplateModule +description: Wizards.Common.PlaceTool +warning: Wizards.Common.GapBetweenTemplateModule action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -29,8 +29,8 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: Connect probe and press Next -warning: 5DCalibrationAuto.WarningScrew +description: Wizards.Common.ConnectSensor +warning: Wizards.Common.WarningScrew action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -38,7 +38,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -description: 5DCalibrationAuto.ConnectAndCheck +description: Wizards.Common.ConnectAndCheck placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_FIVE_D' %} @@ -48,7 +48,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO4] image: wizards/5d_calibration_auto/auto_five_axis_level_05.jpg -description: 5DCalibrationAuto.Wait +description: Wizards.5DCalibrationAuto.Wait countdown: 420 placeholder: waitProgress true action_gcode: @@ -58,7 +58,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_AUTO5] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -description: 5DCalibrationAuto.MoveToSurface +description: Wizards.5DCalibrationAuto.MoveToSurface axes: z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -73,7 +73,7 @@ cancel_gcode: [wizard_step_button CALIBRATE_5D_AUTO6] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: 5DCalibrationAuto.XYCorrectionDescription +description: Wizards.5DCalibrationAuto.XYCorrectionDescription action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CALIBRATE_5D_AUTO8 button_xy_correction_gcode: @@ -84,7 +84,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_AUTO7] image: wizards/5d_calibration_auto/auto_five_axis_level_07.jpg -description: 5DCalibrationAuto.MoveToHole +description: Wizards.5DCalibrationAuto.MoveToHole axes: x, y, z steps: 0.01, 0.05, 0.1, 1 default_step: 1 @@ -99,7 +99,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_AUTO8] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: 5DCalibrationAuto.Finish +description: Wizards.5DCalibrationAuto.Finish action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/5d_calibration_manual.cfg b/stereotech_config/wizards/5d_calibration_manual.cfg index c8ad2fd5830e..63c8f7c94e74 100644 --- a/stereotech_config/wizards/5d_calibration_manual.cfg +++ b/stereotech_config/wizards/5d_calibration_manual.cfg @@ -5,8 +5,8 @@ steps: CALIBRATE_5D_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, CALIBRATE_5D_MANUAL1, [wizard_step_button CALIBRATE_5D_MANUAL0] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -description: This wizard will help you calibrate five axis module -warning: 5DCalibrationManual.MakeSureFreeOfPlastic +description: Wizards.5DCalibrationManual.Description +warning: Wizards.Common.MakeSureFreeOfPlastic action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -20,9 +20,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg - -description: Place the calibration tool into the five axis module and press Next - +description: Wizards.Common.PlaceTool action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -31,7 +29,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL2] image: wizards/5d_calibration_manual/5d_calibration6.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -46,7 +44,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL3] image: wizards/5d_calibration_manual/5d_calibration9.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -62,7 +60,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL4] image: wizards/5d_calibration_manual/5d_calibration6.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -78,7 +76,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL5] image: wizards/5d_calibration_manual/5d_calibration10.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/5d_calibration_manual_old.cfg b/stereotech_config/wizards/5d_calibration_manual_old.cfg index ab7babc7735d..7d9ea5b4de87 100644 --- a/stereotech_config/wizards/5d_calibration_manual_old.cfg +++ b/stereotech_config/wizards/5d_calibration_manual_old.cfg @@ -6,8 +6,8 @@ variable_diameter: 0.2 [wizard_step_button CALIBRATE_5D_MANUAL_OLD0] image: wizards/5d_calibration_manual/5d_calibration.jpg -description: This wizard will help you calibrate five axis module -warning: 5DCalibrationManualOld.MakeSureFreeOfPlastic +description: Wizards.5DCalibrationManual.Description +warning: Wizards.Common.MakeSureFreeOfPlastic action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -21,7 +21,7 @@ cancel_gcode: [wizard_step_slider CALIBRATE_5D_MANUAL_OLD1] image:wizards/5d_calibration_manual/5d_calibration2-02.jpg -description: Check the diameter of the calibration tool and press Next +description: Wizards.Common.CheckDiameter slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 @@ -35,7 +35,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL_OLD2] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -description: Place the calibration tool into the five axis module and press Next +description: Wizards.Common.PlaceTool action_gcode: MOVE_CALIBRATION_POINT POINT=0 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -44,7 +44,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD3] image: wizards/5d_calibration_manual/5d_calibration2.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -59,7 +59,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD4] image: wizards/5d_calibration_manual/5d_calibration3.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -75,7 +75,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD5] image: wizards/5d_calibration_manual/5d_calibration2.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 @@ -91,7 +91,7 @@ cancel_gcode: [wizard_step_jog CALIBRATE_5D_MANUAL_OLD6] image: wizards/5d_calibration_manual/5d_calibration2-01.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1.0, 10.0 default_step: 1 diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index abcd48af1ee4..04b9aeef5876 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -6,7 +6,7 @@ variable_wcs: 1 [wizard_step ADJUST_BASEMENT_AUTO0] image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -description: This wizard helps you to setup zero point for proper 5D printing +description: Wizards.Common.ZeroPointDescription action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -16,8 +16,8 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO1] image: wizards/zero_point_setup/zero_point_setup04.jpg -description: Please place needed base in the 5D Module and press Next -warning: AdjustBasementAuto.MakeSureBaseProtrudes +description: Wizards.Common.PleaseTool +warning: Wizards.AdjustBasementAuto.MakeSureBaseProtrudes action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -25,8 +25,8 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: Connect probe and press Next -warning: AdjustBasementAuto.WarningScrew +description: Wizards.Common.ConnectSensor +warning: Wizards.Common.WarningScrew action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -34,7 +34,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -description: AdjustBasementAuto.ConnectAndCheck +description: Wizards.Common.ConnectAndCheck placeholder: wizard-step-probe action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -43,7 +43,7 @@ cancel_gcode: [wizard_step_selector ADJUST_BASEMENT_AUTO4] image: wizards/zero_point_setup/zero_point_setup.jpg -description: Please select Printing mode which you want to use +description: Wizards.Common.SelectMode items: 5D_spiral, 5D_spiral_full action_gcode: {% set wcs = wizard.variables.wcs|int %} @@ -62,7 +62,7 @@ select_gcode: [wizard_step_jog ADJUST_BASEMENT_AUTO5] image: wizards/adjust_basement_auto/move-sensor-to-center.jpg -description: AdjustBasementAuto.MoveSensorToCenter +description: Wizards.AdjustBasementAuto.MoveSensorToCenter axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -77,7 +77,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO6] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: AdjustBasementAuto.Disable +description: Wizards.Common.DisableSensor placeholder: waitProgress true action_gcode: {% set wcs = wizard.variables.wcs %} @@ -88,7 +88,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO7] image: wizards/adjust_basement_auto/adjust_basement_auto.jpg -description: Adjust basement completed +description: Wizards.Common.AdjustBasementCompleted action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index bebc86a23772..438eebcbbd0d 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -7,7 +7,7 @@ variable_diameter: 6.0 [wizard_step_button ADJUST_BASEMENT_MANUAL0] image: wizards/zero_point_setup/zero_point_setup.jpg -description: This wizard helps you to setup zero point for proper 5D printing +description: Wizards.Common.ZeroPointDescription action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -21,7 +21,7 @@ cancel_gcode: [wizard_step_slider ADJUST_BASEMENT_MANUAL1] image: wizards/zero_point_setup/zero_point_setup02.jpg -description: Set basement diameter and press Next +description: Wizards.AdjustBasementManual.SetBasementDiameter slider_set_diameter_min: 3 slider_set_diameter_max: 200 slider_set_diameter_step: 0.1 @@ -35,7 +35,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_MANUAL2] image: wizards/zero_point_setup/zero_point_setup04.jpg -description: Please place needed base in the 5D Module and press Next +description: Wizards.Common.PleaseTool action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -43,7 +43,7 @@ cancel_gcode: [wizard_step_selector ADJUST_BASEMENT_MANUAL3] image: wizards/zero_point_setup/zero_point_setup.jpg -description: Please select Printing mode which you want to use +description: Wizards.Common.SelectMode items: 5D_spiral, 5D_spiral_full placeholder: wizard-step-probe action_gcode: @@ -62,7 +62,7 @@ select_gcode: [wizard_step_jog ADJUST_BASEMENT_MANUAL4] image: wizards/zero_point_setup/zero_point_setup01.jpg -description: Move nozzle to the center of the base and press Next +description: Wizards.AdjustBasementManual.MoveNozzleToCenter axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -76,7 +76,7 @@ cancel_gcode: [wizard_step_jog ADJUST_BASEMENT_MANUAL5] image: wizards/zero_point_setup/zero_point_setup02.jpg -description: Move nozzle to the center of the base and press Next +description: Wizards.AdjustBasementManual.MoveNozzleToCenter axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 diff --git a/stereotech_config/wizards/bed_level_auto.cfg b/stereotech_config/wizards/bed_level_auto.cfg index 645e85e08120..ccc37311c33c 100644 --- a/stereotech_config/wizards/bed_level_auto.cfg +++ b/stereotech_config/wizards/bed_level_auto.cfg @@ -5,7 +5,7 @@ steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_L [wizard_step_button BED_LEVEL_AUTO3] image: wizards/bed_level_manual/bed_leveling04.jpg -description: Wait until bed and printhead stop and adjust nearest thumb wheel +description: Wizards.Common.WaitBedStop placeholder: wizard-step-preheat action_gcode: ABORT @@ -18,8 +18,8 @@ button_next_point_gcode: [wizard_step BED_LEVEL_AUTO4] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: Connect probe and press Next -warning: BedLevelAuto.WarningScrew +description: Wizards.Common.ConnectSensor +warning: Wizards.Common.WarningScrew action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -27,7 +27,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO5] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -description: BedLevelAuto.ConnectAndCheck +description: Wizards.Common.ConnectAndCheck placeholder: wizard-step-probe action_gcode: {% set cmd = 'CALIBRATE_MODULE_THREE_D' %} @@ -37,7 +37,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO6] image: wizards/bed_level_auto/auto_bed_leveling_02.jpg -description: BedLevelAuto.Wait +description: Wizards.BedLevelAuto.Wait countdown: 420 placeholder: waitProgress true action_gcode: @@ -47,7 +47,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO7] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: BedLevelAuto.Disable +description: Wizards.Common.DisableSensor action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -55,7 +55,7 @@ cancel_gcode: [wizard_step BED_LEVEL_AUTO8] image: wizards/bed_level_auto/auto_bed_leveling_01.jpg -description: Bed level completed +description: Wizards.Common.BedLevelCompleted action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg index b12e85db952d..8d8196d0068a 100644 --- a/stereotech_config/wizards/bed_level_manual.cfg +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -5,8 +5,8 @@ steps: BED_LEVEL_MANUAL0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, BED_LEVEL_MANUAL1, BED_L [wizard_step_button BED_LEVEL_MANUAL0] image: wizards/bed_level_manual/bed_leveling.jpg -description: Perform bed leveling if there is too much distance between the nozzles and the build plate -warning: BedLevelManual.MakeSureFreeOfPlastic +description: Wizards.BedLevelManual.PerformBedLeveling +warning: Wizards.Common.MakeSureFreeOfPlastic action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 Z_ENDSTOP_CALIBRATE @@ -21,7 +21,7 @@ cancel_gcode: # this step is added because clear_nozzle cannot run additional commands in action_gcode (Z_ENDSTOP_CALIBRATE) [wizard_step BED_LEVEL_MANUAL1] image: wizards/bed_level_manual/bed_leveling.jpg -description: Perform bed leveling if there is too much distance between the nozzles and the build plate +description: Wizards.BedLevelManual.PerformBedLeveling action_gcode: Z_ENDSTOP_CALIBRATE SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -30,7 +30,7 @@ cancel_gcode: [wizard_step_jog BED_LEVEL_MANUAL2] image: wizards/bed_level_manual/bed_leveling05.jpg -description: Adjust gap between left nozzle and bed using controls +description: Wizards.BedLevelManual.AdjustGapNozzleAndBed axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -44,7 +44,7 @@ cancel_gcode: [wizard_step_button BED_LEVEL_MANUAL3] image: wizards/bed_level_manual/bed_leveling04.jpg -description: Wait until bed and printhead stop and adjust nearest thumb wheel +description: Wizards.Common.WaitBedStop placeholder: wizard-step-preheat action_gcode: ABORT @@ -56,7 +56,7 @@ button_next_point_gcode: [wizard_step BED_LEVEL_MANUAL4] image: wizards/bed_level_manual/bed_leveling.jpg -description: Bed level completed +description: Wizards.Common.BedLevelCompleted action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg index be9d5b9d87b8..cb3555f28af1 100644 --- a/stereotech_config/wizards/change_material_fiber.cfg +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -9,8 +9,8 @@ variable_cooldown_temp: 50 [wizard_step CHANGE_MATERIAL_FIBER0] image: wizards/change_fiber/change_fiber.jpg -description: ChangeMaterialFiber.WelcomeStep -warning: ChangeMaterialFiber.stepOneWarning +description: Wizards.ChangeMaterialFiber.WelcomeStep +warning: Wizards.ChangeMaterialFiber.MissingExtruderRight action_gcode: {% set selected_e = wizard.variables.selected_e %} SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 @@ -22,7 +22,7 @@ cancel_gcode: [wizard_step_selector CHANGE_MATERIAL_FIBER1] image: wizards/change_material/change_material02.jpg -description: Select the needed action +description: Wizards.Common.SelectNeededAction items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -40,7 +40,7 @@ select_gcode: [wizard_step_slider CHANGE_MATERIAL_FIBER2] image: wizards/change_material/change_material02.jpg -description: Select the needed temperature of the material which could be found on the filament package or on the manufacturers website +description: Wizards.Common.SelectUnloadingTemperature slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -55,7 +55,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER3] image: wizards/change_material/change_material03.jpg -description: ChangeMaterialFiber.WaitHeater +description: Wizards.ChangeMaterialFiber.WaitHeater placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -79,7 +79,7 @@ button_cut_gcode: [wizard_step CHANGE_MATERIAL_FIBER4] image: wizards/change_material/change_material.jpg -description: ChangeMaterialFiber.InstallMaterialSpool +description: Wizards.ChangeMaterialFiber.InstallMaterialSpool placeholder: wizard-step-preheat # COOL DOWN action_gcode: {% set temperature = wizard.variables.temperature %} @@ -90,7 +90,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER5] image: wizards/change_material/change_material04.jpg -description: ChangeMaterialFiber.LoadPushPull +description: Wizards.ChangeMaterialFiber.LoadPushPull placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -105,7 +105,7 @@ button_insert_gcode: [wizard_step_slider CHANGE_MATERIAL_FIBER6] image: wizards/change_material/change_material02.jpg -description: Select loading temperature +description: Wizards.Common.SelectLoadingTemperature slider_set_temp_min: 150 slider_set_temp_max: 300 slider_set_temp_step: 5 @@ -120,7 +120,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER7] image: wizards/change_material/change_material04.jpg -description: ChangeMaterialFiber.FiberFromSoplo +description: Wizards.ChangeMaterialFiber.FiberFromSoplo placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_material_filament.cfg b/stereotech_config/wizards/change_material_filament.cfg index 5fca1eb867a6..9603b6d46aba 100644 --- a/stereotech_config/wizards/change_material_filament.cfg +++ b/stereotech_config/wizards/change_material_filament.cfg @@ -7,7 +7,7 @@ variable_action: 'all' [wizard_step CHANGE_MATERIAL_FILAMENT0] image: wizards/change_material/change_material.jpg -description: This wizard will help you to change insert or remove the material +description: Wizards.ChangeMaterialFilament.ChangeMaterialFilamentDescription warning: Missing extruder action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 @@ -23,7 +23,7 @@ cancel_gcode: [wizard_step_selector CHANGE_MATERIAL_FILAMENT1] image: wizards/change_material/change_material01.jpg -description: Select the extruder where you want change the material +description: Wizards.ChangeMaterialFilament.SelectExtruder items: extruder, extruder1 action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -36,7 +36,7 @@ select_gcode: [wizard_step_selector CHANGE_MATERIAL_FILAMENT2] image: wizards/change_material/change_material02.jpg -description: Select the needed action +description: Wizards.Common.SelectNeededAction items: insert, eject, all action_gcode: {% set action = wizard.variables.action %} @@ -52,7 +52,7 @@ select_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT3] image: wizards/change_material/change_material02.jpg -description: ChangeMaterialFilament.UnloadedMaterialSelect +description: Wizards.ChangeMaterialFilament.UnloadedMaterialSelect tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -69,7 +69,7 @@ cancel_gcode: [wizard_step_slider CHANGE_MATERIAL_FILAMENT4] image: wizards/change_material/change_material02.jpg -description: Select unloading temperature +description: Wizards.Common.SelectUnloadingTemperature slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -83,7 +83,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FILAMENT5] image: wizards/change_material/change_material03.jpg -description: Click Unload button and wait for material unloading and remove the spool If it is needed you could press Unload button to repeat unloading +description: Wizards.ChangeMaterialFilament.UnloadMaterial placeholder: wizard-step-preheat action_gcode: {% set action = wizard.variables.action %} @@ -101,7 +101,7 @@ button_load_gcode: [wizard_step_tree CHANGE_MATERIAL_FILAMENT6] image: wizards/change_material/change_material02.jpg -description: ChangeMaterialFilament.LoadedMaterialSelect +description: Wizards.ChangeMaterialFilament.LoadedMaterialSelect tree_file_path: wizards/data/materials.json depth: 3 types: manufacturer, series, name @@ -118,7 +118,7 @@ cancel_gcode: [wizard_step_slider CHANGE_MATERIAL_FILAMENT7] image: wizards/change_material/change_material02.jpg -description: Select loading temperature +description: Wizards.Common.SelectLoadingTemperature slider_slider1_min: 150 slider_slider1_max: 300 slider_slider1_step: 5 @@ -132,7 +132,7 @@ cancel_gcode: [wizard_step CHANGE_MATERIAL_FILAMENT8] image: wizards/change_material/change_material.jpg -description: Load new spool insert material into bowden tube and press Next button +description: Wizards.ChangeMaterialFilament.LoadNewSpool placeholder: wizard-step-preheat action_gcode: {% set selected_e = wizard.variables.selected_e %} @@ -143,7 +143,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FILAMENT9] image: wizards/change_material/change_material04.jpg -description: Press Load and gently feed the filament into the Teflon tube by hand Feed the filament by hand until you feel the extruder pull on the filament by itself Press Load until you see material coming out of the nozzle +description: Wizards.ChangeMaterialFilament.PressLoad placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP=CHANGE_MATERIAL_FILAMENT11 @@ -159,7 +159,7 @@ button_insert_gcode: # FOR FIBER [wizard_step_button CHANGE_MATERIAL_FILAMENT10] image: wizards/change_material/change_material04.jpg -description: Wait for heatup and Load fiber and try to cut it by pressing Cut Fiber Fot better results repeat this procedure up to 3 times +description: Wizards.ChangeMaterialFilament.PressLoadFiber placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/change_module.cfg b/stereotech_config/wizards/change_module.cfg index 2c7c22193071..ce5db05145d4 100644 --- a/stereotech_config/wizards/change_module.cfg +++ b/stereotech_config/wizards/change_module.cfg @@ -5,7 +5,7 @@ steps: CHANGE_MODULE0, CHANGE_MODULE1, CHANGE_MODULE2 [wizard_step CHANGE_MODULE0] image: wizards/change_module/change_module.jpg -description: ChangeModule.ChangeModuleFirstStep +description: Wizards.ChangeModule.ChangeModuleFirstStep action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 SET_WIZARD_STEP WIZARD=CHANGE_MODULE STEP={wizard.next_step} @@ -14,8 +14,8 @@ cancel_gcode: [wizard_step_button CHANGE_MODULE1] image: wizards/change_module/change_module1.jpg -description: Then you could change module according to the manual -warning: Calibration required after module change +description: Wizards.ChangeModule.PowerOffAndDisconnect +warning: Wizards.ChangeModule.CalibrationAfterModuleChange action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -25,7 +25,7 @@ button_power_off_gcode: [wizard_step CHANGE_MODULE2] image: wizards/change_module/change_module.jpg -description: Change Module complete +description: Wizards.ChangeModule.ChangeModuleComplete action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg b/stereotech_config/wizards/cmd_debug/nozzles_height_align_5d_cmd.cfg similarity index 100% rename from stereotech_config/wizards/cmd_debug/align_nozzles_cmd.cfg rename to stereotech_config/wizards/cmd_debug/nozzles_height_align_5d_cmd.cfg diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 86fbfb3e890c..87930834ce3a 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -79,7 +79,7 @@ gcode: {% endif %} [wizard_step CLEAR_NOZZLE0] -description: ClearNozzle.WaitHeating +description: Wizards.ClearNozzle.WaitHeating placeholder: wizard-step-preheat action_gcode: RETRACT_MATERIAL @@ -88,7 +88,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step CLEAR_NOZZLE1] -description: ClearNozzle.NozzleClear +description: Wizards.ClearNozzle.NozzleClear action_gcode: MOVE_SERVICE_POSITION SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -112,7 +112,7 @@ gcode: [wizard_step CHANGE_MATERIAL_COMPLETED] image: wizards/change_material/change_material.jpg -description: Material change completed +description: Wizards.ChangeMaterialFilament.MaterialChangeCompleted action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -120,7 +120,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_COMPLETED] image: wizards/nozzle_offset/wait_for_print.jpg -description: NozzleOffset.Completed +description: Wizards.NozzleOffset.Completed action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -128,7 +128,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_MANUAL_COMPLETED] image: wizards/zero_point_setup/zero_point_setup.jpg -description: Adjust basement completed +description: Wizards.Common.AdjustBasementCompleted action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: @@ -136,7 +136,7 @@ cancel_gcode: [wizard_step CALIBRATE_5D_MANUAL_COMPLETED] image: wizards/5d_calibration_auto/auto_five_axis_level_06.jpg -description: Five Axis Calibration complete +description: Wizards.Common.5DCalibrationComplete action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg index 9170c84f64da..e697ad2b3b8a 100644 --- a/stereotech_config/wizards/nozzle_offset_5d.cfg +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -5,7 +5,7 @@ steps: NOZZLE_OFFSET_5D0, CLEAR_NOZZLE0, CLEAR_NOZZLE1, NOZZLE_OFFSET_5D1, NOZZL [wizard_step_button NOZZLE_OFFSET_5D0] description: NozzleOffset5D.Description -warning: NozzleOffset5D.MakeSureFreeOfPlastic +warning: Wizards.Common.MakeSureFreeOfPlastic action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -19,8 +19,8 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -description: Place the calibration tool into the five axis module and press Next -warning: NozzleOffset5D.GapBetweenTemplateModule +description: Wizards.Common.PlaceTool +warning: Wizards.Common.GapBetweenTemplateModule action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -28,8 +28,8 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D2] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: Connect probe and press Next -warning: NozzleOffset5D.WarningScrew +description: Wizards.Common.ConnectSensor +warning: Wizards.Common.WarningScrew action_gcode: CHANGE_STEP_AND_WAIT_PROBE WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -37,7 +37,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D3] image: wizards/5d_calibration_auto/auto_five_axis_level_04.jpg -description: NozzleOffset5D.ConnectAndCheck +description: Wizards.Common.ConnectAndCheck placeholder: wizard-step-probe action_gcode: ADJUST_NOZZLE_OFFSET_Z @@ -47,7 +47,7 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_5D4] image: wizards/nozzle_offset/chup_3d.jpg -description: NozzleOffset5D.MoveToSurface +description: Wizards.NozzleOffset5D.MoveToSurface axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -62,7 +62,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_5D5] image: wizards/5d_calibration_auto/auto_five_axis_level_03.jpg -description: NozzleOffset5D.Finish +description: Wizards.NozzleOffset5D.Finish action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index fc69b3f54710..9dc2d0632a0e 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -5,8 +5,8 @@ steps: NOZZLE_OFFSET_FIBER0, NOZZLE_OFFSET_FIBER1, NOZZLE_OFFSET_FIBER2, NOZZLE_ [wizard_step_button NOZZLE_OFFSET_FIBER0] image: wizards/nozzle_offset/wait_for_print.jpg -description: NozzleOffset.Description -warning: NozzleOffset.Prerequisites +description: Wizards.NozzleOffset.Description +warning: Wizards.NozzleOffset.Prerequisites action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -21,7 +21,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_FIBER1] image: wizards/nozzle_offset/chup_3d.jpg -description: NozzleOffset.GapBetweenNozzleAndGlass +description: Wizards.Common.GapBetweenTemplateModule action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -30,7 +30,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_FIBER2] image: wizards/nozzle_offset/select_temp.jpg -description: NozzleOffset.SetTemperatures +description: Wizards.NozzleOffset.SetTemperatures slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -55,7 +55,7 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_FIBER3] image: wizards/nozzle_offset/wait_for_print.jpg -description: NozzleOffset.WaitForPrint +description: Wizards.NozzleOffset.WaitForPrint countdown: 1140 placeholder: wizard-step-preheat axes: z @@ -69,7 +69,7 @@ cancel_gcode: RESET_WIZARD WIZARD={wizard.name} [wizard_step_nozzle_offset NOZZLE_OFFSET_FIBER4] -description: NozzleOffset.NozzleOffsetDescription +description: Wizards.NozzleOffset.NozzleOffsetDescription steps: 15 default_step: 8 step_value: 0.1 diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index 9d37f049ea8a..f811498351e1 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -5,8 +5,8 @@ steps: NOZZLE_OFFSET_HYBRID0, NOZZLE_OFFSET_HYBRID1, NOZZLE_OFFSET_HYBRID2, NOZZ [wizard_step_button NOZZLE_OFFSET_HYBRID0] image: wizards/nozzle_offset/wait_for_print.jpg -description: NozzleOffset.Description -warning: NozzleOffset.Prerequisites +description: Wizards.NozzleOffset.Description +warning: Wizards.NozzleOffset.Prerequisites action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -20,7 +20,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_HYBRID1] image: wizards/nozzle_offset/release_nozzle.jpg -description: NozzleOffset.ReleaseNozzle +description: Wizards.Common.ReleaseNozzle action_gcode: G0 Z0 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -29,7 +29,7 @@ cancel_gcode: [wizard_step NOZZLE_OFFSET_HYBRID2] image: wizards/nozzle_offset/adjust_nozzle.jpg -description: NozzleOffset.TightNozzle +description: Wizards.NozzleOffset.TightNozzle action_gcode: G0 Z30 F600 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -38,7 +38,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID3] image: wizards/nozzle_offset/select_temp.jpg -description: NozzleOffset.SetTemperatures +description: Wizards.NozzleOffset.SetTemperatures slider_set_temp_main_e_min: 150 slider_set_temp_main_e_max: 290 slider_set_temp_main_e_step: 5 @@ -63,7 +63,7 @@ cancel_gcode: [wizard_step_jog NOZZLE_OFFSET_HYBRID4] image: wizards/nozzle_offset/wait_for_print.jpg -description: NozzleOffset.WaitForPrint +description: Wizards.NozzleOffset.WaitForPrint countdown: 540 placeholder: wizard-step-preheat axes: z @@ -78,7 +78,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID5] image: wizards/nozzle_offset/grid_vertical.jpg -description: NozzleOffset.AdjustVertical +description: Wizards.NozzleOffset.AdjustVertical slider_y_offset_min: 1 slider_y_offset_max: 15 slider_y_offset_step: 1 @@ -92,7 +92,7 @@ cancel_gcode: [wizard_step_slider NOZZLE_OFFSET_HYBRID6] image: wizards/nozzle_offset/grid_horizontal.jpg -description: NozzleOffset.AdjustHorizontal +description: Wizards.NozzleOffset.AdjustHorizontal slider_x_offset_min: 1 slider_x_offset_max: 15 slider_x_offset_step: 1 diff --git a/stereotech_config/wizards/align_nozzles.cfg b/stereotech_config/wizards/nozzles_height_align_5d.cfg similarity index 89% rename from stereotech_config/wizards/align_nozzles.cfg rename to stereotech_config/wizards/nozzles_height_align_5d.cfg index 9abc9a42e2da..395b630ec84a 100644 --- a/stereotech_config/wizards/align_nozzles.cfg +++ b/stereotech_config/wizards/nozzles_height_align_5d.cfg @@ -5,8 +5,8 @@ steps: ALIGN_NOZZLES0, ALIGN_NOZZLES1, ALIGN_NOZZLES2, ALIGN_NOZZLES3, ALIGN_NOZ [wizard_step_button ALIGN_NOZZLES0] image: wizards/nozzle_offset/wait_for_print.jpg -description: AlignNozzles.Description -warning: AlignNozzles.Prerequisites +description: Wizards.AlignHeightNozzles5D.Description +warning: Wizards.AlignHeightNozzles5D.Prerequisites action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 MOVE_SERVICE_POSITION @@ -40,7 +40,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES1] image: wizards/5d_calibration_auto/auto_five_axis_level_02.jpg -description: Place the calibration tool into the five axis module and press Next +description: Wizards.Common.PlaceTool action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: @@ -48,7 +48,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES2] image: wizards/nozzle_offset/release_nozzle.jpg -description: AlignNozzles.ReleaseNozzle +description: Wizards.Common.ReleaseNozzle action_gcode: {% if printer["gcode_button five_axis_module"].state == "RELEASED" %} # 3d @@ -65,7 +65,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES3] image: wizards/nozzle_offset/adjust_nozzle.jpg -description: AlignNozzles.TightNozzle +description: AlignHeightNozzles5D.TightNozzle action_gcode: G91 G0 Z30 F600 @@ -76,7 +76,7 @@ cancel_gcode: [wizard_step ALIGN_NOZZLES4] image: wizards/nozzle_offset/wait_for_print.jpg -description: AlignNozzles.Completed +description: AlignHeightNozzles5D.Completed action_gcode: RESET_WIZARD WIZARD={wizard.name} ABORT=0 cancel_gcode: diff --git a/stereotech_config/wizards/zero_point_calibration.cfg b/stereotech_config/wizards/zero_point_calibration.cfg index 9c8c0835662e..9ea3c7b61d25 100644 --- a/stereotech_config/wizards/zero_point_calibration.cfg +++ b/stereotech_config/wizards/zero_point_calibration.cfg @@ -5,7 +5,7 @@ steps: ZERO_POINT_CALIBRATE0, ZERO_POINT_CALIBRATE1, ZERO_POINT_CALIBRATE2, ZERO [wizard_step ZERO_POINT_CALIBRATE0] image: wizards/zero_point_setup/zero_point_setup05.jpg -description: This wizard helps you to setup zero point for proper 5D printing +description: Wizards.Common.ZeroPointDescription action_gcode: SET_WIZARD_ENABLE WIZARD={wizard.name} ENABLE=1 ERROR='' MOVE_SERVICE_POSITION @@ -15,7 +15,7 @@ cancel_gcode: [wizard_step ZERO_POINT_CALIBRATE1] image: wizards/5d_calibration_manual/5d_calibration1.jpg -description: Place the calibration tool into the five axis module and press Next +description: Wizards.Common.PlaceTool action_gcode: MOVE_WCS_ZERO WCS=1 SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} @@ -24,7 +24,7 @@ cancel_gcode: [wizard_step_jog ZERO_POINT_CALIBRATE2] image: wizards/5d_calibration_manual/5d_calibration2.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -39,7 +39,7 @@ cancel_gcode: [wizard_step_jog ZERO_POINT_CALIBRATE3] image: wizards/5d_calibration_manual/5d_calibration2.jpg -description: Move nozzle to the nearest tip of the calibration tool and press Next +description: Wizards.Common.MoveNozzle axes: x, y, z steps: 0.05, 0.1, 1, 10 default_step: 1 @@ -52,7 +52,7 @@ cancel_gcode: [wizard_step_slider ZERO_POINT_CALIBRATE4] image: wizards/zero_point_setup/zero_point_setup03.jpg -description: Check the diameter of the calibration tool and press Next +description: Wizards.AdjustBasementManual.SetBasementDiameter slider_set_diameter_min: 0.1 slider_set_diameter_max: 3 slider_set_diameter_step: 0.1 From 517125034926fd3c24b5aade111976c79573275e Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Mon, 12 Feb 2024 13:46:30 +0000 Subject: [PATCH 60/65] STEAPP-872: deleted the debug rows --- klippy/extras/wizard/wizard_step.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/klippy/extras/wizard/wizard_step.py b/klippy/extras/wizard/wizard_step.py index 4e462f325d9c..78d93f181e3b 100644 --- a/klippy/extras/wizard/wizard_step.py +++ b/klippy/extras/wizard/wizard_step.py @@ -67,10 +67,8 @@ def cmd(self, gcmd, gcode): self.in_script = True try: if gcode == 'action_gcode': - gcmd.respond_info("-------------------action_gcode %s" % (self.name,)) self.template_action.run_gcode_from_command(kwparams) elif gcode == 'cancel_gcode': - gcmd.respond_info("-------------------cancel_gcode %s" % (self.name,)) self.template_cancel.run_gcode_from_command(kwparams) finally: self.in_script = False From 300bab2131da10d8c2eff66074dd7ab251889a70 Mon Sep 17 00:00:00 2001 From: Sokolov Evgenii <81033310+SokolovJek@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:36:09 +0300 Subject: [PATCH 61/65] STEAPP-872: fixed bug, type the option is str --- klippy/extras/wizard/wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klippy/extras/wizard/wizard.py b/klippy/extras/wizard/wizard.py index af5ca01b1ba3..ef729cc00b1d 100644 --- a/klippy/extras/wizard/wizard.py +++ b/klippy/extras/wizard/wizard.py @@ -26,7 +26,7 @@ def __init__(self, config): option, config.get_name(), e)) # get options from config self.image = config.get('image', '') - self.type = config.getlists('type', 'any') + self.type = config.get('type', 'any') self.steps = config.getlists('steps', []) self.current_step = self.steps[0] self.next_step = self.steps[1] if len(self.steps) > 2 else self.steps[0] From 5ef5895f8fcf983a4b0ebf416ad7b8f5c9bf88af Mon Sep 17 00:00:00 2001 From: sokolovjek Date: Tue, 13 Feb 2024 06:24:06 +0000 Subject: [PATCH 62/65] STEAPP-872: deleted unneeded rows --- stereotech_config/wizards/5d_calibration.cfg | 5 ++--- stereotech_config/wizards/adjust_basement.cfg | 5 ++--- stereotech_config/wizards/bed_level.cfg | 5 ++--- stereotech_config/wizards/change_material.cfg | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/stereotech_config/wizards/5d_calibration.cfg b/stereotech_config/wizards/5d_calibration.cfg index 370456a58843..793d53249f7d 100644 --- a/stereotech_config/wizards/5d_calibration.cfg +++ b/stereotech_config/wizards/5d_calibration.cfg @@ -7,7 +7,6 @@ steps: CALIBRATE_5D_0 description: Choose the required manager wizards: CALIBRATE_5D_AUTO, CALIBRATE_5D_MANUAL action_gcode: - MOVE_SERVICE_POSITION - RESET_WIZARD WIZARD={wizard.name} HOME=0 + # pass cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} + # pass \ No newline at end of file diff --git a/stereotech_config/wizards/adjust_basement.cfg b/stereotech_config/wizards/adjust_basement.cfg index 8403fd140095..ff7feda4b256 100644 --- a/stereotech_config/wizards/adjust_basement.cfg +++ b/stereotech_config/wizards/adjust_basement.cfg @@ -7,7 +7,6 @@ steps: ADJUST_BASEMENT0 description: AdjustManadger.ManagersChoiceDescription wizards: ADJUST_BASEMENT_AUTO, ADJUST_BASEMENT_MANUAL action_gcode: - MOVE_SERVICE_POSITION - RESET_WIZARD WIZARD={wizard.name} HOME=0 + # pass cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} + # pass diff --git a/stereotech_config/wizards/bed_level.cfg b/stereotech_config/wizards/bed_level.cfg index 3a8c178956c8..520095325c54 100644 --- a/stereotech_config/wizards/bed_level.cfg +++ b/stereotech_config/wizards/bed_level.cfg @@ -7,7 +7,6 @@ steps: BED_LEVEL0 description: ChangeMaterialFilament.ManagersChoiceDescription wizards: BED_LEVEL_AUTO, BED_LEVEL_MANUAL action_gcode: - MOVE_SERVICE_POSITION - RESET_WIZARD WIZARD={wizard.name} HOME=0 + # pass cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} + # pass diff --git a/stereotech_config/wizards/change_material.cfg b/stereotech_config/wizards/change_material.cfg index 802497ab18a3..6c7d168bedab 100644 --- a/stereotech_config/wizards/change_material.cfg +++ b/stereotech_config/wizards/change_material.cfg @@ -7,6 +7,6 @@ steps: CHANGE_MATERIAL0 description: ChangeMaterialFilament.ManagersChoiceDescription wizards: CHANGE_MATERIAL_FILAMENT, CHANGE_MATERIAL_FIBER action_gcode: - MOVE_SERVICE_POSITION + # pass cancel_gcode: - RESET_WIZARD WIZARD={wizard.name} + # pass From 08e3807f325d50387f95738f505fe954e2258a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Tue, 13 Feb 2024 09:52:42 +0300 Subject: [PATCH 63/65] STEAPP-872: edited description --- stereotech_config/wizards/change_material_fiber.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stereotech_config/wizards/change_material_fiber.cfg b/stereotech_config/wizards/change_material_fiber.cfg index cb3555f28af1..f5e0affad975 100644 --- a/stereotech_config/wizards/change_material_fiber.cfg +++ b/stereotech_config/wizards/change_material_fiber.cfg @@ -120,7 +120,7 @@ cancel_gcode: [wizard_step_button CHANGE_MATERIAL_FIBER7] image: wizards/change_material/change_material04.jpg -description: Wizards.ChangeMaterialFiber.FiberFromSoplo +description: Wizards.ChangeMaterialFiber.FiberFromNozzle placeholder: wizard-step-preheat action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} From b7efa6fe37f3626725e984f07dd2cfb4e0a2d849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Tue, 13 Feb 2024 09:54:38 +0300 Subject: [PATCH 64/65] STEAPP-872: edited description --- stereotech_config/wizards/adjust_basement_auto.cfg | 2 +- stereotech_config/wizards/adjust_basement_manual.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stereotech_config/wizards/adjust_basement_auto.cfg b/stereotech_config/wizards/adjust_basement_auto.cfg index 04b9aeef5876..5ef80e7fe2b5 100644 --- a/stereotech_config/wizards/adjust_basement_auto.cfg +++ b/stereotech_config/wizards/adjust_basement_auto.cfg @@ -16,7 +16,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_AUTO1] image: wizards/zero_point_setup/zero_point_setup04.jpg -description: Wizards.Common.PleaseTool +description: Wizards.Common.InstallTool warning: Wizards.AdjustBasementAuto.MakeSureBaseProtrudes action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/adjust_basement_manual.cfg b/stereotech_config/wizards/adjust_basement_manual.cfg index 438eebcbbd0d..19ea34346c01 100644 --- a/stereotech_config/wizards/adjust_basement_manual.cfg +++ b/stereotech_config/wizards/adjust_basement_manual.cfg @@ -35,7 +35,7 @@ cancel_gcode: [wizard_step ADJUST_BASEMENT_MANUAL2] image: wizards/zero_point_setup/zero_point_setup04.jpg -description: Wizards.Common.PleaseTool +description: Wizards.Common.InstallTool action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: From 1dcff52f2ff0f89a1de802d54e8ac77ce604afd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20=D0=95=D0=B2?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Tue, 13 Feb 2024 10:48:15 +0300 Subject: [PATCH 65/65] STEAPP-872: renamed params and added condition for moved with adjust_offset --- stereotech_config/wizards/bed_level_manual.cfg | 2 +- stereotech_config/wizards/common.cfg | 8 +++++--- stereotech_config/wizards/nozzle_offset_5d.cfg | 2 +- stereotech_config/wizards/nozzle_offset_fiber.cfg | 2 +- stereotech_config/wizards/nozzle_offset_hybrid.cfg | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg index 8d8196d0068a..a7731d991438 100644 --- a/stereotech_config/wizards/bed_level_manual.cfg +++ b/stereotech_config/wizards/bed_level_manual.cfg @@ -35,7 +35,7 @@ axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 jog_gcode: - JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d' + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='manual_probe' action_gcode: ACCEPT_Z_ENDSTOP SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg index 87930834ce3a..7fe8c8570057 100644 --- a/stereotech_config/wizards/common.cfg +++ b/stereotech_config/wizards/common.cfg @@ -101,13 +101,15 @@ gcode: {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %} {% set step_name = params.STEP_NAME %} {% set val = printer["wizard_step_jog " ~ step_name].step %} - {% set mode = params.MODE|default('5d') %} - {% if mode == '5d' %} + {% set mode = params.MODE|default('relative') %} + {% if mode == 'relative' %} G91 G1 {axis ~ direction ~ val} F1500 G90 - {% elif mode == '3d' %} + {% elif mode == 'manual_probe' %} TESTZ Z={direction ~ val} + {% elif mode == 'nozzle_offset' %} + SET_GCODE_OFFSET {axis}_ADJUST={direction ~ val} MOVE=1 {% endif %} [wizard_step CHANGE_MATERIAL_COMPLETED] diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg index e697ad2b3b8a..25b13d39168b 100644 --- a/stereotech_config/wizards/nozzle_offset_5d.cfg +++ b/stereotech_config/wizards/nozzle_offset_5d.cfg @@ -52,7 +52,7 @@ axes: z steps: 0.05, 0.1, 1, 10 default_step: 1 jog_gcode: - JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='5d' + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} action_gcode: ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1 SET_WCS_FROM_AUTO_WCS diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg index 9dc2d0632a0e..3fe0219f2025 100644 --- a/stereotech_config/wizards/nozzle_offset_fiber.cfg +++ b/stereotech_config/wizards/nozzle_offset_fiber.cfg @@ -62,7 +62,7 @@ axes: z steps: 0.05, 0.1, 1 default_step: 0.1 jog_gcode: - JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE=nozzle_offset action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg index f811498351e1..37e8551b0f3a 100644 --- a/stereotech_config/wizards/nozzle_offset_hybrid.cfg +++ b/stereotech_config/wizards/nozzle_offset_hybrid.cfg @@ -70,7 +70,7 @@ axes: z steps: 0.05, 0.1, 1 default_step: 0.1 jog_gcode: - JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} + JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE=nozzle_offset action_gcode: SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step} cancel_gcode: