From c1e5a770d5a041639c7759e8933f5ccca2ef163f Mon Sep 17 00:00:00 2001 From: Konstantin Koslowski Date: Sun, 26 Nov 2023 14:26:11 +0100 Subject: [PATCH] printer: update --- input_shaper.cfg | 15 -------- macros/print.cfg | 19 +++------- moonraker.conf | 6 ++-- printer.cfg | 90 +++++++++++++++++++++++++--------------------- resonance_test.cfg | 33 +++-------------- 5 files changed, 63 insertions(+), 100 deletions(-) delete mode 100644 input_shaper.cfg diff --git a/input_shaper.cfg b/input_shaper.cfg deleted file mode 100644 index 5e00103..0000000 --- a/input_shaper.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[input_shaper] -# A type of the input shaper to use for both X and Y axes. Supported -# shapers are zv, mzv, zvd, ei, 2hump_ei, and 3hump_ei. The default -# is mzv input shaper. -# shaper_type: mzv -shaper_type_x: mzv -shaper_freq_x: 53.6 -shaper_type_y: mzv -shaper_freq_y: 41.0 -# Damping ratios of vibrations of X and Y axes used by input shapers -# to improve vibration suppression. Default value is 0.1 which is a -# good all-round value for most printers. In most circumstances this -# parameter requires no tuning and should not be changed. -damping_ratio_x: 0.1 -damping_ratio_y: 0.1 diff --git a/macros/print.cfg b/macros/print.cfg index 2b2b325..400c11b 100644 --- a/macros/print.cfg +++ b/macros/print.cfg @@ -2,8 +2,6 @@ # Macros used for printing # - BRUSHIE # - CANCEL_PRINT -# - EXCLUDE_OBJECT_END -# - EXCLUDE_OBJECT_START # - LOAD_FILAMENT # - UNLOAD_FILAMENT # - M600 @@ -54,16 +52,6 @@ gcode: _CANCEL_PRINT_BASE -[gcode_macro EXCLUDE_OBJECT_END] -description: fix unknown command -gcode: - - -[gcode_macro EXCLUDE_OBJECT_START] -description: fix unknown command -gcode: - - [gcode_macro LOAD_FILAMENT] gcode: T0 @@ -167,7 +155,7 @@ gcode: G28 BRUSHIE # QGL - {% if QGL %} + {% if QGL or not printer['quad_gantry_level'].applied %} M117 QGL M118 QGL QUAD_GANTRY_LEVEL @@ -189,6 +177,7 @@ gcode: G92 E0 # reset extruder G90 # use absolute coordinates + M104 S{EXTRUDER} # start extruder heating NOTIFY_BED BED={BED} M190 S{BED} # set and wait for actual bed temperature # final home z @@ -268,8 +257,8 @@ gcode: _RESUME_BASE {% endif %} {% else %} - M117 not paused - M118 not paused + M117 not paused + M118 not paused {% endif %} diff --git a/moonraker.conf b/moonraker.conf index 3329989..5688cf8 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -22,6 +22,7 @@ trusted_clients: ::1/128 [file_manager] +enable_object_processing: True [data_store] temperature_store_size: 600 @@ -48,7 +49,7 @@ path: ~/fluidd # repo: mainsail-crew/mainsail # path: ~/mainsail -# [update_manager klipper-mcu-update] +# [update_manager klipper] # type: git_repo # origin: https://github.com/Klipper3d/klipper.git # path: ~/klipper @@ -79,7 +80,7 @@ origin: https://github.com/EtteGit/EnragedRabbitProject.git # type: tplink_smartplug # address: 192.168.11.91 type: tasmota -address: 192.168.11.92 +address: pcu-eg-office-voronberry.nom # password: mypassword [timelapse] @@ -100,5 +101,6 @@ frame_path: /tmp/timelapse/ type: git_repo path: ~/crowsnest origin: https://github.com/mainsail-crew/crowsnest.git +primary_branch: legacy/v3 managed_services: crowsnest install_script: tools/install.sh diff --git a/printer.cfg b/printer.cfg index 527a22d..5a411f7 100644 --- a/printer.cfg +++ b/printer.cfg @@ -54,6 +54,8 @@ path: /home/pi/printer_data/gcodes [display_status] +[exclude_object] + ##################################################################### # includes ##################################################################### @@ -62,8 +64,7 @@ path: /home/pi/printer_data/gcodes [include macros/_init.cfg] [include neopixel.cfg] [include fans.cfg] -[include input_shaper.cfg] -# [include resonance_test.cfg] +[include resonance_test.cfg] [include ercf.cfg] @@ -283,31 +284,33 @@ sample_retract_dist: 3 samples_tolerance: 0.01 samples_tolerance_retries: 5 -activate_gcode: - {% set PROBE_TEMP = 200 %} - {% set MAX_TEMP = PROBE_TEMP + 5 %} - {% set ACTUAL_TEMP = printer.extruder.temperature %} - {% set TARGET_TEMP = printer.extruder.target %} - - {% if TARGET_TEMP > PROBE_TEMP %} - { action_respond_info('Extruder temperature target of %.1fC is too high, lowering to %.1fC' % (TARGET_TEMP, PROBE_TEMP)) } - M109 S{ PROBE_TEMP } - {% else %} - # Temperature target is already low enough, but nozzle may still be too hot. - {% if ACTUAL_TEMP > MAX_TEMP %} - { action_respond_info('Extruder temperature %.1fC is still too high, waiting until below %.1fC' % (ACTUAL_TEMP, MAX_TEMP)) } - TEMPERATURE_WAIT SENSOR=extruder MAXIMUM={ MAX_TEMP } - {% endif %} - {% endif %} +# activate_gcode: +# # impatient +# # {% set PROBE_TEMP = 200 %} +# {% set PROBE_TEMP = 250 %} +# {% set MAX_TEMP = PROBE_TEMP + 5 %} +# {% set ACTUAL_TEMP = printer.extruder.temperature %} +# {% set TARGET_TEMP = printer.extruder.target %} +# +# {% if TARGET_TEMP > PROBE_TEMP %} +# { action_respond_info('Extruder temperature target of %.1fC is too high, lowering to %.1fC' % (TARGET_TEMP, PROBE_TEMP)) } +# M109 S{ PROBE_TEMP } +# {% else %} +# # Temperature target is already low enough, but nozzle may still be too hot. +# {% if ACTUAL_TEMP > MAX_TEMP %} +# { action_respond_info('Extruder temperature %.1fC is still too high, waiting until below %.1fC' % (ACTUAL_TEMP, MAX_TEMP)) } +# TEMPERATURE_WAIT SENSOR=extruder MAXIMUM={ MAX_TEMP } +# {% endif %} +# {% endif %} [bed_mesh] speed: 500 horizontal_move_z: 10 # 40, 40 --> 40 + probe.x_offset, 40 + probe.y_offset -mesh_min: 40, 70 +mesh_min: 40, 40 # 260, 260 --> 260 + probe.x_offset, 260 + probe.y_offset -mesh_max: 260,290 +mesh_max: 260, 260 # fade_start: 1 # fade_end: 10 # fade_target: 0 @@ -321,7 +324,8 @@ algorithm: bicubic # probe_count: 7,7 # relative_reference_index: 24 probe_count: 9,9 -relative_reference_index: 40 +# relative_reference_index: 40 +zero_reference_position: 150.00, 150.00 [quad_gantry_level] speed: 500 @@ -349,28 +353,34 @@ max_adjust: 10 #*# #*# [extruder] #*# +#*# [probe] +#*# z_offset = -0.850 +#*# +#*# [input_shaper] +#*# shaper_type_x = 3hump_ei +#*# shaper_freq_x = 89.2 +#*# shaper_type_y = mzv +#*# shaper_freq_y = 30.6 +#*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.035000, -0.030000, -0.013750, -0.032500, -0.018750, -0.023750, -0.022500, -0.020000, -0.027500 -#*# -0.030000, -0.028750, -0.022500, -0.028750, -0.027500, -0.028750, -0.022500, -0.017500, -0.026250 -#*# -0.026250, -0.031250, -0.025000, -0.027500, -0.031250, -0.027500, -0.028750, -0.038750, -0.050000 -#*# -0.036250, -0.025000, -0.017500, -0.017500, -0.018750, -0.005000, 0.005000, 0.002500, -0.002500 -#*# -0.016250, -0.017500, -0.021250, -0.013750, 0.000000, -0.010000, -0.003750, -0.015000, -0.016250 -#*# -0.036250, -0.043750, -0.040000, -0.047500, -0.032500, -0.031250, -0.038750, -0.031250, -0.032500 -#*# -0.058750, -0.031250, -0.030000, -0.026250, -0.027500, -0.027500, -0.020000, -0.036250, -0.052500 -#*# -0.050000, -0.053750, -0.038750, -0.046250, -0.035000, -0.025000, -0.023750, -0.035000, -0.047500 -#*# -0.063750, -0.045000, -0.041250, -0.038750, -0.032500, -0.031250, -0.028750, -0.037500, -0.042500 +#*# -0.057500, -0.073750, -0.055000, -0.015000, -0.026250, -0.012500, -0.021250, -0.048750, -0.062500 +#*# -0.028750, -0.053750, -0.048750, -0.041250, -0.046250, -0.025000, -0.028750, -0.028750, -0.040000 +#*# -0.077500, -0.053750, -0.091250, -0.076250, -0.051250, -0.035000, -0.050000, -0.087500, -0.063750 +#*# -0.048750, -0.042500, -0.071250, -0.011250, -0.073750, -0.041250, -0.075000, -0.090000, -0.118750 +#*# -0.081250, -0.052500, -0.061250, -0.046250, 0.000000, -0.037500, -0.062500, -0.100000, -0.120000 +#*# -0.095000, -0.116250, -0.037500, -0.020000, -0.075000, -0.068750, -0.048750, -0.111250, -0.121250 +#*# -0.118750, -0.078750, -0.083750, -0.116250, -0.087500, -0.133750, -0.117500, -0.122500, -0.162500 +#*# -0.126250, -0.110000, -0.087500, -0.107500, -0.083750, -0.128750, -0.107500, -0.138750, -0.155000 +#*# -0.055000, -0.088750, -0.083750, -0.130000, -0.121250, -0.111250, -0.106250, -0.128750, -0.141250 +#*# x_count = 9 +#*# y_count = 9 +#*# mesh_x_pps = 2 +#*# mesh_y_pps = 2 +#*# algo = bicubic #*# tension = 0.2 #*# min_x = 40.0 -#*# algo = bicubic -#*# y_count = 9 -#*# mesh_y_pps = 2 -#*# min_y = 70.0 -#*# x_count = 9 -#*# max_y = 290.0 -#*# mesh_x_pps = 2 #*# max_x = 260.0 -#*# -#*# [probe] -#*# z_offset = -0.913 +#*# min_y = 40.0 +#*# max_y = 260.0 diff --git a/resonance_test.cfg b/resonance_test.cfg index da02f00..e4e8b5c 100644 --- a/resonance_test.cfg +++ b/resonance_test.cfg @@ -1,39 +1,16 @@ -[mcu nano] -serial: /dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0 - -# [mcu pico] -# serial: /dev/serial/by-id/usb-Klipper_rp2040_E660583883511936-if00 - -[board_pins arduino] -mcu: nano -aliases: - ar0=PD0, ar1=PD1, ar2=PD2, ar3=PD3, ar4=PD4, - ar5=PD5, ar6=PD6, ar7=PD7, ar8=PB0, ar9=PB1, - ar10=PB2, ar11=PB3, ar12=PB4, ar13=PB5, ar14=PC0, - ar15=PC1, ar16=PC2, ar17=PC3, ar18=PC4, ar19=PC5, - analog0=PC0, analog1=PC1, analog2=PC2, analog3=PC3, analog4=PC4, - analog5=PC5, analog6=PE2, analog7=PE3 - -## arduino nano +## EBB36 [adxl345] -cs_pin: nano:ar10 -spi_software_sclk_pin: nano:ar13 -spi_software_mosi_pin: nano:ar11 -spi_software_miso_pin: nano:ar12 +cs_pin: EBBCan:PB12 +spi_software_sclk_pin: EBBCan:PB10 +spi_software_mosi_pin: EBBCan:PB11 +spi_software_miso_pin: EBBCan:PB2 axes_map: x,y,z -# ## rpi pico -# [adxl345] -# cs_pin: pico:gpio1 -# spi_bus: spi0a -# axes_map: x,y,z - [resonance_tester] accel_chip: adxl345 probe_points: 150,150,20 # an example - [gcode_macro TR] gcode: {% if not "xyz" in printer.toolhead.homed_axes %}