5 files changed, 247 insertions, 107 deletions
diff --git a/config/printer-twotrees-sapphire-plus-2020.cfg b/config/printer-twotrees-sapphire-plus-sp-5-v1-2020.cfg
index 5e06d870..02b39f92 100644
--- a/config/printer-twotrees-sapphire-plus-2020.cfg
+++ b/config/printer-twotrees-sapphire-plus-sp-5-v1-2020.cfg
@@ -1,18 +1,20 @@
 # This file contains common pin mappings for the Two Trees Sapphire
-# Plus printer from 2020 (revision 2 with dual Z axis).
+# Plus V1 (SP-5) printer (Robin Nano 1.2, 2208 drivers for X,Y and A4988 for Zs,E).
 
+# INSTRUCTIONS FOR COMPILING
 # To use this config, the firmware should be compiled for the STM32F103.
-# When running "make menuconfig" you have to:
-# - enable "extra low-level configuration setup",
-# - select the 28KiB bootloader,
-# - select serial (on USART3 PB11/PB10) communication
-# - set "GPIO pins to set at micro-controller startup" to "!PC6,!PD13"
+# When running "make menuconfig", enable "extra low-level configuration setup",
+# select the 28KiB bootloader, serial (on USART3 PB11/PB10) to use USB communication
+# or serial (on USART1 PA10/PA9) to use direct UART connection with Raspberry trough wifi pins.
+# Set "GPIO pins to set at micro-controller startup" to "!PC6,!PD13" to turn off display at startup.
 
-# Note that the "make flash" command does not work with the Sapphire
-# Pro. After running "make", run the following command:
+# INSTRUCTIONS FOR FLASHING, THE SCRIPT IS COMPULSORY OR IT WON'T WORK!!!
+# Note that the "make flash" command does not work with the Robin Nano!
+# After running "make", run the following command in one row FROM THE KLIPPER FOLDER:
 #   ./scripts/update_mks_robin.py out/klipper.bin out/Robin_nano35.bin
-# Copy the file out/Robin_nano35.bin to an SD card and then restart the
-# printer with that SD card.
+# Copy the file out/Robin_nano35.bin (if you can't find the file the script was not executed)
+# to an SD card and then restart the printer with that SD card.
+# If you removed the LCD screen rename the file to "Robin_nano43.bin" for correct flashing.
 
 # See docs/Config_Reference.md for a description of parameters.
 
@@ -54,12 +56,11 @@ dir_pin: PA1
 enable_pin: !PA3
 microsteps: 16
 rotation_distance: 8
-endstop_pin: !PC4
 
 [extruder]
 step_pin: PD6
 dir_pin: !PD3
-enable_pin: !PB3
+enable_pin: PB3
 microsteps: 16
 gear_ratio: 50:17
 rotation_distance: 23.52
@@ -86,6 +87,9 @@ pid_Kp: 325.10
 pid_Ki: 63.35
 pid_Kd: 417.10
 
+[heater_fan extruder]
+pin: PB0
+
 [fan]
 pin: PB1
 
@@ -97,8 +101,14 @@ restart_method: command
 kinematics: corexy
 max_velocity: 250
 max_accel: 4500
-max_z_velocity: 25
+max_z_velocity: 15
 max_z_accel: 100
 
+[bed_screws]
+screw1: 35,35
+screw2: 275,35
+screw3: 275,275
+screw4: 35,275
+
 [static_digital_output reset_display]
 pins: !PC6, !PD13
diff --git a/config/printer-twotrees-sapphire-plus-sp-5-v1.1-2021.cfg b/config/printer-twotrees-sapphire-plus-sp-5-v1.1-2021.cfg
new file mode 100644
index 00000000..6c810e9c
--- /dev/null
+++ b/config/printer-twotrees-sapphire-plus-sp-5-v1.1-2021.cfg
@@ -0,0 +1,114 @@
+# This file contains common pin mappings for the Two Trees Sapphire
+# Plus V1.1 (SP-5) printer (Robin Nano 1.2, all 2225 drivers at 32 microsteps).
+
+# INSTRUCTIONS FOR COMPILING
+# To use this config, the firmware should be compiled for the STM32F103.
+# When running "make menuconfig", enable "extra low-level configuration setup",
+# select the 28KiB bootloader, serial (on USART3 PB11/PB10) to use USB communication
+# or serial (on USART1 PA10/PA9) to use direct UART connection with Raspberry trough wifi pins.
+# Set "GPIO pins to set at micro-controller startup" to "!PC6,!PD13" to turn off display at startup.
+
+# INSTRUCTIONS FOR FLASHING, THE SCRIPT IS COMPULSORY OR IT WON'T WORK!!!
+# Note that the "make flash" command does not work with the Robin Nano!
+# After running "make", run the following command in one row FROM THE KLIPPER FOLDER:
+#   ./scripts/update_mks_robin.py out/klipper.bin out/Robin_nano35.bin
+# Copy the file out/Robin_nano35.bin (if you can't find the file the script was not executed)
+# to an SD card and then restart the printer with that SD card.
+# If you removed the LCD screen rename the file to "Robin_nano43.bin" for correct flashing.
+
+# See docs/Config_Reference.md for a description of parameters.
+
+[stepper_x]
+step_pin: PE3
+dir_pin: !PE2
+enable_pin: !PE4
+microsteps: 32
+rotation_distance: 40
+endstop_pin: !PA15
+position_endstop: 0
+position_max: 300
+homing_speed: 50
+
+[stepper_y]
+step_pin: PE0
+dir_pin: !PB9
+enable_pin: !PE1
+microsteps: 32
+rotation_distance: 40
+endstop_pin: !PA12
+position_endstop: 300
+position_max: 300
+homing_speed: 50
+
+[stepper_z]
+step_pin: PB5
+dir_pin: !PB4
+enable_pin: !PB8
+microsteps: 32
+rotation_distance: 8
+endstop_pin: !PA11
+position_endstop: 0
+position_max: 340
+
+[stepper_z1]
+step_pin: PA6
+dir_pin: !PA1
+enable_pin: !PA3
+microsteps: 32
+rotation_distance: 8
+
+[extruder]
+step_pin: PD6
+dir_pin: !PD3
+enable_pin: !PB3
+microsteps: 32
+gear_ratio: 50:17
+rotation_distance: 23.52
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: PC3
+sensor_type: EPCOS 100K B57560G104F # Stock
+sensor_pin: PC1
+min_temp: 0
+max_temp: 250
+control: pid
+pid_Kp: 17.48
+pid_Ki: 1.32
+pid_Kd: 57.81
+
+[heater_bed]
+heater_pin: PA0
+sensor_type: EPCOS 100K B57560G104F # Stock
+sensor_pin: PC0
+min_temp: 0
+max_temp: 130
+control: pid
+pid_Kp: 325.10
+pid_Ki: 63.35
+pid_Kd: 417.10
+
+[heater_fan extruder]
+pin: PB0
+
+[fan]
+pin: PB1
+
+[mcu]
+serial: /dev/ttyUSB0
+restart_method: command
+
+[printer]
+kinematics: corexy
+max_velocity: 250
+max_accel: 4500
+max_z_velocity: 15
+max_z_accel: 100
+
+[bed_screws]
+screw1: 35,35
+screw2: 275,35
+screw3: 275,275
+screw4: 35,275
+
+[static_digital_output reset_display]
+pins: !PC6, !PD13
diff --git a/config/printer-twotrees-sapphire-pro-2020.cfg b/config/printer-twotrees-sapphire-pro-2020.cfg
deleted file mode 100644
index 8bf610bb..00000000
--- a/config/printer-twotrees-sapphire-pro-2020.cfg
+++ /dev/null
@@ -1,92 +0,0 @@
-# This file contains common pin mappings for the Two Trees Sapphire
-# Pro printer from 2020. To use this config, the firmware should be
-# compiled for the STM32F103. When running "make menuconfig", enable
-# "extra low-level configuration setup", select the 28KiB bootloader,
-# serial (on USART3 PB11/PB10) communication, and set "GPIO pins to
-# set at micro-controller startup" to "!PC6,!PD13".
-
-# Note that the "make flash" command does not work with the Sapphire
-# Pro. After running "make", run the following command:
-#   ./scripts/update_mks_robin.py out/klipper.bin out/Robin_nano35.bin
-# Copy the file out/Robin_nano35.bin to an SD card and then restart the
-# printer with that SD card.
-
-# See docs/Config_Reference.md for a description of parameters.
-
-[stepper_x]
-step_pin: PE3
-dir_pin: !PE2
-enable_pin: !PE4
-microsteps: 16
-rotation_distance: 32
-endstop_pin: !PA15
-position_endstop: 0
-position_max: 230
-homing_speed: 50
-
-[stepper_y]
-step_pin: PE0
-dir_pin: !PB9
-enable_pin: !PE1
-microsteps: 16
-rotation_distance: 32
-endstop_pin: !PA12
-position_endstop: 230
-position_max: 230
-homing_speed: 50
-
-[stepper_z]
-step_pin: PB5
-dir_pin: PB4
-enable_pin: !PB8
-microsteps: 16
-rotation_distance: 8
-endstop_pin: !PA11
-position_endstop: 0.5
-position_max: 230
-
-[extruder]
-step_pin: PD6
-dir_pin: !PD3
-enable_pin: !PB3
-microsteps: 16
-rotation_distance: 6.720
-nozzle_diameter: 0.400
-filament_diameter: 1.750
-heater_pin: PC3
-sensor_type: ATC Semitec 104GT-2
-sensor_pin: PC1
-control: pid
-pid_Kp: 14.669
-pid_Ki: 0.572
-pid_Kd: 94.068
-min_temp: 0
-max_temp: 250
-
-[heater_bed]
-heater_pin: PA0
-sensor_type: EPCOS 100K B57560G104F
-sensor_pin: PC0
-control: pid
-pid_Kp: 325.10
-pid_Ki: 63.35
-pid_Kd: 417.10
-min_temp: 0
-max_temp: 130
-
-[fan]
-pin: PB1
-
-[mcu]
-serial: /dev/ttyUSB0
-restart_method: command
-
-[printer]
-kinematics: corexy
-max_velocity: 250
-max_accel: 4500
-max_z_velocity: 25
-max_z_accel: 100
-
-[static_digital_output reset_display]
-pins: !PC6, !PD13
diff --git a/config/printer-twotrees-sapphire-pro-sp-3-2020.cfg b/config/printer-twotrees-sapphire-pro-sp-3-2020.cfg
new file mode 100644
index 00000000..bacfcb8a
--- /dev/null
+++ b/config/printer-twotrees-sapphire-pro-sp-3-2020.cfg
@@ -0,0 +1,107 @@
+# This file contains common pin mappings for the Two Trees Sapphire
+# Pro (SP-3) printer (Robin Nano 1.2, 2208 drivers for X,Y and A4988 for Z,E).
+
+# INSTRUCTIONS FOR COMPILING
+# To use this config, the firmware should be compiled for the STM32F103.
+# When running "make menuconfig", enable "extra low-level configuration setup",
+# select the 28KiB bootloader, serial (on USART3 PB11/PB10) to use USB communication
+# or serial (on USART1 PA10/PA9) to use direct UART connection with Raspberry trough wifi pins.
+# Set "GPIO pins to set at micro-controller startup" to "!PC6,!PD13" to turn off display at startup.
+
+# INSTRUCTIONS FOR FLASHING, THE SCRIPT IS COMPULSORY OR IT WON'T WORK!!!
+# Note that the "make flash" command does not work with the Robin Nano!
+# After running "make", run the following command in one row FROM THE KLIPPER FOLDER:
+#   ./scripts/update_mks_robin.py out/klipper.bin out/Robin_nano35.bin
+# Copy the file out/Robin_nano35.bin (if you can't find the file the script was not executed)
+# to an SD card and then restart the printer with that SD card.
+# If you removed the LCD screen rename the file to "Robin_nano43.bin" for correct flashing.
+
+# See docs/Config_Reference.md for a description of parameters.
+
+[stepper_x]
+step_pin: PE3
+dir_pin: !PE2
+enable_pin: !PE4
+microsteps: 16
+rotation_distance: 40
+endstop_pin: !PA15
+position_endstop: 0
+position_max: 230
+homing_speed: 50
+
+[stepper_y]
+step_pin: PE0
+dir_pin: !PB9
+enable_pin: !PE1
+microsteps: 16
+rotation_distance: 40
+endstop_pin: !PA12
+position_endstop: 230
+position_max: 230
+homing_speed: 50
+
+[stepper_z]
+step_pin: PB5
+dir_pin: PB4
+enable_pin: !PB8
+microsteps: 16
+rotation_distance: 2
+endstop_pin: !PA11
+position_endstop: 0.5
+position_max: 230
+
+[extruder]
+step_pin: PD6
+dir_pin: !PD3
+enable_pin: !PB3
+microsteps: 16
+gear_ratio: 50:17
+rotation_distance: 23.52
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: PC3
+sensor_type: ATC Semitec 104GT-2
+sensor_pin: PC1
+control: pid
+pid_Kp: 14.669
+pid_Ki: 0.572
+pid_Kd: 94.068
+min_temp: 0
+max_temp: 250
+
+[heater_bed]
+heater_pin: PA0
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: PC0
+control: pid
+pid_Kp: 325.10
+pid_Ki: 63.35
+pid_Kd: 417.10
+min_temp: 0
+max_temp: 130
+
+[heater_fan extruder]
+pin: PB0
+
+[fan]
+pin: PB1
+
+[mcu]
+serial: /dev/ttyUSB0
+restart_method: command
+
+[printer]
+kinematics: corexy
+max_velocity: 250
+max_accel: 4500
+max_z_velocity: 10
+max_z_accel: 80
+
+[bed_screws]
+screw1: 15,15
+screw2: 210,15
+screw3: 210,210
+screw4: 15,210
+
+[static_digital_output reset_display]
+pins: !PC6, !PD13
diff --git a/test/klippy/printers.test b/test/klippy/printers.test
index 62964672..975569b9 100644
--- a/test/klippy/printers.test
+++ b/test/klippy/printers.test
@@ -173,8 +173,9 @@ CONFIG ../../config/printer-fokoos-odin5-f3-2021.cfg
 CONFIG ../../config/printer-tronxy-x5sa-v6-2019.cfg
 CONFIG ../../config/printer-tronxy-x5sa-pro-2020.cfg
 CONFIG ../../config/printer-tronxy-xy-2-Pro-2020.cfg
-CONFIG ../../config/printer-twotrees-sapphire-pro-2020.cfg
-CONFIG ../../config/printer-twotrees-sapphire-plus-2020.cfg
+CONFIG ../../config/printer-twotrees-sapphire-plus-sp-5-v1-2020.cfg
+CONFIG ../../config/printer-twotrees-sapphire-plus-sp-5-v1.1-2021.cfg
+CONFIG ../../config/printer-twotrees-sapphire-pro-sp-3-2020.cfg
 
 # Printers using the stm32f407
 DICTIONARY stm32f407.dict