diff --git a/martyn_macros.cfg b/martyn_macros.cfg index ed07c81..7a07d83 100644 --- a/martyn_macros.cfg +++ b/martyn_macros.cfg @@ -24,7 +24,7 @@ gcode: CLEAN_NOZZLE G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position - #SET_GCODE_OFFSET Z_ADJUST=-0.3 MOVE=1 ; This will NOT save! + SET_GCODE_OFFSET Z_ADJUST=-0.303 MOVE=1 ; This will NOT save! G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg index 42eeec3..059b209 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu/mmu_vars.cfg @@ -1,5 +1,5 @@ [Variables] -mmu__revision = 892 +mmu__revision = 950 mmu_calibration_bowden_home = 'encoder' mmu_calibration_bowden_lengths = [1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1] mmu_calibration_clog_length = 17.4 @@ -18,7 +18,7 @@ mmu_state_gate_status = [2, 1, 0, 0, 0, 0, 0, 0] mmu_state_last_tool = 0 mmu_state_tool_selected = 1 mmu_state_tool_to_gate_map = [0, 1, 2, 3, 4, 5, 6, 7] -mmu_statistics_counters = {'servo_down': {'count': 194, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 49, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 42, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} +mmu_statistics_counters = {'servo_down': {'count': 198, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 58, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 42, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} mmu_statistics_gate_0 = {'pauses': 12, 'loads': 28, 'load_distance': 38354.336, 'load_delta': 6896.202, 'unloads': 43, 'unload_distance': 31567.3, 'unload_delta': 1877.741, 'load_failures': 7, 'unload_failures': 16, 'quality': 0.9546537865318246} mmu_statistics_gate_1 = {'pauses': 2, 'loads': 22, 'load_distance': 28896.615, 'load_delta': 90.861, 'unloads': 23, 'unload_distance': 26126.9, 'unload_delta': 1429.262, 'load_failures': 1, 'unload_failures': 4, 'quality': 0.8150402644682778} mmu_statistics_gate_2 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} @@ -28,5 +28,5 @@ mmu_statistics_gate_5 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_de mmu_statistics_gate_6 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} mmu_statistics_gate_7 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0} mmu_statistics_swaps = {'pre_unload': 18.72, 'post_unload': 12.62, 'unload': 1789.69, 'pre_load': 13.84, 'post_load': 168.54, 'load': 1191.74, 'total_swaps': 40, 'swaps_since_pause': 3, 'swaps_since_pause_record': 8, 'total': 2629.04, 'total_pauses': 13, 'pause': 1679.71} -nvm_offset = -0.05 +nvm_offset = -0.2 diff --git a/printer.cfg b/printer.cfg index 9798c2f..3204633 100644 --- a/printer.cfg +++ b/printer.cfg @@ -424,7 +424,7 @@ canbus_uuid: 01dd4779f312 [probe_eddy_current btt_eddy] sensor_type: ldc1612 -z_offset: 2.5 +z_offset: 2.01 i2c_mcu: eddy i2c_bus: i2c0f x_offset: 0 @@ -456,15 +456,15 @@ enable_force_move: True #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.000841, 0.011470, 0.008763, 0.033339, 0.024002, 0.030384, 0.060424, 0.028156, 0.016379 -#*# 0.015202, 0.024731, 0.029139, 0.037021, 0.021303, 0.031989, 0.045113, 0.030748, 0.010399 -#*# -0.000166, 0.015200, 0.017987, 0.019076, 0.019438, 0.025973, 0.047344, 0.027686, 0.019959 -#*# 0.004637, -0.010333, 0.006103, 0.015202, 0.004241, 0.022290, 0.048795, 0.019696, 0.010679 -#*# -0.025970, -0.005248, -0.002313, 0.013846, -0.000845, 0.012264, 0.027684, 0.016275, -0.002032 -#*# -0.003783, -0.002309, 0.013732, 0.015997, 0.021671, 0.021667, 0.042413, 0.031645, 0.012659 -#*# -0.004177, 0.011866, 0.019334, 0.029503, 0.021305, 0.038475, 0.047810, 0.037385, 0.018352 -#*# -0.007792, 0.009719, 0.014523, 0.031472, 0.019959, 0.044126, 0.048795, 0.039826, 0.016379 -#*# -0.011012, 0.007573, 0.021669, 0.025093, 0.011472, 0.028413, 0.040186, 0.041123, 0.016639 +#*# -0.030538, -0.018855, -0.011589, 0.008913, -0.001831, -0.002020, 0.028293, 0.005575, -0.005186 +#*# -0.002746, -0.002315, 0.008397, 0.006242, 0.004728, 0.010083, 0.035577, 0.015791, -0.001369 +#*# 0.001553, 0.007630, 0.016275, 0.002044, 0.008813, 0.008458, 0.026052, 0.014911, 0.012016 +#*# -0.000879, -0.002334, 0.000581, 0.004695, 0.006789, 0.004913, 0.029133, 0.008637, -0.002957 +#*# -0.010909, 0.002958, 0.002348, 0.002543, -0.000707, 0.010753, 0.021104, -0.004284, -0.002565 +#*# -0.008576, 0.007625, 0.001704, 0.008716, 0.015614, 0.014032, 0.028899, 0.014874, 0.014078 +#*# -0.001457, 0.006576, 0.024804, 0.015330, 0.023349, 0.030242, 0.036585, 0.013622, 0.012890 +#*# -0.012704, 0.003369, 0.010980, 0.004350, 0.003155, 0.019323, 0.033000, 0.014840, 0.004014 +#*# -0.040566, -0.023695, -0.004210, -0.007178, -0.002733, 0.012177, 0.013089, 0.001078, -0.009323 #*# x_count = 9 #*# y_count = 9 #*# mesh_x_pps = 9 @@ -484,51 +484,50 @@ enable_force_move: True #*# [probe_eddy_current btt_eddy] #*# reg_drive_current = 15 #*# calibrate = -#*# 0.050000:3252622.397,0.090000:3251976.916,0.130000:3251353.836, -#*# 0.170000:3250780.349,0.210000:3250150.287,0.250000:3249565.804, -#*# 0.290000:3248980.385,0.330000:3248385.601,0.370000:3247790.283, -#*# 0.410000:3247224.398,0.450000:3246661.008,0.490000:3246094.692, -#*# 0.530000:3245601.349,0.570000:3245021.891,0.610000:3244426.027, -#*# 0.650000:3243901.691,0.690000:3243392.458,0.730000:3242846.889, -#*# 0.770000:3242363.761,0.810000:3241829.231,0.850000:3241331.734, -#*# 0.890000:3240818.955,0.930000:3240325.028,0.970000:3239861.995, -#*# 1.010000:3239369.706,1.050000:3238879.392,1.090000:3238406.262, -#*# 1.130000:3237956.439,1.170000:3237475.032,1.210000:3237054.141, -#*# 1.250000:3236590.045,1.290000:3236186.976,1.330000:3235748.436, -#*# 1.370000:3235334.548,1.410000:3234909.463,1.450000:3234461.739, -#*# 1.490000:3234090.303,1.530000:3233703.744,1.570000:3233281.437, -#*# 1.610000:3232891.563,1.650000:3232534.479,1.690000:3232170.480, -#*# 1.730000:3231772.107,1.770000:3231413.497,1.810000:3231086.435, -#*# 1.850000:3230724.186,1.890000:3230357.198,1.930000:3230009.176, -#*# 1.970000:3229671.342,2.010000:3229321.802,2.050000:3228997.945, -#*# 2.090000:3228677.167,2.130000:3228384.769,2.170000:3228074.003, -#*# 2.210000:3227747.744,2.250000:3227449.510,2.290000:3227165.196, -#*# 2.330000:3226867.674,2.370000:3226570.859,2.410000:3226313.127, -#*# 2.450000:3226012.587,2.490000:3225722.944,2.530000:3225467.355, -#*# 2.570000:3225222.938,2.610000:3224943.073,2.650000:3224683.853, -#*# 2.690000:3224409.027,2.730000:3224199.774,2.770000:3223933.250, -#*# 2.810000:3223707.047,2.850000:3223433.504,2.890000:3223227.911, -#*# 2.930000:3222977.966,2.970000:3222770.300,3.010000:3222528.659, -#*# 3.050000:3222298.188,3.090000:3222085.964,3.130000:3221860.099, -#*# 3.170000:3221671.926,3.210000:3221455.734,3.250000:3221253.666, -#*# 3.290000:3221040.491,3.330000:3220873.391,3.370000:3220666.282, -#*# 3.410000:3220463.347,3.450000:3220254.440,3.490000:3220072.795, -#*# 3.530000:3219917.491,3.570000:3219723.226,3.610000:3219541.719, -#*# 3.650000:3219371.177,3.690000:3219224.786,3.730000:3219045.203, -#*# 3.770000:3218888.231,3.810000:3218720.097,3.850000:3218554.462, -#*# 3.890000:3218395.200,3.930000:3218227.621,3.970000:3218096.607, -#*# 4.010000:3217906.934,4.050000:3217765.819 +#*# 0.050000:3245638.704,0.090000:3245080.054,0.130000:3244565.336, +#*# 0.170000:3244049.306,0.210000:3243547.198,0.250000:3242983.782, +#*# 0.290000:3242485.192,0.330000:3242003.499,0.370000:3241513.810, +#*# 0.410000:3241005.009,0.450000:3240524.679,0.490000:3240007.220, +#*# 0.530000:3239582.630,0.570000:3239091.260,0.610000:3238656.819, +#*# 0.650000:3238201.389,0.690000:3237738.464,0.730000:3237327.553, +#*# 0.770000:3236871.922,0.810000:3236450.933,0.850000:3236013.435, +#*# 0.890000:3235604.570,0.930000:3235213.842,0.970000:3234806.320, +#*# 1.010000:3234402.262,1.050000:3234011.073,1.090000:3233605.455, +#*# 1.130000:3233234.712,1.170000:3232870.210,1.210000:3232508.894, +#*# 1.250000:3232151.577,1.290000:3231750.211,1.330000:3231417.439, +#*# 1.370000:3231076.224,1.410000:3230749.915,1.450000:3230408.322, +#*# 1.490000:3230089.275,1.530000:3229744.872,1.570000:3229405.069, +#*# 1.610000:3229098.050,1.650000:3228793.859,1.690000:3228494.736, +#*# 1.730000:3228192.648,1.770000:3227892.116,1.810000:3227632.023, +#*# 1.850000:3227317.057,1.890000:3227028.950,1.930000:3226751.663, +#*# 1.970000:3226491.384,2.010000:3226215.191,2.050000:3225969.888, +#*# 2.090000:3225686.092,2.130000:3225413.803,2.170000:3225169.825, +#*# 2.210000:3224906.131,2.250000:3224685.325,2.290000:3224436.049, +#*# 2.330000:3224180.495,2.370000:3223968.437,2.410000:3223730.180, +#*# 2.450000:3223513.775,2.490000:3223276.750,2.530000:3223059.567, +#*# 2.570000:3222849.555,2.610000:3222638.022,2.650000:3222423.121, +#*# 2.690000:3222245.379,2.730000:3222044.814,2.770000:3221807.780, +#*# 2.810000:3221609.367,2.850000:3221410.154,2.890000:3221233.477, +#*# 2.930000:3221053.693,2.970000:3220848.945,3.010000:3220647.095, +#*# 3.050000:3220506.474,3.090000:3220310.181,3.130000:3220109.755, +#*# 3.170000:3219971.126,3.210000:3219810.795,3.250000:3219615.773, +#*# 3.290000:3219469.812,3.330000:3219311.643,3.370000:3219128.365, +#*# 3.410000:3218969.474,3.450000:3218835.061,3.490000:3218678.080, +#*# 3.530000:3218523.050,3.570000:3218373.833,3.610000:3218217.807, +#*# 3.650000:3218077.498,3.690000:3217930.874,3.730000:3217797.046, +#*# 3.770000:3217658.917,3.810000:3217505.867,3.850000:3217410.132, +#*# 3.890000:3217255.991,3.930000:3217104.296,3.970000:3216992.397, +#*# 4.010000:3216852.585,4.050000:3216743.023 #*# #*# [temperature_probe btt_eddy] -#*# calibration_temp = 36.360765 #*# drift_calibration = -#*# 3274291.369246, -749.622763, 4.855820 -#*# 3259585.162395, -471.632647, 2.518884 -#*# 3244968.753613, -165.511092, -0.021014 -#*# 3238075.996906, -110.965523, -0.300250 -#*# 3231995.223256, -59.887865, -0.524615 -#*# 3226460.679925, 5.431130, -0.972745 -#*# 3223285.101578, 9.492002, -0.899513 -#*# 3220350.343416, 23.368481, -0.931954 -#*# 3216470.289418, 90.609586, -1.489929 -#*# drift_calibration_min_temp = 39.950048050770654 +#*# 3295881.310465, -1597.470868, 13.826983 +#*# 3280529.985085, -1287.274699, 11.063779 +#*# 3266451.502831, -991.104037, 8.459800 +#*# 3255074.317427, -766.953277, 6.550420 +#*# 3245056.498078, -552.419340, 4.625431 +#*# 3236797.908245, -374.099752, 2.993489 +#*# 3229565.215149, -207.644688, 1.443555 +#*# 3224109.964452, -92.088684, 0.383280 +#*# 3219621.930355, 2.311153, -0.482160 +#*# drift_calibration_min_temp = 38.524523728844876