diff --git a/KlipperScreen.conf b/KlipperScreen.conf index e28e7eb..e5aefa0 100644 --- a/KlipperScreen.conf +++ b/KlipperScreen.conf @@ -9,9 +9,5 @@ #~# [main] #~# screen_blanking = 300 #~# show_heater_power = True -#~# -#~# [graph Printer] -#~# temperature_sensor mcu = False -#~# heater_bed = False -#~# extruder = False +#~# print_view = list #~# diff --git a/ShakeTune_results/input_shaper/inputshaper_20240923_150602_X.png b/ShakeTune_results/input_shaper/inputshaper_20240923_150602_X.png new file mode 100644 index 0000000..7776c21 Binary files /dev/null and b/ShakeTune_results/input_shaper/inputshaper_20240923_150602_X.png differ diff --git a/ShakeTune_results/input_shaper/inputshaper_20240923_150602_Y.png b/ShakeTune_results/input_shaper/inputshaper_20240923_150602_Y.png new file mode 100644 index 0000000..ed3c70e Binary files /dev/null and b/ShakeTune_results/input_shaper/inputshaper_20240923_150602_Y.png differ diff --git a/ShakeTune_results/input_shaper/inputshaper_20240923_151108_X.png b/ShakeTune_results/input_shaper/inputshaper_20240923_151108_X.png new file mode 100644 index 0000000..103cd0e Binary files /dev/null and b/ShakeTune_results/input_shaper/inputshaper_20240923_151108_X.png differ diff --git a/ShakeTune_results/input_shaper/inputshaper_20240923_151108_Y.png b/ShakeTune_results/input_shaper/inputshaper_20240923_151108_Y.png new file mode 100644 index 0000000..c5c6045 Binary files /dev/null and b/ShakeTune_results/input_shaper/inputshaper_20240923_151108_Y.png differ diff --git a/hardware/hardware.cfg b/hardware/hardware.cfg index 21061ee..8e193ac 100644 --- a/hardware/hardware.cfg +++ b/hardware/hardware.cfg @@ -1,4 +1,5 @@ [include mcu.cfg] [include steppers.cfg] +[include manta.cfg] [include nitehawk.cfg] -[include manta.cfg] \ No newline at end of file +#[include nh-36.cfg] diff --git a/hardware/manta.cfg b/hardware/manta.cfg index a231a59..7631526 100644 --- a/hardware/manta.cfg +++ b/hardware/manta.cfg @@ -10,6 +10,7 @@ sensor_pin: PB0 min_temp: 0 max_temp: 100 gcode_id: chamber +pullup_resistor: 2200 ##################################################################### # Bed Heater @@ -26,13 +27,13 @@ sensor_pin: PB1 ## The formula is "4 / (Wattage_of_bed_heater / Mains_voltage) = max_power" ## If max_power is greater than 1.0, use 1.0 sensor_type: Generic 3950 -max_power: 0.96 +max_power: 0.92 min_temp: 0 -max_temp: 120 +max_temp: 125 control: pid -pid_kp: 62.117 -pid_ki: 3.210 -pid_kd: 300.492 +pid_kp: 56.391 +pid_ki: 1.843 +pid_kd: 431.393 ##################################################################### # Fan Control @@ -54,56 +55,6 @@ target_temp: 50 max_power: 0.5 shutdown_speed: 0 -#[heater_fan hotend_fan] -## Hotend Fan - CNC_FAN1 -#pin: PF9 -#max_power: 1.0 -#kick_start_time: 0.5 -#heater: extruder -#heater_temp: 50.0 -## If you are experiencing back flow, you can reduce fan_speed -#fan_speed: 1.0 - -#[heater_fan controller_fan] -## Controller fan - CNC_FAN2 -#pin: PF6 -#kick_start_time: 0.5 -#heater: heater_bed -#heater_temp: 45.0 - -#[heater_fan exhaust_fan] -## Exhaust fan - CNC_FAN3 -#pin: PF8 -#max_power: 1.0 -#shutdown_speed: 0.0 -#kick_start_time: 5.0 -#heater: heater_bed -#heater_temp: 60 -#fan_speed: 1.0 - -#[heater_fan fan4] -#pin: PA4 - -#[heater_fan fan5] -#pin: PA6 -#tachometer_pin: PC2 - -#[heater_fan fan6] -#pin: PA2 -#tachometer_pin: PC1 - -##################################################################### -# LED Control -##################################################################### - -#[output_pin caselight] -# Chamber Lighting - HE2 Connector (Optional) -#pin: PA3 -#pwm:true -#shutdown_value: 0 -#value:1 -#cycle_time: 0.01 - ##################################################################### # Homing and Gantry Adjustment Routines ##################################################################### @@ -122,7 +73,6 @@ z_hop:10 gantry_corners: -60,-10 410,420 -# Probe points points: 50,25 50,275 @@ -130,10 +80,10 @@ points: 300,25 #-------------------------------------------------------------------- -speed: 250 +speed: 600 horizontal_move_z: 10 retries: 5 -retry_tolerance: 0.0075 +retry_tolerance: 0.025 max_adjust: 10 [board_pins] @@ -152,30 +102,6 @@ aliases: EXP2_7=PE8, EXP2_8=, EXP2_9=, EXP2_10= -# See the sample-lcd.cfg file for definitions of common LCD displays. - -##################################################################### -# Displays -##################################################################### - -## Uncomment the display that you have -#-------------------------------------------------------------------- - -#[display] -## RepRapDiscount 128x64 Full Graphic Smart Controller -#lcd_type: st7920 -#cs_pin: EXP1_4 -#sclk_pin: EXP1_5 -#sid_pin: EXP1_3 -#menu_timeout: 40 -#encoder_pins: ^EXP2_5, ^EXP2_3 -#click_pin: ^!EXP1_2 - -#[output_pin beeper] -#pin: EXP1_1 - -#-------------------------------------------------------------------- - ##################################################################### # Macros diff --git a/hardware/nh-36.cfg b/hardware/nh-36.cfg new file mode 100644 index 0000000..0963e2e --- /dev/null +++ b/hardware/nh-36.cfg @@ -0,0 +1,14 @@ + +[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 \ No newline at end of file diff --git a/hardware/nitehawk.cfg b/hardware/nitehawk.cfg index 15b8c02..4b61b19 100644 --- a/hardware/nitehawk.cfg +++ b/hardware/nitehawk.cfg @@ -17,10 +17,14 @@ [mcu nhk] ## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify ##-------------------------------------------------------------------- -serial: /dev/serial/by-id/usb-Klipper_rp2040_313436333211C87C-if00 +serial: /dev/serial/by-id/usb-Klipper_rp2040_4E473531310A2450-if00 restart_method: command ##-------------------------------------------------------------------- +[temperature_sensor nhk] +sensor_type: temperature_mcu +sensor_mcu: nhk + ##################################################################### # Extruder ##################################################################### @@ -30,17 +34,16 @@ dir_pin: !nhk:gpio24 enable_pin: !nhk:gpio25 heater_pin: nhk:gpio9 sensor_pin: nhk:gpio29 -sensor_type: PT1000 +sensor_type: Generic 3950 pullup_resistor: 2200 min_temp: 0 -max_temp: 400 +max_temp: 450 microsteps: 16 control: pid -pid_kp: 13.942 -pid_ki: 0.596 -pid_kd: 81.561 -rotation_distance: 22.6789511 #Bondtech 5mm Drive Gears -gear_ratio: 50:10 +pid_kp: 12.655 +pid_ki: 0.524 +pid_kd: 76.404 +rotation_distance: 5.7 filament_diameter: 1.75 nozzle_diameter: 0.4 max_extrude_cross_section: 5 @@ -50,7 +53,7 @@ sense_resistor: 0.100 uart_pin: nhk:gpio0 tx_pin: nhk:gpio1 interpolate: false -run_current: 0.8 +run_current: 0.65 ##################################################################### # Fans @@ -60,8 +63,8 @@ run_current: 0.8 pin: nhk:gpio6 #tachometer_pin: nhk:gpio17 #tachometer_ppr: 2 - ## HEF + [heater_fan hotend_fan] pin: nhk:gpio5 #tachometer_pin: nhk:gpio16 @@ -90,7 +93,7 @@ pin: !nhk:gpio8 # Accelerometer ##################################################################### [adxl345] -cs_pin: nhk:gpio21 +cs_pin: nhk:gpio27 spi_software_sclk_pin: nhk:gpio18 spi_software_mosi_pin: nhk:gpio20 spi_software_miso_pin: nhk:gpio19 @@ -113,19 +116,19 @@ probe_points: #max_temp: 100 #gcode_id: chamber_th -[thermistor CMFB103F3950FANT] -temperature1: 0.0 -resistance1: 32116.0 -temperature2: 40.0 -resistance2: 5309.0 -temperature3: 80.0 -resistance3: 1228.0 +# [thermistor CMFB103F3950FANT] +# temperature1: 0.0 +# resistance1: 32116.0 +# temperature2: 40.0 +# resistance2: 5309.0 +# temperature3: 80.0 +# resistance3: 1228.0 -[temperature_sensor nh_temp] -## Nitehawk PCB Sensor -sensor_type: CMFB103F3950FANT -sensor_pin: nhk:gpio26 -pullup_resistor: 2200 -min_temp: 0 -max_temp: 100 -gcode_id: nh_th +# [temperature_sensor nh_temp] +# ## Nitehawk PCB Sensor +# sensor_type: CMFB103F3950FANT +# sensor_pin: nhk:gpio26 +# pullup_resistor: 2200 +# min_temp: 0 +# max_temp: 100 +# gcode_id: nh_th diff --git a/printer-20240901_090049.cfg b/printer-20240901_090049.cfg new file mode 100644 index 0000000..2e8f006 --- /dev/null +++ b/printer-20240901_090049.cfg @@ -0,0 +1,40 @@ +#[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