diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg index ff51b38..a5e3aa1 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu/mmu_vars.cfg @@ -1,5 +1,5 @@ [Variables] -mmu__revision = 833 +mmu__revision = 885 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 @@ -13,20 +13,20 @@ mmu_state_endless_spool_groups = [0, 0, 1, 1, 1, 1, 1, 1] mmu_state_filament_pos = 10 mmu_state_filament_remaining = 0.0 mmu_state_filament_remaining_color = '' -mmu_state_gate_selected = 0 -mmu_state_gate_status = [2, 0, 0, 0, 0, 0, 0, 0] +mmu_state_gate_selected = 1 +mmu_state_gate_status = [2, 1, 0, 0, 0, 0, 0, 0] mmu_state_last_tool = 0 -mmu_state_tool_selected = 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': 186, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 41, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 41, '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': 41, 'unload_distance': 30192.2, 'unload_delta': 1859.538, 'load_failures': 7, 'unload_failures': 15, 'quality': 0.9481444777833629} -mmu_statistics_gate_1 = {'pauses': 2, 'loads': 21, 'load_distance': 27446.424, 'load_delta': -41.777, 'unloads': 23, 'unload_distance': 26126.9, 'unload_delta': 1429.262, 'load_failures': 1, 'unload_failures': 4, 'quality': 1.002976349042227} +mmu_statistics_counters = {'servo_down': {'count': 193, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 48, '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} mmu_statistics_gate_3 = {'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_4 = {'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_5 = {'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_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.12, 'post_unload': 12.32, 'unload': 1678.29, 'pre_load': 13.54, 'post_load': 162.22, 'load': 1156.84, 'total_swaps': 39, 'swaps_since_pause': 2, 'swaps_since_pause_record': 8, 'total': 2480.2, 'total_pauses': 13, 'pause': 1679.71} +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 diff --git a/printer.cfg b/printer.cfg index 24d9377..9798c2f 100644 --- a/printer.cfg +++ b/printer.cfg @@ -270,7 +270,7 @@ resistance3: 1228.0 [temperature_sensor chamber_temp] # Chamber Temperature - T1 -sensor_type: ATC Semitec 104NT-4-R025H42G +sensor_type: EPCOS 100K B57560G104F # total guess really, but sure. sensor_pin: PF5 min_temp: 0 max_temp: 100 @@ -420,7 +420,7 @@ shaper_freq_y: 70.0 shaper_type: 3hump_ei [mcu eddy] -canbus_uuid: 65f0daec916f +canbus_uuid: 01dd4779f312 [probe_eddy_current btt_eddy] sensor_type: ldc1612 @@ -456,15 +456,15 @@ enable_force_move: True #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.038272, -0.035348, -0.020946, 0.010414, 0.003378, -0.001303, 0.027841, 0.008986, 0.001171 -#*# -0.032713, -0.013018, -0.010156, 0.009372, -0.005207, 0.007555, 0.033252, 0.010144, -0.008067 -#*# -0.025509, -0.015764, 0.002333, 0.002990, 0.008329, 0.009758, 0.027841, 0.008325, -0.003002 -#*# -0.038396, -0.020172, -0.011975, -0.005864, -0.009770, 0.004423, 0.025610, 0.010146, -0.009886 -#*# -0.046717, -0.016924, -0.020560, -0.012630, -0.000256, 0.000904, 0.015731, -0.001959, -0.018083 -#*# -0.034798, -0.026618, -0.014449, -0.005207, -0.000644, 0.002723, 0.027249, 0.003609, -0.005979 -#*# -0.033824, -0.013018, -0.006806, -0.002347, 0.002990, 0.008715, 0.024665, 0.000130, 0.005195 -#*# -0.035224, -0.033002, -0.017040, -0.005207, -0.003390, 0.004643, 0.015381, 0.017263, -0.011587 -#*# -0.056595, -0.029953, -0.033002, -0.008841, -0.028140, -0.012747, 0.003766, -0.014796, -0.023304 +#*# -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 #*# x_count = 9 #*# y_count = 9 #*# mesh_x_pps = 9 @@ -484,40 +484,51 @@ enable_force_move: True #*# [probe_eddy_current btt_eddy] #*# reg_drive_current = 15 #*# calibrate = -#*# 0.050000:3234035.686,0.090000:3233505.682,0.130000:3233018.358, -#*# 0.170000:3232549.420,0.210000:3232039.136,0.250000:3231571.865, -#*# 0.290000:3231121.935,0.330000:3230664.572,0.370000:3230199.562, -#*# 0.410000:3229778.979,0.450000:3229321.772,0.490000:3228888.767, -#*# 0.530000:3228458.114,0.570000:3228024.212,0.610000:3227627.950, -#*# 0.650000:3227256.285,0.690000:3226823.562,0.730000:3226455.090, -#*# 0.770000:3226051.053,0.810000:3225682.914,0.850000:3225306.650, -#*# 0.890000:3224939.102,0.930000:3224586.910,0.970000:3224241.353, -#*# 1.010000:3223885.188,1.050000:3223535.705,1.090000:3223201.622, -#*# 1.130000:3222876.338,1.170000:3222541.650,1.210000:3222242.460, -#*# 1.250000:3221928.537,1.290000:3221625.949,1.330000:3221306.784, -#*# 1.370000:3221015.265,1.410000:3220724.364,1.450000:3220422.417, -#*# 1.490000:3220139.164,1.530000:3219869.485,1.570000:3219597.530, -#*# 1.610000:3219329.430,1.650000:3219040.173,1.690000:3218777.803, -#*# 1.730000:3218558.312,1.770000:3218290.188,1.810000:3218055.185, -#*# 1.850000:3217785.668,1.890000:3217530.332,1.930000:3217299.811, -#*# 1.970000:3217083.352,2.010000:3216838.844,2.050000:3216614.369, -#*# 2.090000:3216390.372,2.130000:3216165.714,2.170000:3215955.044, -#*# 2.210000:3215744.706,2.250000:3215530.923,2.290000:3215335.844, -#*# 2.330000:3215145.921,2.370000:3214926.204,2.410000:3214735.608, -#*# 2.450000:3214528.453,2.490000:3214344.846,2.530000:3214139.500, -#*# 2.570000:3213957.120,2.610000:3213772.125,2.650000:3213590.056, -#*# 2.690000:3213432.187,2.730000:3213257.292,2.770000:3213064.694, -#*# 2.810000:3212904.791,2.850000:3212738.881,2.890000:3212579.622, -#*# 2.930000:3212408.129,2.970000:3212247.934,3.010000:3212089.730, -#*# 3.050000:3211925.224,3.090000:3211775.817,3.130000:3211621.347, -#*# 3.170000:3211521.732,3.210000:3211338.163,3.250000:3211182.087, -#*# 3.290000:3211039.050,3.330000:3210933.545,3.370000:3210786.705, -#*# 3.410000:3210649.198,3.450000:3210528.386,3.490000:3210394.204, -#*# 3.530000:3210236.458,3.570000:3210112.356,3.610000:3209977.430, -#*# 3.650000:3209846.484,3.690000:3209729.506,3.730000:3209609.122, -#*# 3.770000:3209494.898,3.810000:3209375.235,3.850000:3209279.391, -#*# 3.890000:3209159.702,3.930000:3209050.169,3.970000:3208936.706, -#*# 4.010000:3208819.730,4.050000:3208713.566 +#*# 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 #*# #*# [temperature_probe btt_eddy] -#*# calibration_temp = 36.290733 +#*# 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