From 59732ccb4913a00249dc85f383dbb305c84ecd34 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Sat, 4 Feb 2023 09:50:33 -0500 Subject: [PATCH 1/4] Adjusted z lift height in print_end. --- cfgs/macros.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cfgs/macros.cfg b/cfgs/macros.cfg index 401a5cf..89a9aa9 100644 --- a/cfgs/macros.cfg +++ b/cfgs/macros.cfg @@ -89,14 +89,15 @@ gcode: {% set y_safe = -20.0 %} {% endif %} - {% if printer.toolhead.position.z < (max_z - 2) %} - {% set z_safe = 2.0 %} + {% set lift_height = 25.0 %} + {% if printer.toolhead.position.z < (max_z - lift_height) %} + {% set z_safe = lift_height %} {% else %} {% set z_safe = max_z - printer.toolhead.position.z %} {% endif %} G0 Z{z_safe} F2000 ; move nozzle up - G0 X{x_safe} Y{y_safe} F7200 ; move nozzle to remove stringing + G0 X{x_safe} Y{y_safe} F9000 ; move nozzle to remove stringing TURN_OFF_HEATERS M107 ; turn off fan G90 ; absolute positioning From 752c47d30bd2a6489e780c7d5739cac00a611aee Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Sat, 4 Feb 2023 10:10:22 -0500 Subject: [PATCH 2/4] Cleanup in beeper.cfg. --- cfgs/beeper.cfg | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/cfgs/beeper.cfg b/cfgs/beeper.cfg index 374a14d..7904e88 100644 --- a/cfgs/beeper.cfg +++ b/cfgs/beeper.cfg @@ -5,17 +5,8 @@ shutdown_value: 0 pwm: True cycle_time: 0.0005 ; Default beeper tone in kHz. 1 / 0.0005 = 2000Hz (2kHz) -[gcode_macro M300] -gcode: - {% set S = params.S|default(1000)|int %} - {% set P = params.P|default(100)|int %} - - SET_PIN PIN=beeper VALUE=0.5 CYCLE_TIME={ 1.0/S if S > 0 else 1 } - G4 P{P} - SET_PIN PIN=beeper VALUE=0 - [gcode_macro BEEP] -description: "BEEP I=3 DUR=200 FREQ=2000: Beep 3 times, for 200ms each, at 2kHz frequency." +description: BEEP I=3 DUR=200 FREQ=2000: Beep 3 times, for 200ms each, at 2kHz frequency. gcode: # Parameters {% set i = params.I|default(1)|int %} ; Iterations (number of times to beep). @@ -29,26 +20,35 @@ gcode: G4 P{dur} {% endfor %} -[gcode_macro SONG_SINGLE_BEEP] -gcode: - M300 S830.61 P137 +# [gcode_macro M300] +# gcode: +# {% set S = params.S|default(1000)|int %} +# {% set P = params.P|default(100)|int %} -[gcode_macro TOGGLE_BEEPER] -description: Toggle the printer beeper on and off. -gcode: - {% set beeper_state = printer.save_variables.variables.beeper_state|lower %} +# SET_PIN PIN=beeper VALUE=0.5 CYCLE_TIME={ 1.0/S if S > 0 else 1 } +# G4 P{P} +# SET_PIN PIN=beeper VALUE=0 - {% if printer['gcode_macro _USER_VARIABLE'].debug == 1 %} - {action_respond_info('==== TOGGLE_BEEPER ====')} - {action_respond_info("beeper_state: %s" % (beeper_state))} - {action_respond_info('===============')} - {% endif %} +# [gcode_macro SONG_SINGLE_BEEP] +# gcode: +# M300 S830.61 P137 - {% if beeper_state == "off" %} - {action_respond_info('beeper is off, turning it on')} - SAVE_VARIABLE VARIABLE=beeper_state VALUE='"on"' - {% else %} - {action_respond_info('beeper is on= turning it off')} - SAVE_VARIABLE VARIABLE=beeper_state VALUE='"off"' - {% endif %} - SONG_SINGLE_BEEP \ No newline at end of file +# [gcode_macro TOGGLE_BEEPER] +# description: Toggle the printer beeper on and off. +# gcode: +# {% set beeper_state = printer.save_variables.variables.beeper_state|lower %} + +# {% if printer['gcode_macro _USER_VARIABLE'].debug == 1 %} +# {action_respond_info('==== TOGGLE_BEEPER ====')} +# {action_respond_info("beeper_state: %s" % (beeper_state))} +# {action_respond_info('===============')} +# {% endif %} + +# {% if beeper_state == "off" %} +# {action_respond_info('beeper is off, turning it on')} +# SAVE_VARIABLE VARIABLE=beeper_state VALUE='"on"' +# {% else %} +# {action_respond_info('beeper is on= turning it off')} +# SAVE_VARIABLE VARIABLE=beeper_state VALUE='"off"' +# {% endif %} +# SONG_SINGLE_BEEP \ No newline at end of file From f0078be5d21abde821871b7c7a7773baeb01647b Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Sat, 4 Feb 2023 14:14:20 -0500 Subject: [PATCH 3/4] Changed extruder sensory_type. --- printer.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printer.cfg b/printer.cfg index 4d1a12d..3377b0b 100644 --- a/printer.cfg +++ b/printer.cfg @@ -112,7 +112,7 @@ rotation_distance: 4.65 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: PA1 -sensor_type: sovol_thermistor +sensor_type: EPCOS 100K B57560G104F sensor_pin: PC5 min_temp: 0 max_temp: 300 @@ -186,7 +186,7 @@ shaper_type_y: 3hump_ei # // NOTE this is the pin for the filament switch, if you have one # [filament_switch_sensor fil_sensor] -# switch_pin: PA4 +# switch_pin: PA4 # "Pulled-high" # NOTE Cancel objects feature is enabled. If you're using a low powered device, comment out [exclude_object]. # Also see [file_manager] section in moonraker.conf. From 320df8cd97f393cf8a8021c1a487ce03e8df848d Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Sat, 4 Feb 2023 15:15:09 -0500 Subject: [PATCH 4/4] Commented out sovol_thermistor. --- printer.cfg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/printer.cfg b/printer.cfg index 3377b0b..4fc5177 100644 --- a/printer.cfg +++ b/printer.cfg @@ -98,10 +98,11 @@ sense_resistor: 0.150 uart_address: 3 diag_pin: PA7 -[thermistor sovol_thermistor] -temperature1: 25 -resistance1: 94162 -beta: 4160 +# DELETEME +# [thermistor sovol_thermistor] +# temperature1: 25 +# resistance1: 94162 +# beta: 4160 [extruder] step_pin: PB4