Compare commits

..

7 Commits

Author SHA1 Message Date
Frederik Hertzum 9196bf7303 Multiple changes mainly speeds and acceleration
- Removed KAMP from the system
- reduced max speed and acceleration on x/y and z
2024-10-16 11:22:22 +02:00
Frederik Hertzum 6227d15cf8 input shaper updated -- this should probably not be kept in git, but justt be generated by input shaping macros when needed 2024-10-16 11:21:26 +02:00
Frederik Hertzum b4c4fcae7b print-start uses adpative mesh generation (used to be done through KAMP) 2024-10-16 11:20:33 +02:00
Frederik Hertzum d71c053f94 decreased bed mesh speed to 300 mm/s 2024-10-16 11:19:46 +02:00
Frederik Hertzum aeb96b2171 firmware retraction configuration added 2024-10-16 11:19:19 +02:00
Frederik Hertzum 62bcfea47a Fix issues with various bits related to the mainboard
- Chamber thermistor was set to use a 2.2k resistor. Should have been 4.7k
- Speed for homing increased to 600 mm/s
- Removed macros and moved them to macros/
2024-10-16 11:18:43 +02:00
Frederik Hertzum 572043fa98 clean up of files 2024-10-16 11:16:31 +02:00
19 changed files with 67 additions and 181 deletions

View File

@ -1,36 +0,0 @@
# 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. ")}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 981 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 985 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 KiB

View File

@ -2,4 +2,3 @@
[include steppers.cfg] [include steppers.cfg]
[include manta.cfg] [include manta.cfg]
[include nitehawk.cfg] [include nitehawk.cfg]
#[include nh-36.cfg]

View File

@ -10,7 +10,7 @@ sensor_pin: PB0
min_temp: 0 min_temp: 0
max_temp: 100 max_temp: 100
gcode_id: chamber gcode_id: chamber
pullup_resistor: 2200 pullup_resistor: 4700
##################################################################### #####################################################################
# Bed Heater # Bed Heater
@ -40,7 +40,7 @@ pid_kd: 431.393
##################################################################### #####################################################################
[multi_pin ebay_fans_pin] [multi_pin ebay_fans_pin]
pins: PF7, PF9, PF6, PF8 pins: PF7, PF8
[temperature_fan ebay_fans] [temperature_fan ebay_fans]
# Print Cooling Fan - CNC_FAN0 # Print Cooling Fan - CNC_FAN0
@ -55,6 +55,10 @@ target_temp: 50
max_power: 0.5 max_power: 0.5
shutdown_speed: 0 shutdown_speed: 0
[fan_generic exhaust]
pin: PF9
hardware_pwm: false
##################################################################### #####################################################################
# Homing and Gantry Adjustment Routines # Homing and Gantry Adjustment Routines
##################################################################### #####################################################################
@ -64,7 +68,7 @@ timeout: 1800
[safe_z_home] [safe_z_home]
home_xy_position:175,175 home_xy_position:175,175
speed:200 speed:600
z_hop:10 z_hop:10
[quad_gantry_level] [quad_gantry_level]
@ -78,10 +82,8 @@ points:
50,275 50,275
300,275 300,275
300,25 300,25
speed: 100
#-------------------------------------------------------------------- horizontal_move_z: 5
speed: 600
horizontal_move_z: 10
retries: 5 retries: 5
retry_tolerance: 0.025 retry_tolerance: 0.025
max_adjust: 10 max_adjust: 10
@ -101,51 +103,3 @@ aliases:
EXP2_5=PE10, EXP2_6=PE14, # Slot in the socket on this side EXP2_5=PE10, EXP2_6=PE14, # Slot in the socket on this side
EXP2_7=PE8, EXP2_8=<RST>, EXP2_7=PE8, EXP2_8=<RST>,
EXP2_9=<GND>, EXP2_10=<NC> EXP2_9=<GND>, EXP2_10=<NC>
#####################################################################
# Macros
#####################################################################
[gcode_macro G32]
gcode:
BED_MESH_CLEAR
G28
QUAD_GANTRY_LEVEL
G28
## Uncomment for for your size printer:
#--------------------------------------------------------------------
## Uncomment for 250mm build
#G0 X125 Y125 Z30 F3600
## Uncomment for 300 build
#G0 X150 Y150 Z30 F3600
## Uncomment for 350mm build
#G0 X175 Y175 Z30 F3600
#--------------------------------------------------------------------
[gcode_macro PRINT_END]
# Use PRINT_END for the slicer ending script - please customise for your slicer of choice
gcode:
SAVE_GCODE_STATE NAME=STATE_PRINT_END
M400 ; wait for buffer to clear
G92 E0 ; zero the extruder
G1 E-10.0 F3600 ; retract filament
G91 ; relative positioning
G0 Z1.00 X20.0 Y20.0 F20000 ; move nozzle to remove stringing
TURN_OFF_HEATERS
M107 ; turn off fan
G1 Z2 F3000 ; move nozzle up 2mm
G90 ; absolute positioning
G0 X125 Y250 F3600 ; park nozzle at rear
BED_MESH_CLEAR
# The purpose of the SAVE_GCODE_STATE/RESTORE_GCODE_STATE
# command pair is to restore the printer's coordinate system
# and speed settings since the commands above change them.
# However, to prevent any accidental, unintentional toolhead
# moves when restoring the state, explicitly set MOVE=0.
RESTORE_GCODE_STATE NAME=STATE_PRINT_END MOVE=0

View File

@ -1,14 +0,0 @@
[mcu nhk]
## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify
##--------------------------------------------------------------------
serial: 4E473531310A2450
restart_method: command
#####################################################################
# Probe
#####################################################################
## Probe Port
[probe]
pin: nhk:gpio10
z_offset: -0.890

8
macros/g32.cfg Normal file
View File

@ -0,0 +1,8 @@
[gcode_macro G32]
gcode:
BED_MESH_CLEAR
G28
QUAD_GANTRY_LEVEL
G28
G0 X175 Y175 Z30 F3600

View File

@ -1,4 +1,6 @@
[include buzz.cfg] [include buzz.cfg]
[include sensorless-homing.cfg] [include sensorless-homing.cfg]
[include print-start.cfg] [include print-start.cfg]
[include print-end.cfg]
# [include sb-leds.cfg] # [include sb-leds.cfg]
[include g32.cfg]

24
macros/print-end.cfg Normal file
View File

@ -0,0 +1,24 @@
[gcode_macro PRINT_END]
# Use PRINT_END for the slicer ending script - please customise for your slicer of choice
gcode:
SAVE_GCODE_STATE NAME=STATE_PRINT_END
M400 ; wait for buffer to clear
G92 E0 ; zero the extruder
G1 E-10.0 F3600 ; retract filament
G91 ; relative positioning
G0 Z1.00 X20.0 Y20.0 F20000 ; move nozzle to remove stringing
TURN_OFF_HEATERS
M107 ; turn off fan
G1 Z5 F3000 ; move nozzle up 5mm
G90 ; absolute positioning
G0 X175 Y350 F3600 ; park nozzle at rear
BED_MESH_CLEAR
# The purpose of the SAVE_GCODE_STATE/RESTORE_GCODE_STATE
# command pair is to restore the printer's coordinate system
# and speed settings since the commands above change them.
# However, to prevent any accidental, unintentional toolhead
# moves when restoring the state, explicitly set MOVE=0.
RESTORE_GCODE_STATE NAME=STATE_PRINT_END MOVE=0

View File

@ -72,7 +72,7 @@ gcode:
## Uncomment for bed mesh (2 of 2) ## Uncomment for bed mesh (2 of 2)
SET_DISPLAY_TEXT MSG="Bed mesh" # Displays info SET_DISPLAY_TEXT MSG="Bed mesh" # Displays info
# STATUS_MESHING # Sets SB-leds to bed mesh-mode # STATUS_MESHING # Sets SB-leds to bed mesh-mode
bed_mesh_calibrate # Starts bed mesh bed_mesh_calibrate ADAPTIVE=1 # Starts bed mesh
# Heats up the nozzle up to target via data from slicer # Heats up the nozzle up to target via data from slicer
SET_DISPLAY_TEXT MSG="Hotend: {target_extruder}c" # Displays info SET_DISPLAY_TEXT MSG="Hotend: {target_extruder}c" # Displays info

View File

@ -1,7 +1,8 @@
[bed_mesh] [bed_mesh]
speed: 600 speed: 300
horizontal_move_z: 2 horizontal_move_z: 2
mesh_min: 20,20 mesh_min: 20,20
mesh_max: 320,320 mesh_max: 320,320
probe_count: 5,5 probe_count: 5,5
algorithm: bicubic algorithm: bicubic
adaptive_margin: 5

View File

@ -0,0 +1 @@
[firmware_retraction]

View File

@ -1,4 +1,4 @@
[input_shaper] [input_shaper]
shaper_freq_x: 60.8 shaper_freq_x: 63.6
shaper_freq_y: 42.0 shaper_freq_y: 67.4
shaper_type: zv shaper_type: zv

View File

@ -1,3 +1,4 @@
[include bed_mesh.cfg] [include bed_mesh.cfg]
[include input-shaper.cfg] [include input-shaper.cfg]
[include shake-n-tune.cfg] [include shake-n-tune.cfg]
[include firmware-retraction.cfg]

View File

@ -1,15 +0,0 @@
#[include print_area_bed_mesh.cfg]
[include mainsail.cfg]
[include hardware/hardware.cfg]
[include misc/misc.cfg]
[include macros/macros.cfg]
[printer]
max_velocity: 600
max_accel: 6500
kinematics: corexy
max_z_velocity: 30 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 350
square_corner_velocity: 5.0
[exclude_object]

View File

@ -1,40 +0,0 @@
#[include print_area_bed_mesh.cfg]
[include mainsail.cfg]
[include hardware/hardware.cfg]
[include misc/misc.cfg]
[include macros/macros.cfg]
[include config/config.cfg]
[include KAMP_Settings.cfg]
[printer]
max_velocity: 600
max_accel: 6500
kinematics: corexy
max_z_velocity: 30 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 350
square_corner_velocity: 5.0
[exclude_object]
#*# <---------------------- SAVE_CONFIG ---------------------->
#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
#*#
#*# [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
#*# mesh_x_pps = 2
#*# mesh_y_pps = 2
#*# algo = bicubic
#*# tension = 0.2
#*# min_x = 20.0
#*# max_x = 320.0
#*# min_y = 20.0
#*# max_y = 320.0

View File

@ -4,13 +4,13 @@
[include misc/misc.cfg] [include misc/misc.cfg]
[include macros/macros.cfg] [include macros/macros.cfg]
[include config/config.cfg] [include config/config.cfg]
[include KAMP_Settings.cfg]
[printer] [printer]
max_velocity: 600 max_velocity: 300
max_accel: 6500 max_accel: 6000
kinematics: corexy kinematics: corexy
max_z_velocity: 30 #Max 15 for 12V TMC Drivers, can increase for 24V max_z_velocity: 15 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 350 max_z_accel: 350
square_corner_velocity: 5.0 square_corner_velocity: 5.0
@ -22,16 +22,17 @@ square_corner_velocity: 5.0
#*# [bed_mesh default] #*# [bed_mesh default]
#*# version = 1 #*# version = 1
#*# points = #*# points =
#*# 0.002500, -0.010000, 0.005000 #*# -0.005000, -0.037500, -0.097500, -0.085000
#*# -0.002500, -0.017500, 0.005000 #*# -0.020000, -0.025000, 0.002500, -0.105000
#*# -0.007500, -0.025000, -0.020000 #*# 0.027500, -0.012500, -0.020000, -0.170000
#*# x_count = 3 #*# -0.065000, -0.070000, -0.075000, -0.072500
#*# y_count = 3 #*# x_count = 4
#*# y_count = 4
#*# mesh_x_pps = 2 #*# mesh_x_pps = 2
#*# mesh_y_pps = 2 #*# mesh_y_pps = 2
#*# algo = lagrange #*# algo = lagrange
#*# tension = 0.2 #*# tension = 0.2
#*# min_x = 149.725 #*# min_x = 69.89
#*# max_x = 202.865 #*# max_x = 280.37
#*# min_y = 147.935 #*# min_y = 98.00800000000001
#*# max_y = 200.09499999999997 #*# max_y = 252.65800000000002