Merge branch 'personal'

This commit is contained in:
Bassam Husain
2023-02-04 18:24:14 -05:00
3 changed files with 41 additions and 39 deletions

View File

@@ -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
# [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

View File

@@ -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

View File

@@ -93,10 +93,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
@@ -107,7 +108,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
@@ -174,7 +175,7 @@ click_pin: ^!PB2
# NOTE this is the pin for the filament switch. Uncomment next 2 lines if you're using 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.