diff --git a/fans.cfg b/fans.cfg index 04f91d9..9c8e73d 100644 --- a/fans.cfg +++ b/fans.cfg @@ -1,45 +1,22 @@ [fan] -## Print Cooling Fan - FAN2 Connector -pin: PA2 +## Print Cooling Fan - FAN0 Connector +pin: PA8 max_power: 1 kick_start_time: 0.5 off_below: 0.10 [heater_fan hotend_fan] -## Hotend Fan - FAN0 Connector -pin: PA0 +## Hotend Fan - FAN1 Connector +pin: PE5 max_power: 1.0 kick_start_time: 0.5 heater: extruder heater_temp: 50.0 -[fan_generic Exhaust_fan] -## exhaust fan - In FAN4 -pin: PA15 -max_power: 1 -shutdown_speed: 0 -kick_start_time: 0.1 -off_below: 0.10 - -[fan_generic chamber_fan] -## chamber fan - In FAN9 Positon -pin: PD15 -max_power: 1 -shutdown_speed: 0 -kick_start_time: 0.1 -off_below: 0.10 - -[fan_generic RSCS] -## RSCS Fans - In FAN1 Positon -pin: PA1 -max_power: 1 -shutdown_speed: 0 -kick_start_time: 0.1 -off_below: 0.10 - [controller_fan driver_fan] +## Controller Fan - FAN2 Connector stepper: stepper_x -pin: PB11 +pin: PD12 max_power: 1 shutdown_speed: 0 kick_start_time: 0.1 diff --git a/moonraker.conf b/moonraker.conf index 2e260b9..05e5bac 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -56,3 +56,11 @@ path: ~/fluidd #env: /home/kdb424/.KlipperScreen-env/bin/python #requirements: scripts/KlipperScreen-requirements.txt #install_script: scripts/KlipperScreen-install.sh + +# moonraker.conf + +[update_manager timelapse] +type: git_repo +primary_branch: main +path: ~/moonraker-timelapse +origin: https://github.com/mainsail-crew/moonraker-timelapse.git diff --git a/printer.cfg b/printer.cfg index b4bc0b4..c884775 100644 --- a/printer.cfg +++ b/printer.cfg @@ -1,10 +1,11 @@ +[include timelapse.cfg] [include kiauh_macros.cfg] [include steppers.cfg] [include stepper2209.cfg] [include stepperz.cfg] [include sherpa_mini.cfg] [include fans.cfg] -[include calibration_mcros.cfg] +[include calibration_macros.cfg] [pause_resume] [display_status] @@ -14,7 +15,8 @@ path: ~/gcode_files [printer] kinematics: corexy max_velocity: 2000 -max_accel: 50000 +max_accel: 5000 +#max_accel: 50000 #max_accel_to_decel: 100000 max_z_velocity: 30 max_z_accel: 1500 @@ -24,9 +26,9 @@ square_corner_velocity: 20 serial: /dev/serial/by-id/ [heater_bed] -heater_pin: PE5 +heater_pin: PA6 sensor_type: Generic 3950 -sensor_pin: PC1 +sensor_pin: PF3 control: pid pid_Kp: 66.746 pid_Ki: 3.504 diff --git a/sherpa_mini.cfg b/sherpa_mini.cfg index d961890..b04d5f9 100644 --- a/sherpa_mini.cfg +++ b/sherpa_mini.cfg @@ -6,14 +6,32 @@ gear_ratio: 50:8 #for sherpa mini 8t motor microsteps: 16 full_steps_per_rotation: 200 #1.8deg Motor +nozzle_diameter: 0.5 +filament_diameter: 1.750 + max_extrude_only_distance: 1400.0 max_extrude_only_velocity: 75.0 max_extrude_only_accel: 1500 +min_temp: 180 +max_temp: 350 + +step_pin: PG4 +dir_pin: PC1 +enable_pin: !PA0 +heater_pin: PA2 +sensor_type: PT1000 +sensor_pin: PF4 + +control: pid +pid_Kp = 27.55 +pid_Ki = 1.275 +pid_Kd = 148.759 + #settings for NEMA14 Stepper [tmc2209 extruder] interpolate: True - +uart_pin: PC7 #Run current is listed in RMS run_current: 0.30 #min current, equivalent to 0.42A peak (Peak = RMS/0.707) #run_current: 0.35 #max current, equivalent to 0.49A peak (Peak = RMS/0.707) diff --git a/stepper2209.cfg b/stepper2209.cfg index 8ce2faf..f12dff5 100644 --- a/stepper2209.cfg +++ b/stepper2209.cfg @@ -7,7 +7,7 @@ sense_resistor: 0.110 stealthchop_threshold: 0 [tmc2209 stepper_y] -uart_pin: PF12 +uart_pin: PD11 interpolate: true run_current: 1.7 hold_current: 1 diff --git a/steppers.cfg b/steppers.cfg index 8553c38..ade6a67 100644 --- a/steppers.cfg +++ b/steppers.cfg @@ -1,11 +1,11 @@ [stepper_x] -step_pin: PE2 # Drive0 -dir_pin: PC5 -enable_pin: !PF11 +step_pin: PF13 # Drive0 +dir_pin: PF12 +enable_pin: !PF14 microsteps: 16 rotation_distance: 40 -endstop_pin: PG11 +endstop_pin: PG6 position_endstop: -8 position_min: -8 position_max: 315 @@ -16,12 +16,12 @@ homing_positive_dir: false step_pulse_duration: 0.000001 [stepper_y] -step_pin: PE3 # Drive1 -dir_pin: PF13 -enable_pin: !PF14 +step_pin: PG0 # Drive1 +dir_pin: PG1 +enable_pin: !PF15 microsteps: 16 rotation_distance: 40 -endstop_pin: ^PG12 +endstop_pin: PG9 position_endstop: -6 position_min: -6 position_max: 315 @@ -32,9 +32,9 @@ homing_positive_dir: false step_pulse_duration: 0.000001 [stepper_z] -step_pin: PE15 -dir_pin: !PE11 -enable_pin: !PF2 +step_pin: PF11 +dir_pin: !PG3 +enable_pin: !PG5 microsteps: 16 rotation_distance: 4 endstop_pin: !PG10 diff --git a/stepperz.cfg b/stepperz.cfg index a5ef34f..233fa1c 100644 --- a/stepperz.cfg +++ b/stepperz.cfg @@ -1,6 +1,6 @@ [tmc2209 stepper_z] interpolate: false -uart_pin: PE10 +uart_pin: PC6 run_current: 0.8 hold_current: 0.8 sense_resistor: 0.110 diff --git a/timelapse.cfg b/timelapse.cfg new file mode 120000 index 0000000..0d6acb6 --- /dev/null +++ b/timelapse.cfg @@ -0,0 +1 @@ +/home/kdb424/moonraker-timelapse/klipper_macro/timelapse.cfg \ No newline at end of file