diff --git a/.moonraker.conf.bkp b/.moonraker.conf.bkp index 2f3fe30..93831fa 100644 --- a/.moonraker.conf.bkp +++ b/.moonraker.conf.bkp @@ -1,13 +1,9 @@ [server] host = 0.0.0.0 port = 7125 -enable_debug_logging = False max_upload_size = 1024 [file_manager] -config_path = ~/klipper_config -log_path = ~/klipper_logs -enable_object_processing = False [authorization] cors_domains = @@ -55,3 +51,11 @@ origin = https://github.com/mainsail-crew/sonar.git primary_branch = main managed_services = sonar +[update_manager KlipperScreen] +type = git_repo +path = /home/pi/KlipperScreen +origin = https://github.com/jordanruthe/KlipperScreen.git +env = /home/pi/.KlipperScreen-env/bin/python +requirements = scripts/KlipperScreen-requirements.txt +install_script = scripts/KlipperScreen-install.sh + diff --git a/mainsail.cfg b/mainsail.cfg index ce63ba1..eacc745 100644 --- a/mainsail.cfg +++ b/mainsail.cfg @@ -12,7 +12,7 @@ # use variable_park: False at CANCEL_PRINT to disallow the parking move [virtual_sdcard] -path: ~/gcode_files +path: /home/pi/printer_data/gcodes/ on_error_gcode: CANCEL_PRINT diff --git a/moonraker.conf b/moonraker.conf index bc7dcee..e81d1fa 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -2,15 +2,15 @@ host: 0.0.0.0 port: 7125 # Verbose logging used for debugging . Default False. -enable_debug_logging: False +#enable_debug_logging: False # The maximum size allowed for a file upload (in MiB). Default 1024 MiB max_upload_size: 1024 [file_manager] -config_path: /home/willem/klipper_config -log_path: home/willem/klipper_logs +#config_path: /home/willem/klipper_config +#log_path: home/willem/klipper_logs # post processing for object cancel. Not recommended for low resource SBCs such as a Pi Zero. Default False -enable_object_processing: False +#enable_object_processing: False [authorization] cors_domains: @@ -79,8 +79,8 @@ managed_services: sonar [update_manager KlipperScreen] type: git_repo -path: /home/willem/KlipperScreen +path: /home/pi/KlipperScreen origin: https://github.com/jordanruthe/KlipperScreen.git -env: /home/willem/.KlipperScreen-env/bin/python +env: /home/pi/.KlipperScreen-env/bin/python requirements: scripts/KlipperScreen-requirements.txt install_script: scripts/KlipperScreen-install.sh diff --git a/printer-20221208_224943.cfg b/printer-20221208_224943.cfg new file mode 100755 index 0000000..d0d6c50 --- /dev/null +++ b/printer-20221208_224943.cfg @@ -0,0 +1,169 @@ +# This file contains common pin mappings for the BIGTREETECH Manta M4P +# To use this config, the firmware should be compiled for the +# STM32G0B1 with a "8KiB bootloader" and USB communication. + +# See docs/Config_Reference.md for a description of parameters. + +[printer] +kinematics: cartesian +max_velocity: 180 +max_accel: 3000 +max_z_velocity: 100 +max_z_accel: 100 + +[mcu] +serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 + + +[mcu EBBCan] + canbus_uuid: 82edf63bd1a9 + +[include toolhead.cfg] + +[stepper_x] + step_pin: PC6 + dir_pin: !PA14 + enable_pin: !PC7 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC0 + position_endstop: 0 + position_max: 230 + homing_speed: 80 + +[stepper_y] + step_pin: PB10 + dir_pin: PB2 + enable_pin: !PB11 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC1 + position_endstop: 230 + position_max: 230 + homing_speed: 80 + +[stepper_z] + step_pin: PB0 + dir_pin: !PC5 + enable_pin: !PB1 + microsteps: 16 + rotation_distance: 8 + endstop_pin: ^!PC2 + position_endstop: 207.890 + position_max: 232 + position_min: -10 + homing_speed: 40 + +[extruder] + step_pin: PB3 + dir_pin: PB4 + enable_pin: !PD5 + 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 + +[filament_switch_sensor extruder_filament_sensor] + switch_pin: ^!PC15 + +# [heater_bed] +# heater_pin: PD8 +# sensor_type: Generic 3950 +# sensor_pin: PC4 +# control = pid +# pid_kp = 62.901 +# pid_ki = 1.808 +# pid_kd = 547.241 +# min_temp: 0 +# max_temp: 120 + +[fan] +pin: PD2 + +[led WhiteLeds] +white_pin: PD4 +initial_WHITE: 0.7 + + + + +############################## +# 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 + +[bed_mesh] + speed: 120 + horizontal_move_z: 5 + mesh_min: 15, 50 + mesh_max: 190, 200 + probe_count: 3, 3 + +######################################## +# TMC2209 configuration +######################################## + +[tmc2209 stepper_x] + uart_pin: PB12 + run_current: 0.800 + +[tmc2209 stepper_y] + uart_pin: PC10 + run_current: 0.800 + +[tmc2209 stepper_z] + uart_pin: PC9 + run_current: 0.800 + +[tmc2209 extruder] + uart_pin: PA13 + run_current: 0.600 + + + +[include mainsail.cfg] + +#*# <---------------------- SAVE_CONFIG ----------------------> +#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. +#*# +#*# +#*# [extruder] +#*# +#*# [bed_mesh default] +#*# version = 1 +#*# points = +#*# 0.725000, 0.715000, 0.660000, 0.610000, 0.570000 +#*# 0.660000, 0.650000, 0.600000, 0.575000, 0.485000 +#*# 0.695000, 0.650000, 0.605000, 0.585000, 0.495000 +#*# x_count = 5 +#*# y_count = 3 +#*# mesh_x_pps = 2 +#*# mesh_y_pps = 2 +#*# algo = lagrange +#*# tension = 0.2 +#*# min_x = 15.0 +#*# max_x = 190.0 +#*# min_y = 50.0 +#*# max_y = 200.0 \ No newline at end of file diff --git a/printer-20221209_120141.cfg b/printer-20221209_120141.cfg new file mode 100644 index 0000000..90d2fc9 --- /dev/null +++ b/printer-20221209_120141.cfg @@ -0,0 +1,168 @@ +# This file contains common pin mappings for the BIGTREETECH Manta M4P +# To use this config, the firmware should be compiled for the +# STM32G0B1 with a "8KiB bootloader" and USB communication. + +# See docs/Config_Reference.md for a description of parameters. + +[printer] +kinematics: cartesian +max_velocity: 180 +max_accel: 3000 +max_z_velocity: 100 +max_z_accel: 100 + +[mcu] +serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 + + +[mcu EBBCan] + canbus_uuid: 82edf63bd1a9 + +[include toolhead.cfg] + +[stepper_x] + step_pin: PC6 + dir_pin: !PA14 + enable_pin: !PC7 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC0 + position_endstop: 0 + position_max: 230 + homing_speed: 80 + +[stepper_y] + step_pin: PB10 + dir_pin: PB2 + enable_pin: !PB11 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC1 + position_endstop: 230 + position_max: 230 + homing_speed: 80 + +[stepper_z] + step_pin: PB0 + dir_pin: !PC5 + enable_pin: !PB1 + microsteps: 16 + rotation_distance: 8 + endstop_pin: ^!PC2 + position_endstop: 207.890 + position_max: 232 + position_min: -10 + homing_speed: 40 + +[extruder] + step_pin: PB3 + dir_pin: PB4 + enable_pin: !PD5 + 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 + +[filament_switch_sensor extruder_filament_sensor] + switch_pin: ^!PC15 + +# [heater_bed] +# heater_pin: PD8 +# sensor_type: Generic 3950 +# sensor_pin: PC4 +# control = pid +# pid_kp = 62.901 +# pid_ki = 1.808 +# pid_kd = 547.241 +# min_temp: 0 +# max_temp: 120 + +[fan] +pin: PD2 + +[led WhiteLeds] +white_pin: PD4 +initial_WHITE: 0.7 + + + + +############################## +# 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 + +[bed_mesh] + speed: 120 + horizontal_move_z: 5 + mesh_min: 15, 50 + mesh_max: 190, 200 + probe_count: 3, 3 + +######################################## +# TMC2209 configuration +######################################## + +[tmc2209 stepper_x] + uart_pin: PB12 + run_current: 0.800 + +[tmc2209 stepper_y] + uart_pin: PC10 + run_current: 0.800 + +[tmc2209 stepper_z] + uart_pin: PC9 + run_current: 0.800 + +[tmc2209 extruder] + uart_pin: PA13 + run_current: 0.600 + + + +[include mainsail.cfg] + +#*# <---------------------- SAVE_CONFIG ----------------------> +#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. +#*# +#*# [extruder] +#*# +#*# [bed_mesh default] +#*# version = 1 +#*# points = +#*# 1.365000, 1.185000, 1.137500 +#*# 1.200000, 1.020000, 0.882500 +#*# 1.045000, 0.922500, 0.785000 +#*# x_count = 3 +#*# y_count = 3 +#*# mesh_x_pps = 2 +#*# mesh_y_pps = 2 +#*# algo = lagrange +#*# tension = 0.2 +#*# min_x = 15.0 +#*# max_x = 190.0 +#*# min_y = 50.0 +#*# max_y = 200.0 diff --git a/printer-20221214_182555.cfg b/printer-20221214_182555.cfg new file mode 100644 index 0000000..4113b95 --- /dev/null +++ b/printer-20221214_182555.cfg @@ -0,0 +1,157 @@ +# This file contains common pin mappings for the BIGTREETECH Manta M4P +# To use this config, the firmware should be compiled for the +# STM32G0B1 with a "8KiB bootloader" and USB communication. + +# See docs/Config_Reference.md for a description of parameters. + +[printer] +kinematics: cartesian +max_velocity: 180 +max_accel: 3000 +max_z_velocity: 100 +max_z_accel: 100 + +[mcu] +#serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 +serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_27004F000A50414733303120-if00 + + +[mcu EBBCan] + canbus_uuid: 82edf63bd1a9 + +[include toolhead.cfg] + +[stepper_x] + step_pin: PC6 + dir_pin: !PA14 + enable_pin: !PC7 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC0 + position_endstop: 0 + position_max: 230 + homing_speed: 80 + +[stepper_y] + step_pin: PB10 + dir_pin: PB2 + enable_pin: !PB11 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC1 + position_endstop: 230 + position_max: 230 + homing_speed: 80 + +[stepper_z] + step_pin: PB0 + dir_pin: !PC5 + enable_pin: !PB1 + microsteps: 16 + rotation_distance: 8 + endstop_pin: ^!PC2 + position_endstop: 207.890 + position_max: 232 + position_min: -10 + homing_speed: 40 + +[extruder] + step_pin: PB3 + dir_pin: PB4 + enable_pin: !PD5 + microsteps: 16 + rotation_distance: 10.07 + nozzle_diameter: 0.400 + filament_diameter: 1.74 + heater_pin: EBBCan: PB13 + control: pid + pid_Kp: 73.623 + pid_Ki: 1.588 + pid_Kd: 853.108 + 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 + +[filament_switch_sensor extruder_filament_sensor] + switch_pin: ^!PC15 + +[heater_bed] + heater_pin: PD8 + sensor_type: MAX31865 + spi_speed: 400000 + spi_bus: spi1 + sensor_pin: PD9 + min_temp: 0 + max_temp: 120 + rtd_nominal_r: 100 + rtd_reference_r: 430 + control = pid + pid_kp = 62.901 + pid_ki = 1.808 + pid_kd = 547.241 + + +[fan] +pin: PD2 + +[led WhiteLeds] +white_pin: PD4 +initial_WHITE: 0.7 + + + + +############################## +# 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 + +[bed_mesh] + speed: 120 + horizontal_move_z: 5 + mesh_min: 15, 50 + mesh_max: 190, 200 + probe_count: 3, 3 + +######################################## +# TMC2209 configuration +######################################## + +[tmc2209 stepper_x] + uart_pin: PB12 + run_current: 0.800 + +[tmc2209 stepper_y] + uart_pin: PC10 + run_current: 0.800 + +[tmc2209 stepper_z] + uart_pin: PC9 + run_current: 0.800 + +[tmc2209 extruder] + uart_pin: PA13 + run_current: 0.600 + + + +[include mainsail.cfg] + +#*# <---------------------- SAVE_CONFIG ----------------------> +#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. +#*# +#*# [extruder] diff --git a/printer-20221214_191039.cfg b/printer-20221214_191039.cfg new file mode 100644 index 0000000..2b628d7 --- /dev/null +++ b/printer-20221214_191039.cfg @@ -0,0 +1,156 @@ +# This file contains common pin mappings for the BIGTREETECH Manta M4P +# To use this config, the firmware should be compiled for the +# STM32G0B1 with a "8KiB bootloader" and USB communication. + +# See docs/Config_Reference.md for a description of parameters. + +[printer] +kinematics: cartesian +max_velocity: 180 +max_accel: 3000 +max_z_velocity: 100 +max_z_accel: 100 + +[mcu] +#serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 +serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_27004F000A50414733303120-if00 + + +[mcu EBBCan] + canbus_uuid: 82edf63bd1a9 + +[include toolhead.cfg] + +[stepper_x] + step_pin: PC6 + dir_pin: !PA14 + enable_pin: !PC7 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC0 + position_endstop: 0 + position_max: 220 + homing_speed: 80 + +[stepper_y] + step_pin: PB10 + dir_pin: PB2 + enable_pin: !PB11 + microsteps: 16 + rotation_distance: 40 + endstop_pin: ^!PC1 + position_endstop: 220 + position_max: 220 + homing_speed: 80 + +[stepper_z] + step_pin: PB0 + dir_pin: !PC5 + enable_pin: !PB1 + microsteps: 16 + rotation_distance: 8 + endstop_pin: ^!PC2 + position_endstop: 207.890 + position_max: 232 + position_min: -10 + homing_speed: 40 + +[extruder] + step_pin: PB3 + dir_pin: !PB4 + enable_pin: !PD5 + 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 + + + +[filament_switch_sensor extruder_filament_sensor] + switch_pin: ^!PC15 + +[heater_bed] + heater_pin: PD8 + sensor_type: MAX31865 + spi_speed: 400000 + spi_bus: spi1 + sensor_pin: PD9 + min_temp: 0 + max_temp: 120 + rtd_nominal_r: 100 + rtd_reference_r: 430 + control = pid + pid_kp = 62.901 + pid_ki = 1.808 + pid_kd = 547.241 + + +[fan] +pin: PD2 + +[led WhiteLeds] +white_pin: PD4 +initial_WHITE: 0.7 + + + + +############################## +# 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 + +[bed_mesh] + speed: 150 + horizontal_move_z: 5 + mesh_min: 15, 50 + mesh_max: 190, 200 + probe_count: 5, 5 + +######################################## +# TMC2209 configuration +######################################## + +[tmc2209 stepper_x] + uart_pin: PB12 + run_current: 0.800 + +[tmc2209 stepper_y] + uart_pin: PC10 + run_current: 0.800 + +[tmc2209 stepper_z] + uart_pin: PC9 + run_current: 0.800 + +[tmc2209 extruder] + uart_pin: PA13 + run_current: 0.600 + + + +[include mainsail.cfg] + + diff --git a/printer.cfg b/printer.cfg old mode 100755 new mode 100644 index d0d6c50..2c36f35 --- a/printer.cfg +++ b/printer.cfg @@ -12,7 +12,8 @@ max_z_velocity: 100 max_z_accel: 100 [mcu] -serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 +#serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 +serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_27004F000A50414733303120-if00 [mcu EBBCan] @@ -28,7 +29,7 @@ serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 rotation_distance: 40 endstop_pin: ^!PC0 position_endstop: 0 - position_max: 230 + position_max: 220 homing_speed: 80 [stepper_y] @@ -38,8 +39,8 @@ serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 microsteps: 16 rotation_distance: 40 endstop_pin: ^!PC1 - position_endstop: 230 - position_max: 230 + position_endstop: 220 + position_max: 220 homing_speed: 80 [stepper_z] @@ -56,7 +57,7 @@ serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 [extruder] step_pin: PB3 - dir_pin: PB4 + dir_pin: !PB4 enable_pin: !PD5 microsteps: 16 rotation_distance: 10.07 @@ -77,19 +78,26 @@ serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_hurakan-if00 rtd_num_of_wires: 2 pressure_advance: 0.78 + + [filament_switch_sensor extruder_filament_sensor] switch_pin: ^!PC15 -# [heater_bed] -# heater_pin: PD8 -# sensor_type: Generic 3950 -# sensor_pin: PC4 -# control = pid -# pid_kp = 62.901 -# pid_ki = 1.808 -# pid_kd = 547.241 -# min_temp: 0 -# max_temp: 120 +[heater_bed] + heater_pin: PD8 + sensor_type: MAX31865 + spi_speed: 400000 + spi_bus: spi1 + sensor_pin: PD9 + min_temp: 0 + max_temp: 120 + rtd_nominal_r: 100 + rtd_reference_r: 430 + control = pid + pid_kp = 62.901 + pid_ki = 1.808 + pid_kd = 547.241 + [fan] pin: PD2 @@ -115,11 +123,16 @@ initial_WHITE: 0.7 horizontal_move_z: 5 [bed_mesh] - speed: 120 + speed: 150 horizontal_move_z: 5 mesh_min: 15, 50 mesh_max: 190, 200 - probe_count: 3, 3 + probe_count: 5, 5 + +[bltouch] + sensor_pin: ^EBBCan:PB8 + control_pin: EBBCan:PB9 + z_offset: 1.210 ######################################## # TMC2209 configuration @@ -148,17 +161,16 @@ initial_WHITE: 0.7 #*# <---------------------- SAVE_CONFIG ----------------------> #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# -#*# -#*# [extruder] -#*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.725000, 0.715000, 0.660000, 0.610000, 0.570000 -#*# 0.660000, 0.650000, 0.600000, 0.575000, 0.485000 -#*# 0.695000, 0.650000, 0.605000, 0.585000, 0.495000 +#*# 0.862500, 0.700000, 0.632500, 0.605000, 0.615000 +#*# 0.902500, 0.810000, 0.715000, 0.602500, 0.547500 +#*# 0.922500, 0.830000, 0.770000, 0.657500, 0.567500 +#*# 1.000000, 0.955000, 0.875000, 0.707500, 0.635000 +#*# 1.080000, 1.020000, 0.965000, 0.785000, 0.730000 #*# x_count = 5 -#*# y_count = 3 +#*# y_count = 5 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 #*# algo = lagrange @@ -166,4 +178,4 @@ initial_WHITE: 0.7 #*# min_x = 15.0 #*# max_x = 190.0 #*# min_y = 50.0 -#*# max_y = 200.0 \ No newline at end of file +#*# max_y = 200.0 diff --git a/toolhead.cfg b/toolhead.cfg index eb624ee..2e8fc99 100644 --- a/toolhead.cfg +++ b/toolhead.cfg @@ -23,21 +23,5 @@ heater: extruder heater_temp: 50.0 -[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 - -#[filament_motion_sensor motion_sensor] -#switch_pin: ^EBBCan:PB3