Update OctopusPro V1.1

Difference between Octopus Pro V1.0 and V1.1 managed via line selection (uncomment selection)
MirageC79 · Nov 1, 2023 · c620bad · c620bad
1 parent 358a5c5
commit c620bad
Showing 1 changed file with 102 additions and 51 deletions.
diff --git a/firmware/klipper/Config_Goliath_XY48VDC/printer_Goliath_XY48VDC.cfg b/firmware/klipper/Config_Goliath_XY48VDC/printer_Goliath_XY48VDC.cfg
@@ -3,29 +3,33 @@
 ####################################################################
 # This file contains example configuration for Klipper running on: #
 #                                                                  #
-# PRINTER: HevORT 315*315*340 (HDx and WobbleX affecting limits)   #
-# CONTROL_BOARD: OctopusPro V1.0 RefDoc: https://github.com/bigtreetech/BIGTREETECH-OCTOPUS-Pro #
+# PRINTER: HevORT 315*315*340                                      #
+# CONTROL_BOARD: OctopusPro V1.0 or V1.1                           #
+#   RefDoc: https://github.com/bigtreetech/BIGTREETECH-OCTOPUS-Pro #
+#   OctopusPro V1.0 vs V1.1: https://github.com/bigtreetech/BIGTREETECH-OCTOPUS-Pro#changes-in-v11-compared-to-v10 # 
+#                                                                  #
 # OPTIONS: a) 48V on X,Y,E using BTT HV5160                        #
-#          b) HeVACS                                               #
+#          b) HevACS                                               #
 #                                                                  #
 # Config example created by:                                       #
 # Date: MirageC Feb 1st, 2022                                      #
-# Last Update: Sept 12, 2023                                       #
+# Last Updated: Nov 1st, 2023                                      #
 ####################################################################
 
 ################## CONTROL BOARD PIN DEFINITION ####################
-#  ______________________________________________________________
-# | DRIVE | STEP pin | DIR pin  | EN pin   | CS PIN   | END_STOP |
-# |-------|----------|----------|----------|----------|----------|
-# | 0     | PF13     | PF12     | PF14     | PC4      | PG6      |
-# | 1     | PG0      | PG1      | PF15     | PD11     | PG9      |
-# | 2.1&2 | PF11     | PG3      | PG5      | PC6      | PG10     |
-# | 3     | PG4      | PC1      | PA0      | PC7      | PG11     |
-# | 4     | PF9      | PF10     | PG2      | PF2      | PG12     |
-# | 5     | PC13     | PF0      | PF1      | PE4      | PG13     |
-# | 6     | PE2      | PE3      | PD4      | PE1      | PG14     |
-# | 7     | PE6      | PA14     | PE0      | PD3      | PG15     |
-# |_______|__________|__________|__________|__________|__________|
+#  __________________________________________________________________
+# | DRIVE     | STEP pin | DIR pin  | EN pin   | CS PIN   | END_STOP |
+# |-----------|----------|----------|----------|----------|----------|
+# | 0         | PF13     | PF12     | PF14     | PC4      | PG6      |
+# | 1         | PG0      | PG1      | PF15     | PD11     | PG9      |
+# | 2.1&2     | PF11     | PG3      | PG5      | PC6      | PG10     |
+# | 3 on V1.0 | PG4      | PC1      | 1.0: PA0 | PC7      | PG11     | 
+# | 3 on V1.1 | Same     | Same     | 1.1: PA2 | Same     | Same     | 
+# | 4         | PF9      | PF10     | PG2      | PF2      | PG12     |
+# | 5         | PC13     | PF0      | PF1      | PE4      | PD13     |
+# | 6         | PE2      | PE3      | PD4      | PE1      | PD14     |
+# | 7         | PE6      | PA14     | PE0      | PD3      | PD15     |
+# |___________|__________|__________|__________|__________|__________|
 #  ___________________ 
 # | FAN   |    PIN    |
 # |-------|-----------|
@@ -38,15 +42,17 @@
 # | FAN6  | ALWAYS_ON |
 # | FAN7  | ALWAYS_ON |
 # | ______|___________|
-#  ________________________________
-# | HEATER |  HEAT pin |  TEMP pin |
-# |--------|-----------|-----------|
-# | BED    | PA1       | (TB) PF3  |
-# | HE0    | PA2       | (TO) PF4  |
-# | HE1    | PA3       | (T1) PF5  |
-# | HE2    | PB10      | (T2) PF6  |
-# | HE3    | PB11      | (T3) PF7  |
-# |________|___________|___________|
+#  _____________________________________
+# | HEATER      |  HEAT pin |  TEMP pin |
+# |-------------|-----------|-----------|
+# | BED         | PA1       | (TB) PF3  |
+# | HE0 on V1.0 | 1.0: PA2  | (TO) PF4  |
+# | HE0 on V1.1 | 1.1: PA0  | Same      |
+# | HE1         | PA3       | (T1) PF5  |
+# | HE2 on V1.0 | V1.0 PB10 | (T2) PF6  |
+# | HE2 on V1.1	| V1.1: PB0 | Same      |
+# | HE3         | PB11      | (T3) PF7  |
+# |_____________|___________|___________|
 #  _________________
 # | SPI    | PIN    |
 # |--------|--------|
@@ -55,6 +61,12 @@
 # | SCK    | PA5    |
 # |________|________|
 
+#  _________________
+# | RGB    | PIN    |
+# |--------|--------|
+# | V1.0   | PB0    |
+# | V1.1   | PB10   |
+# |________|________|
 
 ####################################################################
 ############################## MCU #################################
@@ -90,6 +102,9 @@ filename: ~/klipper_config/saved_variables.cfg
 
 [exclude_object]
 
+[gcode_arcs]  #Required for OrcaSlicer when using Z-hop. Orca does spiral wipes and needs G2/G3 to do so.
+#resolution: 1.0
+
 
 
 ####################################################################
@@ -152,15 +167,29 @@ cs_pin: PC4
 spi_bus: spi1
 interpolate: false
 run_current: 2.2
-
+#____________________ Stepper Driver Tuning _________________________
 # TMC Tuning: https://github.com/MakerBogans/docs/wiki/TMC-Driver-Tuning
+# HevORT Discord Thread: https://discord.com/channels/790612368056647682/1159156354397778000
 # TMC5160 Calc sheet: https://www.analog.com/media/en/engineering-tools/design-tools/TMC5160_Calculations.xlsx
 # BTT5160PRO V1.1 datasheet: https://github.com/bigtreetech/BIGTREETECH-Stepper-Motor-Driver/blob/master/TMC5160%20Pro%20V1.1/BIGTREETECH%20TMC5160%20PRO-V1.1%20user%20manual.pdf
 # LDO-42STH48-2804AH: https://northprint3d.ca/wp-content/uploads/2023/04/HT_LDO-42STH48-2804AH_RevA.pdf
-driver_TBL: 1
-driver_TOFF: 3
-driver_HSTRT: 7
-driver_HEND: 11   	
+#driver_TBL: 1
+#driver_TOFF: 5
+#driver_HSTRT: 7
+#driver_HEND: 9   	
+#driver_TPFD: 0
+
+#driver_W0: 2
+#driver_W1: 0
+#driver_W2: 0
+#driver_W3: 0
+#driver_X1: 128
+#driver_X2: 155
+#driver_X3: 155
+#driver_START_SIN: 0
+#driver_START_SIN90: 247
+
+
 
 #____________________ ACTIVE Y On Drive 1 __________________________
 [stepper_y]           
@@ -187,15 +216,27 @@ spi_bus: spi1
 #stealthchop_threshold: 0
 interpolate: false
 run_current: 2.2	
-
+#____________________ Stepper Driver Tuning _________________________
 # TMC Tuning: https://github.com/MakerBogans/docs/wiki/TMC-Driver-Tuning
+# HevORT Discord Thread: https://discord.com/channels/790612368056647682/1159156354397778000
 # TMC5160 Calc sheet: https://www.analog.com/media/en/engineering-tools/design-tools/TMC5160_Calculations.xlsx
 # BTT5160PRO V1.1 datasheet: https://github.com/bigtreetech/BIGTREETECH-Stepper-Motor-Driver/blob/master/TMC5160%20Pro%20V1.1/BIGTREETECH%20TMC5160%20PRO-V1.1%20user%20manual.pdf
 # LDO-42STH48-2804AH: https://northprint3d.ca/wp-content/uploads/2023/04/HT_LDO-42STH48-2804AH_RevA.pdf
-driver_TBL: 1
-driver_TOFF: 3
-driver_HSTRT: 7
-driver_HEND: 11   	
+#driver_TBL: 1
+#driver_TOFF: 5
+#driver_HSTRT: 7
+#driver_HEND: 9   	
+#driver_TPFD: 0	
+
+#driver_W0: 2
+#driver_W1: 0
+#driver_W2: 0
+#driver_W3: 0
+#driver_X1: 128
+#driver_X2: 155
+#driver_X3: 155
+#driver_START_SIN: 0
+#driver_START_SIN90: 247
 
 
 
@@ -227,7 +268,10 @@ run_current: 1.1
 [stepper_z1]          
 step_pin: PG4
 dir_pin: !PC1
-enable_pin: !PA0
+# # BOARD VERSION SELECTION - UNCOMMENT ACCORDING TO YOUR BOARD #
+enable_pin: !PA0 #Drive 3 on OctopusPro V1.0
+#enable_pin: !PA2 #Drive 3 on OctopusPro V1.1
+
 microsteps: 64
 rotation_distance: 4 				
 full_steps_per_rotation: 400
@@ -344,11 +388,18 @@ rotation_distance: 4.44 #HextrudORT Old 4.53
 nozzle_diameter: 0.500
 filament_diameter: 1.750
 #____________________#### HEATER NOZZLE on HE0 ####_________________
-heater_pin: PA2
+# # BOARD VERSION SELECTION - UNCOMMENT ACCORDING TO YOUR BOARD #
+heater_pin: PA2 #Extruder Heater(HE0) on OctopusPro V1.0
+#heater_pin: PB10 #Extruder Heater(HE0) on OctopusPro V1.1
 
-#____________________ ACTIVE - PT1000 connectd Directly _____________
-sensor_type: PT1000    
+#____________________ ACTIVE - 104NT-4 connected Directly _____________
+sensor_type: ATC Semitec 104NT-4-R025H42G    
 sensor_pin: PF4
+pullup_resistor: 4700
+
+#____________________ INACTIVE - PT1000 connected Directly _____________
+#sensor_type: PT1000    
+#sensor_pin: PF4
 #control: pid
 #pid_Kp: 22.2
 #pid_Ki: 1.08
@@ -593,9 +644,9 @@ stepper: stepper_x,stepper_y
 #*#
 #*# [extruder]
 #*# control = pid
-#*# pid_kp = 26.119
-#*# pid_ki = 2.561
-#*# pid_kd = 66.604
+#*# pid_kp = 26.436
+#*# pid_ki = 3.092
+#*# pid_kd = 56.506
 #*#
 #*# [heater_bed]
 #*# control = pid
@@ -611,15 +662,15 @@ stepper: stepper_x,stepper_y
 #*#
 #*# [beacon model default]
 #*# model_coef = 1.545602323988444,
-#*# 	  1.8554353052931392,
-#*# 	  0.7295752079778517,
-#*# 	  0.3450595702166864,
-#*# 	  0.2793291331153727,
-#*# 	  0.22763966477892517,
-#*# 	  -0.05993380675643859,
-#*# 	  -0.11689764930080476,
-#*# 	  0.10538150692157604,
-#*# 	  0.09158209884578912
+#*# 	1.8554353052931392,
+#*# 	0.7295752079778517,
+#*# 	0.3450595702166864,
+#*# 	0.2793291331153727,
+#*# 	0.22763966477892517,
+#*# 	-0.05993380675643859,
+#*# 	-0.11689764930080476,
+#*# 	0.10538150692157604,
+#*# 	0.09158209884578912
 #*# model_domain = 3.2266349053574465e-07,3.340946095610527e-07
 #*# model_range = 0.200000,5.000000
 #*# model_temp = 35.608123