diff --git a/KAMP b/KAMP new file mode 120000 index 0000000..f50f3a0 --- /dev/null +++ b/KAMP @@ -0,0 +1 @@ +/home/biqu/Klipper-Adaptive-Meshing-Purging/Configuration \ No newline at end of file diff --git a/KAMP_Settings.cfg b/KAMP_Settings.cfg new file mode 100644 index 0000000..1466c90 --- /dev/null +++ b/KAMP_Settings.cfg @@ -0,0 +1,36 @@ +# Below you can include specific configuration files depending on what you want KAMP to do: + +[include ./KAMP/Adaptive_Meshing.cfg] # Include to enable adaptive meshing configuration. +[include ./KAMP/Line_Purge.cfg] # Include to enable adaptive line purging configuration. +[include ./KAMP/Voron_Purge.cfg] # Include to enable adaptive Voron logo purging configuration. +[include ./KAMP/Smart_Park.cfg] # Include to enable the Smart Park function, which parks the printhead near the print area for final heating. + +[gcode_macro _KAMP_Settings] +description: This macro contains all adjustable settings for KAMP + +# The following variables are settings for KAMP as a whole. +variable_verbose_enable: True # Set to True to enable KAMP information output when running. This is useful for debugging. + +# The following variables are for adjusting adaptive mesh settings for KAMP. +variable_mesh_margin: 10 # Expands the mesh size in millimeters if desired. Leave at 0 to disable. +variable_fuzz_amount: 3 # Slightly randomizes mesh points to spread out wear from nozzle-based probes. Leave at 0 to disable. + +# The following variables are for those with a dockable probe like Klicky, Euclid, etc. # ---------------- Attach Macro | Detach Macro +variable_probe_dock_enable: False # Set to True to enable the usage of a dockable probe. # --------------------------------------------- +variable_attach_macro: 'Attach_Probe' # The macro that is used to attach the probe. # Klicky Probe: 'Attach_Probe' | 'Dock_Probe' +variable_detach_macro: 'Dock_Probe' # The macro that is used to store the probe. # Euclid Probe: 'Deploy_Probe' | 'Stow_Probe' + # Legacy Gcode: 'M401' | 'M402' + +# The following variables are for adjusting adaptive purge settings for KAMP. +variable_purge_height: 0.8 # Z position of nozzle during purge, default is 0.8. +variable_tip_distance: 1 # Distance between tip of filament and nozzle before purge. Should be similar to PRINT_END final retract amount. +variable_purge_margin: 10 # Distance the purge will be in front of the print area, default is 10. +variable_purge_amount: 30 # Amount of filament to be purged prior to printing. +variable_flow_rate: 12 # Flow rate of purge in mm3/s. Default is 12. + +# The following variables are for adjusting the Smart Park feature for KAMP, which will park the printhead near the print area at a specified height. +variable_smart_park_height: 10 # Z position for Smart Park, default is 10. + +gcode: # Gcode section left intentionally blank. Do not disturb. + + {action_respond_info(" Running the KAMP_Settings macro does nothing, it is only used for storing KAMP settings. ")} diff --git a/hardware/nitehawk.cfg b/hardware/nitehawk.cfg index ca43e0f..15b8c02 100644 --- a/hardware/nitehawk.cfg +++ b/hardware/nitehawk.cfg @@ -36,13 +36,14 @@ min_temp: 0 max_temp: 400 microsteps: 16 control: pid -pid_kp: 15.708 -pid_ki: 0.585 -pid_kd: 105.438 +pid_kp: 13.942 +pid_ki: 0.596 +pid_kd: 81.561 rotation_distance: 22.6789511 #Bondtech 5mm Drive Gears gear_ratio: 50:10 filament_diameter: 1.75 nozzle_diameter: 0.4 +max_extrude_cross_section: 5 [tmc2209 extruder] sense_resistor: 0.100 diff --git a/moonraker.conf b/moonraker.conf index 3618d2b..721f99c 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -3,22 +3,25 @@ host: 0.0.0.0 port: 7125 klippy_uds_address: /home/biqu/printer_data/comms/klippy.sock +[file_manager] +enable_object_processing: True + [authorization] trusted_clients: 10.0.0.0/8 127.0.0.0/8 - 169.254.0.0/16 - 172.16.0.0/12 +# 169.254.0.0/16 +# 172.16.0.0/12 192.168.0.0/16 - FE80::/10 - ::1/128 +# FE80::/10 +# ::1/128 cors_domains: *.lan *.local *://localhost *://localhost:* - *://my.mainsail.xyz - *://app.fluidd.xyz +# *://my.mainsail.xyz +# *://app.fluidd.xyz [octoprint_compat] @@ -28,6 +31,14 @@ cors_domains: channel: dev refresh_interval: 168 +[update_manager Klipper-Adaptive-Meshing-Purging] +type: git_repo +channel: dev +path: ~/Klipper-Adaptive-Meshing-Purging +origin: https://github.com/kyleisah/Klipper-Adaptive-Meshing-Purging.git +managed_services: klipper +primary_branch: main + [update_manager mainsail-config] type: git_repo primary_branch: master diff --git a/printer.cfg b/printer.cfg index 88f2160..a28d3d1 100644 --- a/printer.cfg +++ b/printer.cfg @@ -3,6 +3,8 @@ [include hardware/hardware.cfg] [include misc/misc.cfg] [include macros/macros.cfg] +[include config/config.cfg] +[include KAMP_Settings.cfg] [printer] max_velocity: 600 @@ -20,20 +22,16 @@ square_corner_velocity: 5.0 #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.129938, 0.077438, 0.072438, 0.064938, 0.079938, 0.084938, 0.092438 -#*# 0.074938, 0.042438, 0.032438, 0.029938, 0.032438, 0.059938, 0.079938 -#*# 0.024938, 0.012438, -0.015062, -0.007562, -0.000062, 0.022438, 0.032438 -#*# 0.014938, -0.000062, -0.015062, -0.020062, 0.007438, 0.027438, 0.047438 -#*# 0.044938, 0.029938, -0.012562, -0.002562, 0.009938, 0.024938, 0.039938 -#*# 0.089938, 0.049938, 0.012438, 0.019938, 0.029938, 0.032438, 0.064938 -#*# 0.152438, 0.109938, 0.074938, 0.069938, 0.069938, 0.069938, 0.079938 -#*# x_count = 7 -#*# y_count = 7 +#*# 0.002500, -0.010000, 0.005000 +#*# -0.002500, -0.017500, 0.005000 +#*# -0.007500, -0.025000, -0.020000 +#*# x_count = 3 +#*# y_count = 3 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 -#*# algo = bicubic +#*# algo = lagrange #*# tension = 0.2 -#*# min_x = 20.0 -#*# max_x = 320.0 -#*# min_y = 20.0 -#*# max_y = 320.0 +#*# min_x = 149.725 +#*# max_x = 202.865 +#*# min_y = 147.935 +#*# max_y = 200.09499999999997