diff --git a/02-klipper/01-configuration/macros.cfg b/02-klipper/01-configuration/macros.cfg index ba49c8b..d31be31 100644 --- a/02-klipper/01-configuration/macros.cfg +++ b/02-klipper/01-configuration/macros.cfg @@ -617,4 +617,4 @@ gcode: G3 I-150 F3500 G2 I-150 F3500 G3 I-150 F3500 - G28 + G28 \ No newline at end of file diff --git a/02-klipper/01-configuration/printer.cfg b/02-klipper/01-configuration/printer.cfg index 2548536..0fbd366 100644 --- a/02-klipper/01-configuration/printer.cfg +++ b/02-klipper/01-configuration/printer.cfg @@ -72,7 +72,8 @@ [printer] kinematics: delta max_velocity: 600 -max_accel: 10000 +#max_accel: 10000 +max_accel: 8000 minimum_cruise_ratio: 0.5 square_corner_velocity: 5 max_z_velocity: 100 @@ -390,51 +391,115 @@ value: 1 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# #*# [probe] -#*# z_offset = 17.828 -#*# -#*# [endstop_phase stepper_a] -#*# trigger_phase = 77/256 -#*# -#*# [endstop_phase stepper_b] -#*# trigger_phase = 254/256 -#*# -#*# [endstop_phase stepper_c] -#*# trigger_phase = 207/256 +#*# z_offset = 18.168 #*# #*# [printer] -#*# delta_radius = 162.002474 +#*# delta_radius = 161.541152 #*# #*# [stepper_a] -#*# angle = 209.973682 -#*# arm_length = 344.755561 -#*# position_endstop = 419.986098 +#*# angle = 209.994009 +#*# arm_length = 343.333393 +#*# position_endstop = 420.376210 #*# #*# [stepper_b] -#*# angle = 329.779050 -#*# arm_length = 344.988509 -#*# position_endstop = 420.533328 +#*# angle = 329.645649 +#*# arm_length = 344.331987 +#*# position_endstop = 420.756046 #*# #*# [stepper_c] #*# angle = 90.000000 -#*# arm_length = 345.350100 -#*# position_endstop = 419.275934 +#*# arm_length = 344.669204 +#*# position_endstop = 419.508380 +#*# +#*# [heater_bed] +#*# control = pid +#*# pid_kp = 74.784 +#*# pid_ki = 2.652 +#*# pid_kd = 527.225 +#*# +#*# [extruder] +#*# control = pid +#*# pid_kp = 21.053 +#*# pid_ki = 1.105 +#*# pid_kd = 100.266 +#*# +#*# [endstop_phase stepper_a] +#*# trigger_phase = 74/256 +#*# +#*# [endstop_phase stepper_b] +#*# trigger_phase = 245/256 +#*# +#*# [endstop_phase stepper_c] +#*# trigger_phase = 206/256 +#*# +#*# [delta_calibrate] +#*# height0 = 18.168 +#*# height0_pos = 128667.375,128842.375,128439.875 +#*# height1 = 18.168 +#*# height1_pos = 154161.875,154427.000,115783.875 +#*# height2 = 18.168 +#*# height2_pos = 126664.375,168756.375,126450.375 +#*# height3 = 18.168 +#*# height3_pos = 116407.625,149915.250,149567.875 +#*# height4 = 18.168 +#*# height4_pos = 125537.375,125651.875,155145.875 +#*# height5 = 18.168 +#*# height5_pos = 146009.125,117173.625,145726.125 +#*# height6 = 18.168 +#*# height6_pos = 161542.000,126235.000,125771.000 +#*# distance0 = 64.916 +#*# distance0_pos1 = 133760.055,135025.270,134656.715 +#*# distance0_pos2 = 125622.695,143427.364,143109.896 +#*# distance1 = 64.964 +#*# distance1_pos1 = 134142.237,134259.915,135041.382 +#*# distance1_pos2 = 131208.634,131268.761,149862.826 +#*# distance2 = 65.09400000000001 +#*# distance2_pos1 = 134909.285,133883.101,134656.715 +#*# distance2_pos2 = 143404.654,125761.767,143109.896 +#*# distance3 = 64.86 +#*# distance3_pos1 = 135294.173,134267.191,133891.923 +#*# distance3_pos2 = 150167.980,131377.844,130953.810 +#*# distance4 = 64.986 +#*# distance4_pos1 = 134907.437,135032.603,133511.763 +#*# distance4_pos2 = 143373.363,143551.453,125396.095 +#*# distance5 = 65.096 +#*# distance5_pos1 = 134140.403,135413.904,133891.923 +#*# distance5_pos2 = 131181.142,150249.178,130953.810 +#*# distance6 = 64.966 +#*# distance6_pos1 = 126255.395,141679.009,142603.819 +#*# distance6_pos2 = 131802.918,130754.973,149226.859 +#*# distance7 = 65.042 +#*# distance7_pos1 = 131874.976,130830.442,147969.427 +#*# distance7_pos2 = 143656.328,125974.934,142105.296 +#*# distance8 = 64.98400000000001 +#*# distance8_pos1 = 142894.681,126395.826,141358.019 +#*# distance8_pos2 = 149528.288,131971.161,130436.606 +#*# distance9 = 65.07 +#*# distance9_pos1 = 148265.779,132040.434,130508.549 +#*# distance9_pos2 = 142365.402,143799.580,125605.775 +#*# distance10 = 64.938 +#*# distance10_pos1 = 141616.667,143036.549,126026.383 +#*# distance10_pos2 = 130663.479,149608.198,131546.374 +#*# distance11 = 65.096 +#*# distance11_pos1 = 130736.495,148349.483,131619.115 +#*# distance11_pos2 = 125833.738,142422.526,143361.643 #*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722, -0.042722 -#*# -0.103985, -0.103985, -0.103985, -0.103985, -0.092863, -0.041497, -0.029735, -0.024573, -0.009876, 0.303776, 0.303776, 0.303776, 0.303776 -#*# -0.107217, -0.107217, -0.107217, -0.095680, -0.078747, -0.041636, -0.027165, 0.001847, 0.040765, 0.030959, -0.001207, -0.001207, -0.001207 -#*# -0.020548, -0.020548, -0.030235, -0.045109, -0.047644, -0.013968, 0.004580, -0.022084, -0.040851, -0.010745, -0.072567, -0.046700, -0.046700 -#*# -0.065225, -0.065225, -0.070452, -0.082613, -0.004947, -0.007693, 0.002972, -0.017327, 0.006928, -0.000043, -0.022182, -0.051542, -0.051542 -#*# -0.015597, -0.015597, -0.024245, -0.016206, 0.017731, 0.011087, -0.007589, 0.014521, -0.014740, -0.055408, -0.078663, -0.128265, -0.128265 -#*# -0.006361, -0.035030, -0.027430, -0.027100, -0.035687, 0.008191, 0.000000, 0.028685, -0.013501, -0.000669, -0.006836, -0.063614, -0.120604 -#*# 0.009006, 0.009006, -0.038215, -0.004862, -0.005067, 0.023846, 0.005303, -0.017008, -0.001132, -0.047883, -0.078197, -0.104467, -0.104467 -#*# -0.065296, -0.065296, -0.094076, -0.050048, 0.005887, 0.029406, 0.012646, -0.001847, 0.042902, 0.015198, -0.038658, -0.069033, -0.069033 -#*# -0.089840, -0.089840, -0.067392, -0.046851, -0.046780, 0.008230, -0.024958, 0.005470, 0.000727, 0.014177, -0.031855, -0.067485, -0.067485 -#*# -0.142119, -0.142119, -0.142119, -0.132495, -0.062554, -0.045859, -0.002144, 0.021794, 0.012583, 0.032188, -0.027538, -0.027538, -0.027538 -#*# -0.150265, -0.150265, -0.150265, -0.150265, -0.090845, -0.036079, -0.013544, 0.013161, 0.011777, 0.039157, 0.039157, 0.039157, 0.039157 -#*# 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246, 0.005246 +#*# 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896, 0.001896 +#*# -0.059330, -0.059330, -0.059330, -0.059330, -0.067872, -0.022435, 0.017308, 0.033277, 0.055371, 0.350995, 0.350995, 0.350995, 0.350995 +#*# 0.008108, 0.008108, 0.008108, -0.030591, -0.032114, 0.015006, 0.013111, 0.021862, 0.038866, 0.088963, 0.067147, 0.067147, 0.067147 +#*# 0.076988, 0.076988, 0.014473, 0.004642, 0.012713, 0.013011, 0.011547, 0.029096, 0.013954, 0.040260, 0.053985, 0.044658, 0.044658 +#*# 0.058240, 0.058240, 0.009890, -0.009780, -0.009101, -0.017454, 0.011496, 0.000848, 0.024160, 0.028844, 0.013092, 0.051052, 0.051052 +#*# 0.098491, 0.098491, 0.027282, 0.017226, 0.013297, 0.032427, 0.002743, 0.016712, 0.040042, 0.030823, 0.021936, -0.025504, -0.025504 +#*# 0.118502, 0.089060, 0.058103, 0.024333, 0.026867, 0.000293, 0.000000, 0.039546, 0.011935, 0.024922, 0.032961, -0.005448, -0.065631 +#*# 0.084782, 0.084782, 0.031679, 0.057877, -0.001049, 0.036571, 0.049042, 0.034882, 0.031147, 0.012871, -0.031739, -0.022315, -0.022315 +#*# 0.074070, 0.074070, 0.043000, 0.010733, 0.004522, 0.052281, 0.060864, 0.033685, 0.046425, 0.062195, 0.021025, -0.022662, -0.022662 +#*# 0.038321, 0.038321, 0.016001, 0.026090, 0.013819, 0.027285, 0.034729, 0.042197, 0.065762, 0.056596, 0.010150, -0.046115, -0.046115 +#*# 0.003236, 0.003236, 0.003236, 0.009619, 0.006156, 0.035293, 0.002207, 0.081087, 0.038801, 0.052112, 0.010090, 0.010090, 0.010090 +#*# -0.024296, -0.024296, -0.024296, -0.024296, 0.006547, -0.004994, 0.033552, 0.044608, 0.046647, 0.079277, 0.079277, 0.079277, 0.079277 +#*# 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148, 0.047148 #*# x_count = 13 #*# y_count = 13 #*# mesh_x_pps = 2 @@ -445,67 +510,3 @@ value: 1 #*# max_x = 147.0 #*# min_y = -147.0 #*# max_y = 147.0 -#*# -#*# [heater_bed] -#*# control = pid -#*# pid_kp = 71.685 -#*# pid_ki = 2.583 -#*# pid_kd = 497.313 -#*# -#*# [extruder] -#*# control = pid -#*# pid_kp = 20.836 -#*# pid_ki = 1.187 -#*# pid_kd = 91.417 -#*# -#*# [delta_calibrate] -#*# height0 = 17.828 -#*# height0_pos = 128669.000,128669.000,128669.000 -#*# height1 = 17.828 -#*# height1_pos = 151185.800,151185.800,116034.600 -#*# height2 = 17.828 -#*# height2_pos = 126085.200,163987.400,126085.200 -#*# height3 = 17.828 -#*# height3_pos = 116703.400,147524.800,147524.800 -#*# height4 = 17.828 -#*# height4_pos = 125485.400,125485.400,152772.600 -#*# height5 = 17.828 -#*# height5_pos = 144289.000,117535.400,144289.000 -#*# height6 = 17.828 -#*# height6_pos = 158014.000,125724.800,125724.800 -#*# distance0 = 64.842 -#*# distance0_pos1 = 133621.315,134972.482,134563.893 -#*# distance0_pos2 = 125491.344,143400.833,143020.320 -#*# distance1 = 65.035 -#*# distance1_pos1 = 134001.019,134206.848,134948.991 -#*# distance1_pos2 = 131041.776,131235.496,149780.315 -#*# distance2 = 64.878 -#*# distance2_pos1 = 134766.662,133828.010,134563.893 -#*# distance2_pos2 = 143208.928,125698.066,143020.320 -#*# distance3 = 64.88 -#*# distance3_pos1 = 135152.650,134210.345,133798.242 -#*# distance3_pos2 = 149983.962,131287.939,130851.341 -#*# distance4 = 64.945 -#*# distance4_pos1 = 134768.441,134976.007,133417.655 -#*# distance4_pos2 = 143239.022,143460.477,125287.675 -#*# distance5 = 64.858 -#*# distance5_pos1 = 134002.784,135359.341,133798.242 -#*# distance5_pos2 = 131068.237,150190.619,130851.341 -#*# distance6 = 64.892 -#*# distance6_pos1 = 126122.444,141650.703,142514.843 -#*# distance6_pos2 = 131635.229,130719.895,149144.094 -#*# distance7 = 64.988 -#*# distance7_pos1 = 131709.573,130794.251,147886.148 -#*# distance7_pos2 = 143462.253,125909.898,142015.038 -#*# distance8 = 65.122 -#*# distance8_pos1 = 142705.473,126331.599,141267.714 -#*# distance8_pos2 = 149348.788,131881.624,130333.916 -#*# distance9 = 65.015 -#*# distance9_pos1 = 148090.827,131953.425,130406.602 -#*# distance9_pos2 = 142233.571,143711.016,125497.896 -#*# distance10 = 65.185 -#*# distance10_pos1 = 141485.169,142950.990,125919.593 -#*# distance10_pos2 = 130549.893,149552.325,131444.874 -#*# distance11 = 65.11800000000001 -#*# distance11_pos1 = 130621.733,148294.415,131518.365 -#*# distance11_pos2 = 125700.751,142395.888,143272.712 diff --git a/02-klipper/01-configuration/variables.cfg b/02-klipper/01-configuration/variables.cfg index fdd2e90..11934bf 100644 --- a/02-klipper/01-configuration/variables.cfg +++ b/02-klipper/01-configuration/variables.cfg @@ -1,3 +1,3 @@ [Variables] -zoffset = {'z': '0'} +zoffset = {'z': 0.08999999999999866}