From 3387a9c23d940c7d449f197b272616eda11a5e3d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 24 Jul 2022 08:49:25 -0400 Subject: [PATCH] config: Use printer-creality-ender3-s1-2021.cfg for both s1 and s1 pro. Signed-off-by: Kevin O'Connor --- config/printer-creality-ender3-s1-2021.cfg | 11 +- config/printer-creality-ender3-s1pro-2022.cfg | 130 ------------------ test/klippy/printers.test | 1 - 3 files changed, 6 insertions(+), 136 deletions(-) delete mode 100644 config/printer-creality-ender3-s1pro-2022.cfg diff --git a/config/printer-creality-ender3-s1-2021.cfg b/config/printer-creality-ender3-s1-2021.cfg index 2be53726..bda56e75 100644 --- a/config/printer-creality-ender3-s1-2021.cfg +++ b/config/printer-creality-ender3-s1-2021.cfg @@ -1,9 +1,10 @@ # This file contains pin mappings for the stock 2021 Creality Ender 3 -# S1. To use this config, check the STM32 Chip on the V2.4S1 Board -# then during "make menuconfig" select either the STM32F103 with a -# "28KiB bootloader" or select the STM32F401 with a "64KiB bootloader" -# and serial (on USART1 PA10/PA9) communication for both depending on -# the STM32 chip installed on your printer's motherboard. +# S1 (and S1 pro). To use this config, check the STM32 Chip on the +# V2.4S1 Board then during "make menuconfig" select either the +# STM32F103 with a "28KiB bootloader" or select the STM32F401 with a +# "64KiB bootloader" and serial (on USART1 PA10/PA9) communication for +# both depending on the STM32 chip installed on your printer's +# motherboard. # If you prefer a direct serial connection, in "make menuconfig" # select "Enable extra low-level configuration options" and select diff --git a/config/printer-creality-ender3-s1pro-2022.cfg b/config/printer-creality-ender3-s1pro-2022.cfg deleted file mode 100644 index 349fd725..00000000 --- a/config/printer-creality-ender3-s1pro-2022.cfg +++ /dev/null @@ -1,130 +0,0 @@ -# This file contains pin mappings for the stock 2022 Creality Ender 3 -# S1 Pro. To use this config, check the STM32 Chip on the V2.4S1 Board -# then during "make menuconfig" select either the STM32F103 with a -# "28KiB bootloader" or select the STM32F401 with a "64KiB bootloader" -# and serial (on USART1 PA10/PA9) communication for both depending on -# the STM32 chip installed on your printer's motherboard. - -# If you prefer a direct serial connection, in "make menuconfig" -# select "Enable extra low-level configuration options" and select -# Serial (on USART2 PA3/PA2), which is broken out on the 10 pin IDC -# cable used for the LCD module as follows: -# 3: Tx, 4: Rx, 9: GND, 10: VCC - -# Flash this firmware by copying "out/klipper.bin" to a SD card and -# turning on the printer with the card inserted. The firmware -# filename must changed to "firmware.bin" - -# See docs/Config_Reference.md for a description of parameters. - -[stepper_x] -step_pin: PC2 -dir_pin: PB9 -enable_pin: !PC3 -microsteps: 16 -rotation_distance: 40 -endstop_pin: !PA5 -position_endstop: -10 -position_max: 235 -position_min: -15 -homing_speed: 50 - -[stepper_y] -step_pin: PB8 -dir_pin: PB7 -enable_pin: !PC3 -microsteps: 16 -rotation_distance: 40 -endstop_pin: !PA6 -position_endstop: -10 -position_max: 241 -position_min: -15 -homing_speed: 50 - -[stepper_z] -step_pin: PB6 -dir_pin: !PB5 -enable_pin: !PC3 -microsteps: 16 -rotation_distance: 8 -endstop_pin: probe:z_virtual_endstop -position_max: 270 -position_min: -4 - -[extruder] -step_pin: PB4 -dir_pin: PB3 -enable_pin: !PC3 -microsteps: 16 -gear_ratio: 42:12 -rotation_distance: 26.359 -nozzle_diameter: 0.400 -filament_diameter: 1.750 -heater_pin: PA1 -sensor_type: EPCOS 100K B57560G104F -sensor_pin: PC5 -control: pid -pid_Kp: 23.561 -pid_Ki: 1.208 -pid_Kd: 114.859 -min_temp: 0 -max_temp: 300 - -[heater_bed] -heater_pin: PA7 -sensor_type: EPCOS 100K B57560G104F -sensor_pin: PC4 -control: pid -pid_Kp: 71.867 -pid_Ki: 1.536 -pid_Kd: 840.843 -min_temp: 0 -max_temp: 110 - -[heater_fan hotend_fan] -pin: PC0 - -[fan] -pin: PA0 - -[mcu] -serial: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0 -restart_method: command - -[printer] -kinematics: cartesian -max_velocity: 300 -max_accel: 2000 -max_z_velocity: 5 -max_z_accel: 100 - -[bltouch] -sensor_pin: ^PC14 -control_pin: PC13 -x_offset: -31.8 -y_offset: -40.5 -z_offset: 0 -probe_with_touch_mode: true -stow_on_each_sample: false - -[bed_mesh] -speed: 120 -mesh_min: 20, 20 -mesh_max: 200, 200 -probe_count: 4,4 -algorithm: bicubic - -[safe_z_home] -home_xy_position: 147, 154 -speed: 75 -z_hop: 5 -z_hop_speed: 5 -move_to_previous: true - -[filament_switch_sensor e0_sensor] -switch_pin: !PC15 -pause_on_runout: true -runout_gcode: PAUSE - -[pause_resume] -recover_velocity: 25 diff --git a/test/klippy/printers.test b/test/klippy/printers.test index 4388fcb6..647aeb74 100644 --- a/test/klippy/printers.test +++ b/test/klippy/printers.test @@ -161,7 +161,6 @@ CONFIG ../../config/printer-creality-cr6se-2020.cfg CONFIG ../../config/printer-creality-cr6se-2021.cfg CONFIG ../../config/printer-creality-ender2pro-2021.cfg CONFIG ../../config/printer-creality-ender3-s1-2021.cfg -CONFIG ../../config/printer-creality-ender3-s1pro-2022.cfg CONFIG ../../config/printer-creality-ender3-v2-2020.cfg CONFIG ../../config/printer-creality-ender3max-2021.cfg CONFIG ../../config/printer-creality-ender3pro-2020.cfg