diff --git a/macros/main.cfg b/macros/main.cfg index cd990ce..3d07db8 100644 --- a/macros/main.cfg +++ b/macros/main.cfg @@ -227,17 +227,23 @@ gcode: #LCDRGB R=0 G=1 B=0 ; Turn LCD green PAUSE ; Pause -[gcode_macro M106] -rename_existing: M99106 -variable_fan_aliases: { 'exhaust_fan': ['fan3'] } -gcode: - {% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %} - {% set speed = (params.S|float / 255 if params.S is defined else 1.0) %} - {% for key in fan_aliases %} - {% if fan in fan_aliases[key] %} - SET_FAN_SPEED FAN={key} SPEED={speed} - {% endif %} - {% endfor %} +#[gcode_macro M106] +#rename_existing: M99106 +#variable_fan_aliases: { 'exhaust_fan': ['fan3'] } +#gcode: + #{% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %} + #{% set speed = (params.S|float / 255 if params.S is defined else 1.0) %} + #{ action_respond_info("M106 P{} S{}".format(params.P, params.S)) } + #{% if params.P is defined %} + #{% for key in fan_aliases %} + #{% if fan in fan_aliases[key] %} + #SET_FAN_SPEED FAN={key} SPEED={speed} + #{% endif %} + #{% endfor %} + #{% else %} + #M99106 S{speed} + #{% endif %} + [gcode_macro PAUSE] rename_existing: BASE_PAUSE diff --git a/toolhead_sb.cfg b/toolhead_sb.cfg index 572406d..142439e 100644 --- a/toolhead_sb.cfg +++ b/toolhead_sb.cfg @@ -34,10 +34,15 @@ accel_per_hz: 125 hz_per_sec: 1 [input_shaper] -shaper_type_x: mzv -shaper_freq_x: 51 -shaper_type_y: mzv -shaper_freq_y: 41.6 +#shaper_type_x: mzv +#shaper_freq_x: 51 +#shaper_type_y: mzv +#shaper_freq_y: 41.6 +#max 4000 +shaper_type_x: 2hump_ei +shaper_freq_x: 74.800 +shaper_type_y: mzv +shaper_freq_y: 40.200 [temperature_sensor SB2209] sensor_type: temperature_mcu