diff --git a/UM2_v2.1.cfg b/UM2_v2.1.cfg index e75b182..c7424da 100644 --- a/UM2_v2.1.cfg +++ b/UM2_v2.1.cfg @@ -13,49 +13,6 @@ max_temp: 110 [verify_heater heater_bed] check_gain_time: 80 -[stepper_x] -step_pin: PA3 -dir_pin: !PA1 -enable_pin: !PA5 -microsteps: 16 -rotation_distance: 40 -endstop_pin: ^!PA0 -position_endstop: 0 -position_max: 230 -homing_speed: 80.0 - -[stepper_y] -step_pin: PC5 -dir_pin: PC4 -enable_pin: !PC6 -microsteps: 16 -rotation_distance: 40 -endstop_pin: ^!PA4 -position_endstop: 225 -position_max: 225 -homing_speed: 80.0 - -[stepper_z] -step_pin: PC2 -dir_pin: !PC1 -enable_pin: !PC3 -microsteps: 16 -rotation_distance: 16 -endstop_pin: ^!PA7 -position_endstop = 207.890 -position_min: -10 -position_max: 232 -homing_speed: 20.0 - -[extruder] -step_pin: PL7 -dir_pin: !PL6 -enable_pin: !PC0 -microsteps: 16 -rotation_distance: 10.07 #33.500 -nozzle_diameter: 0.400 -filament_diameter: 1.74 - [led case_light] white_pin: PH5 initial_WHITE: 0.8 diff --git a/bigtreetech-ebb-canbus-v1.2.cfg b/bigtreetech-ebb-canbus-v1.2.cfg index a2d2b61..3688ad0 100644 --- a/bigtreetech-ebb-canbus-v1.2.cfg +++ b/bigtreetech-ebb-canbus-v1.2.cfg @@ -5,10 +5,8 @@ # See docs/Config_Reference.md for a description of parameters. -[mcu EBBCan] -#serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_430057001150425539393020-if00 -canbus_uuid: 82edf63bd1a9 - +# [mcu EBBCan] +# canbus_uuid: 82edf63bd1a9 [adxl345] cs_pin: EBBCan: PB12 @@ -17,38 +15,6 @@ spi_software_mosi_pin: EBBCan: PB11 spi_software_miso_pin: EBBCan: PB2 axes_map: x,y,z -[extruder] -# step_pin: EBBCan: PD0 -# dir_pin: !EBBCan: PD1 -# enable_pin: !EBBCan: PD2 -# microsteps: 16 -# rotation_distance: 33.500 -# nozzle_diameter: 0.400 -# filament_diameter: 1.750 - heater_pin: EBBCan: PB13 -# sensor_type: EPCOS 100K B57560G104F -# sensor_pin: EBBCan: PA3 - control: pid - pid_Kp: 21.527 - pid_Ki: 1.063 - pid_Kd: 108.982 - min_temp: 0 - max_temp: 270 - - sensor_type:MAX31865 - sensor_pin: EBBCan: PA4 - spi_bus: spi1 - rtd_nominal_r: 100 - rtd_reference_r: 430 - rtd_num_of_wires: 2 - - pressure_advance: 0.78 - -# [tmc2209 extruder] -# uart_pin: EBBCan: PA15 -# run_current: 0.650 -# stealthchop_threshold: 999999 - [fan] pin: EBBCan: PA0 @@ -57,14 +23,19 @@ axes_map: x,y,z heater: extruder heater_temp: 50.0 -#[neopixel hotend_rgb] -#pin: EBBCan:PD3 - [bltouch] sensor_pin: ^EBBCan:PB8 control_pin: EBBCan:PB9 z_offset: 1.230 +# [tmc2209 extruder] +# uart_pin: EBBCan: PA15 +# run_current: 0.650 +# stealthchop_threshold: 999999 + +#[neopixel hotend_rgb] +#pin: EBBCan:PD3 + #[filament_switch_sensor switch_sensor] #switch_pin: EBBCan:PB4 diff --git a/printer.cfg b/printer.cfg index 197c2e7..92f8ec6 100644 --- a/printer.cfg +++ b/printer.cfg @@ -9,61 +9,112 @@ [mcu] serial: /dev/serial/by-id/usb-Arduino__www.arduino.cc__0042_8543034383735181D1B1-if00 +[mcu EBBCan] +canbus_uuid: 82edf63bd1a9 + [include UM2_v2.1.cfg] [include bigtreetech-ebb-canbus-v1.2.cfg] [printer] -kinematics: cartesian -max_velocity: 500 -max_accel: 3000 -max_z_velocity: 25 -max_z_accel: 30 + kinematics: cartesian + max_velocity: 500 + max_accel: 3000 + max_z_velocity: 25 + max_z_accel: 30 -# [safe_z_home] -# home_xy_position: 100, 100 # Change coordinates to the center of your print bed -# speed: 50 -# z_hop: 10 # Move up 10mm -# z_hop_speed: 5 +#steppers + +[stepper_z] + step_pin: PC2 + dir_pin: !PC1 + enable_pin: !PC3 + microsteps: 16 + rotation_distance: 16 + endstop_pin: ^!PA7 + position_endstop = 207.890 + position_min: -10 + position_max: 232 + homing_speed: 20.0 + +[stepper_x] + step_pin: PA3 + dir_pin: !PA1 + enable_pin: !PA5 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PA0 + position_endstop: 0 + position_max: 230 + homing_speed: 80.0 + +[stepper_y] + step_pin: PC5 + dir_pin: PC4 + enable_pin: !PC6 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PA4 + position_endstop: 225 + position_max: 225 + homing_speed: 80.0 + +[extruder] + step_pin: PL7 + dir_pin: !PL6 + enable_pin: !PC0 + microsteps: 16 + rotation_distance: 10.07 + nozzle_diameter: 0.400 + filament_diameter: 1.74 + heater_pin: EBBCan: PB13 + control: pid + pid_Kp: 21.527 + pid_Ki: 1.063 + pid_Kd: 108.982 + min_temp: 0 + max_temp: 270 + sensor_type:MAX31865 + sensor_pin: EBBCan: PA4 + spi_bus: spi1 + rtd_nominal_r: 100 + rtd_reference_r: 430 + rtd_num_of_wires: 2 + pressure_advance: 0.78 + +############################## +# bed leveling # +############################## [bed_screws] -screw1: 120, 185 -screw1_name: "rear mid screw" -screw2: 20 ,20 -screw2_name: "front left screw" -screw3: 220, 20 -screw3_name: "front right screw" -horizontal_move_z: 5 + screw1: 120, 185 + screw1_name: "rear mid screw" + screw2: 20 ,20 + screw2_name: "front left screw" + screw3: 220, 20 + screw3_name: "front right screw" + horizontal_move_z: 5 [bed_mesh] -speed: 120 -horizontal_move_z: 5 -mesh_min: 15, 50 -mesh_max: 190, 200 -probe_count: 5, 3 + speed: 120 + horizontal_move_z: 5 + mesh_min: 15, 50 + mesh_max: 190, 200 + probe_count: 3, 3 + +############################## +# Sensors # +############################## [filament_motion_sensor runout] -# The minimum length of filament pulled through the sensor to trigger -# a state change on the switch_pin -# Default is 7 mm. -detection_length: 14.0 -extruder: extruder -pause_on_runout: FALSE -runout_gcode: - {action_respond_info("RUNOUT: Filament runout")} - PAUSE -insert_gcode: {action_respond_info("RUNOUT: Filament inserted")} -# The minimum amount of time in seconds to delay between events. -# Events triggered during this time period will be silently -# ignored. The default is 3 seconds. -#event_delay: 3.0 -# The amount of time to delay, in seconds, between the pause command -# dispatch and execution of the runout_gcode. It may be useful to -# increase this delay if OctoPrint exhibits strange pause behavior. -# Default is 0.5 seconds. -#pause_delay: 0.5 -## XYE mcu E0DET -switch_pin: PB7 + detection_length: 7.0 + extruder: extruder + pause_on_runout: FALSE + runout_gcode: + {action_respond_info("RUNOUT: Filament runout")} + PAUSE + insert_gcode: {action_respond_info("RUNOUT: Filament inserted")} + switch_pin: PB7 [include mainsail.cfg]