diff --git a/martyn_macros.cfg b/martyn_macros.cfg index fe4adfd..bd2a61e 100644 --- a/martyn_macros.cfg +++ b/martyn_macros.cfg @@ -37,7 +37,7 @@ gcode: G92 E0 ; Reset Extruder G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish - SKEW_PROFILE LOAD=calilantern_skew_profile + #SKEW_PROFILE LOAD=calilantern_skew_profile STATUS_PRINTING # Use PRINT_END for the slicer ending script - please customise for your slicer of choice @@ -117,7 +117,7 @@ gcode: [gcode_macro CLEAN_NOZZLE] variable_start_x: 101 variable_start_y: 354 -variable_start_z: 0 +variable_start_z: 2 variable_wipe_dist: -40 variable_wipe_qty: 5 variable_wipe_spd: 200 @@ -398,5 +398,20 @@ gcode: # {% endif %} +[gcode_macro SAFE_QUAD_GANTRY_LEVEL] +#rename_existing: _SAFE_QUAD_GANTRY_LEVEL +gcode: + SAVE_GCODE_STATE NAME=STATE_QGL + BED_MESH_CLEAR + # If QGL has not been done yet, correct for any major skew first + # at 8mm height + {% if not printer.quad_gantry_level.applied %} + QUAD_GANTRY_LEVEL horizontal_move_z=8 retry_tolerance=1 + {% endif %} + # Compelte with a full QGL at the configured height + QUAD_GANTRY_LEVEL + RESTORE_GCODE_STATE NAME=STATE_QGL + + [mmu_led_effect mmu_purple_slow] layers: breathing 1.0 0 top (1,0,1) diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg index febc72f..58a8fc3 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu/mmu_vars.cfg @@ -1,5 +1,5 @@ [Variables] -mmu__revision = 2644 +mmu__revision = 2749 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 @@ -24,7 +24,7 @@ mmu_state_gate_temperature = [200, 200, 200, 200, 200, 200, 200, 200] mmu_state_last_tool = 1 mmu_state_tool_selected = -2 mmu_state_tool_to_gate_map = [0, 1, 2, 3, 4, 5, 6, 7] -mmu_statistics_counters = {'servo_down': {'count': 812, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 171, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 50, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} +mmu_statistics_counters = {'servo_down': {'count': 812, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 190, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 51, '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': 25, 'unload_distance': 27502.0, 'unload_delta': 1483.93, 'load_failures': 1, 'unload_failures': 5, 'quality': 0.8375118313601163} 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} @@ -33,6 +33,6 @@ mmu_statistics_gate_4 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_de 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.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': 0, 'swaps_since_pause_record': 8, 'total': 2629.04, 'total_pauses': 14, 'pause': 1679.71, 'form_tip': 31.32, 'purge': 2.51} +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': 0, 'swaps_since_pause_record': 8, 'total': 2629.04, 'total_pauses': 14, 'pause': 1803.42, 'form_tip': 106.19, 'purge': 2.51} nvm_offset = -0.11599999999999978 diff --git a/printer.cfg b/printer.cfg index 0be2f19..4415dc9 100644 --- a/printer.cfg +++ b/printer.cfg @@ -61,9 +61,9 @@ microsteps: 32 full_steps_per_rotation:400 #set to 200 for 1.8 degree stepper endstop_pin: PG6 position_min: 0 -position_endstop: 345 -position_max: 345 -homing_speed: 50 #Max 100 +position_endstop: 341 +position_max: 341 +homing_speed: 70 #Max 100 homing_retract_dist: 5 homing_positive_dir: true @@ -89,7 +89,7 @@ endstop_pin: PG9 position_min: 0 position_endstop: 355 position_max: 355 -homing_speed: 50 #Max 100 +homing_speed: 70 #Max 100 homing_retract_dist: 5 homing_positive_dir: true @@ -115,13 +115,13 @@ enable_pin: !PG5 rotation_distance: 40 gear_ratio: 80:16 microsteps: 32 -#endstop_pin: probe:z_virtual_endstop -endstop_pin: !ebb36:PB7 +endstop_pin: probe:z_virtual_endstop +#endstop_pin: !ebb36:PB7 ## Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0) ## (+) value = endstop above Z0, (-) value = endstop below ## Increasing position_endstop brings nozzle closer to the bed ## After you run Z_ENDSTOP_CALIBRATE, position_endstop will be stored at the very end of your config -position_endstop: 0 +#position_endstop: 0 position_max: 310 position_min: -5 homing_speed: 15 @@ -454,8 +454,8 @@ i2c_bus: i2c0f x_offset: 0 y_offset: 21.42 reg_drive_current: 15 -tap_drive_current: 16 -tap_adjust_z: 0.07 +#tap_drive_current: 16 +tap_adjust_z: -0.04 [temperature_sensor btt_eddy_mcu] sensor_type: temperature_mcu @@ -476,15 +476,15 @@ enable_force_move: True #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.026336, 0.030598, 0.039726, 0.036689, 0.040929, 0.039726, 0.072255, 0.032437, 0.051225 -#*# 0.015377, 0.039726, 0.046996, 0.039726, 0.037893, 0.035484, 0.060249, 0.045167, 0.045167 -#*# 0.008021, 0.032437, 0.046996, 0.029391, 0.032437, 0.048195, 0.065053, 0.045167, 0.029391 -#*# 0.014736, 0.000645, 0.022384, 0.017798, 0.019010, 0.030598, 0.038494, 0.037893, 0.017798 -#*# 0.000645, 0.014736, 0.010448, 0.006160, -0.003054, 0.032437, 0.043332, 0.026336, 0.012307 -#*# 0.001859, 0.002791, 0.014736, 0.010761, 0.012307, 0.016585, 0.023600, 0.009232, 0.032437 -#*# 0.010154, 0.028183, 0.030598, 0.028183, 0.025127, 0.050592, 0.043967, 0.006160, 0.022073 -#*# 0.000645, 0.013521, 0.025127, 0.030585, 0.030598, 0.031230, 0.045767, 0.043967, 0.020862 -#*# -0.000010, 0.019010, 0.031230, 0.032437, 0.028183, 0.039726, 0.033642, 0.013521, 0.014736 +#*# -0.034379, -0.028715, -0.030601, -0.007436, -0.003445, 0.028665, 0.036028, 0.030914, 0.030914 +#*# 0.008072, -0.012637, 0.032345, 0.024614, 0.043982, 0.049881, 0.068306, 0.061439, 0.054957 +#*# -0.000445, 0.027231, 0.032345, 0.036013, 0.025797, 0.049881, 0.061438, 0.044794, 0.076563 +#*# -0.000803, -0.009745, 0.006651, 0.032345, 0.033783, 0.041131, 0.052729, 0.070119, 0.049881 +#*# 0.002927, 0.009540, 0.006651, 0.032345, -0.002253, 0.033783, 0.036028, 0.053538, 0.052729 +#*# 0.031616, 0.020662, 0.046225, 0.033783, 0.011813, 0.030914, 0.054957, 0.072332, 0.025797 +#*# 0.035620, 0.036028, 0.039705, 0.058187, 0.042557, 0.047648, 0.063963, 0.051305, 0.032345 +#*# 0.016958, 0.032345, 0.036028, 0.028665, 0.033064, 0.043982, 0.046225, 0.061439, 0.049881 +#*# 0.018397, 0.038581, 0.036028, 0.066492, 0.054957, 0.039705, 0.080182, 0.072332, 0.066492 #*# x_count = 9 #*# y_count = 9 #*# mesh_x_pps = 9 @@ -504,5 +504,6 @@ enable_force_move: True #*# [probe_eddy_ng btt_eddy] #*# calibrated_drive_currents = 15, 16 #*# calibration_version = 5 -#*# calibration_15 = gASVygMAAAAAAAB9lCiMAXaUSwWMBGZ0b2iUjBtudW1weS5wb2x5bm9taWFsLnBvbHlub21pYWyUjApQb2x5bm9taWFslJOUKYGUfZQojARjb2VmlIwVbnVtcHkuY29yZS5tdWx0aWFycmF5lIwMX3JlY29uc3RydWN0lJOUjAVudW1weZSMB25kYXJyYXmUk5RLAIWUQwFilIeUUpQoSwFLCoWUaAyMBWR0eXBllJOUjAJmOJSJiIeUUpQoSwOMATyUTk5OSv////9K/////0sAdJRiiUNQvHqKZCu7/T+febkVt3v9P7ocU8yZsuI/ssbRaiOC0T81dwr6qm/QPwF9wmPvWtQ/Y4gPa6M9wL9f+cUCv47av9fEcJ0H+L0/BM3sZIFi0D+UdJRijAZkb21haW6UaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxCoh307lqiUPg9H7OOt3pQ+lHSUYowGd2luZG93lGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGKMB19zeW1ib2yUjAF4lIwGc3ltYm9slGgsdWKMCWZ0b2hfaGlnaJRoBSmBlH2UKGgIaAtoDksAhZRoEIeUUpQoSwFLCoWUaBiJQ1APbwKF0vIaQGi3jsUCowlA1wa5xxsPAEAEqZDnrm4KQHrjtLCNEuK/l/TJYQhaIsC9ZIaAnN4BQNffLAxX6y1AbOURhYiy4b8afwUwUgYcwJR0lGJoHWgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQqAE8SkjclD6f20GCzu2UPpR0lGJoJGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGJoK2gsaC1oLHVijARodG9mlGgFKYGUfZQoaAhoC2gOSwCFlGgQh5RSlChLAUsKhZRoGIlDUBmW/+hMzpQ+j4JkdDZ9GD7/3Q/6vk0FvrTROV5bHvE9yeG9ys8pob0iYepLED34vfeRmluH9Mc9ZaKoXpnRAD66n9rLZxDEvTEzWnIkQ/C9lHSUYmgdaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxBgP/pPyZXaP7ZhhSmG8xNAlHSUYmgkaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAAAAAAAADwvwAAAAAAAPA/lHSUYmgraCxoLWgsdWKMB2hfcmFuZ2WUXZQoRz/alclP+j9gR0AuAAAAAAAAZYwHZl9yYW5nZZRdlChHQUh2t8sfsABHQUjIsA5BEABljAJkY5RLD3Uu +#*# tap_drive_current = 15 +#*# calibration_15 = gASVygMAAAAAAAB9lCiMAXaUSwWMBGZ0b2iUjBtudW1weS5wb2x5bm9taWFsLnBvbHlub21pYWyUjApQb2x5bm9taWFslJOUKYGUfZQojARjb2VmlIwVbnVtcHkuY29yZS5tdWx0aWFycmF5lIwMX3JlY29uc3RydWN0lJOUjAVudW1weZSMB25kYXJyYXmUk5RLAIWUQwFilIeUUpQoSwFLCoWUaAyMBWR0eXBllJOUjAJmOJSJiIeUUpQoSwOMATyUTk5OSv////9K/////0sAdJRiiUNQvssRONgz9z95G+tAsMv8P07Q/n//4+g/cIJzouPo5z+yQWpzEw2pP5Ts/LobqfC/wbfN3FO85T/4YlgKxHX3P01LuBWBdNy/YhpcvCMb3b+UdJRijAZkb21haW6UaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAKsJ0iBZeUPvf5gI1r3pQ+lHSUYowGd2luZG93lGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGKMB19zeW1ib2yUjAF4lIwGc3ltYm9slGgsdWKMCWZ0b2hfaGlnaJRoBSmBlH2UKGgIaAtoDksAhZRoEIeUUpQoSwFLCoWUaBiJQ1Bjk0RGnwcbQFjjRqrj8AlA9YQSEx4N+z/UvE9veooFQCGXet0OmeM/FSrKknYIF8AIGuGZmj/1P7pqg5BS/SNAliHlTIgZ3L8ZX6OQCRITwJR0lGJoHWgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQcu2FO5PblD4VUYt7Bu2UPpR0lGJoJGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGJoK2gsaC1oLHVijARodG9mlGgFKYGUfZQoaAhoC2gOSwCFlGgQh5RSlChLAUsKhZRoGIlDUMP4Ta0dy5Q+n/kdFpNEHj56xpLpAOgSvhZNEGvvhQc+wngesQkBDT6BVTbEeJEYvhuFqZ721yK+b9QiX/T5Jz5lhdCn8sEZPliFXWAf+R2+lHSUYmgdaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAgrwMghN9SPzay3quI/hNAlHSUYmgkaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAAAAAAAADwvwAAAAAAAPA/lHSUYmgraCxoLWgsdWKMB2hfcmFuZ2WUXZQoRz9S34QgA68gR0At/zF2nDR9ZYwHZl9yYW5nZZRdlChHQUh3oaMrAABHQUjd1S2bmABljAJkY5RLD3Uu #*# calibration_16 = gASVygMAAAAAAAB9lCiMAXaUSwWMBGZ0b2iUjBtudW1weS5wb2x5bm9taWFsLnBvbHlub21pYWyUjApQb2x5bm9taWFslJOUKYGUfZQojARjb2VmlIwVbnVtcHkuY29yZS5tdWx0aWFycmF5lIwMX3JlY29uc3RydWN0lJOUjAVudW1weZSMB25kYXJyYXmUk5RLAIWUQwFilIeUUpQoSwFLCoWUaAyMBWR0eXBllJOUjAJmOJSJiIeUUpQoSwOMATyUTk5OSv////9K/////0sAdJRiiUNQvQ+iKHtX9j9FC0GbIff9P7KRZUNM0uc/d9X8F2iZ3z+B4aGnjd/OP+VqOESewdC/3CZkG9Nrtz931Ctg/C7nP0fOSBWvg6I/Zcy38hqV1L+UdJRijAZkb21haW6UaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAs7DbYKaSUPuGbBN9L+JQ+lHSUYowGd2luZG93lGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGKMB19zeW1ib2yUjAF4lIwGc3ltYm9slGgsdWKMCWZ0b2hfaGlnaJRoBSmBlH2UKGgIaAtoDksAhZRoEIeUUpQoSwFLCoWUaBiJQ1DuZlsaPuEaQEr4VjM8hApA31q9v4Y++j+TcGjpW+DlP7YzB+vwOvI/mVLwCn09AEABFzo32rfdv6pdhsPDm/+/zu7dAFJj6z/9p5ZPElL1P5R0lGJoHWgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQmFyS/EH1lD5r8jWPtwiVPpR0lGJoJGgLaA5LAIWUaBCHlFKUKEsBSwKFlGgYiUMQAAAAAAAA8L8AAAAAAADwP5R0lGJoK2gsaC1oLHVijARodG9mlGgFKYGUfZQoaAhoC2gOSwCFlGgQh5RSlChLAUsKhZRoGIlDULllnYPu4ZQ+9HmUPoaMIT4GVEBP9nUSvlIUxJp9Xfo90ZX69fBB1L0rfjP8ViTTPePuwVky8869mjYMnvB50L2CXH80/MXOPUwPhoZEVJw9lHSUYmgdaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAAPbIJDBFDP7bIo+Mn+RNAlHSUYmgkaAtoDksAhZRoEIeUUpQoSwFLAoWUaBiJQxAAAAAAAADwvwAAAAAAAPA/lHSUYmgraCxoLWgsdWKMB2hfcmFuZ2WUXZQoRz9DEQwJsj0AR0At/+lj18HmZYwHZl9yYW5nZZRdlChHQUhXa3Q4AABHQUjN/7ZOYABljAJkY5RLEHUu