diff --git a/martyn_macros.cfg b/martyn_macros.cfg index 2e531c6..9db8f16 100644 --- a/martyn_macros.cfg +++ b/martyn_macros.cfg @@ -12,6 +12,7 @@ gcode: {% set CHAMBER_TEMP = params.CHAMBER|default(CHAMBER_TEMP_MATERIAL)|float %} {% set CLEAN_TEMP = params.CLEAN|default(170)|float %} G90 ; ensure absolute positioning + M117 Homing STATUS_HOMING G92 E0 ; Reset Extruder BED_MESH_CLEAR @@ -19,21 +20,26 @@ gcode: ;QUAD_GANTRY_LEVEL STATUS_HEATING ;TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={STANDBY_TEMP} ; Start heating up the nozzle most of the way + M117 Bed to {BED_TEMP}°C... M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached - M117 Waiting for chamber to reach {CHAMBER_TEMP}°C... + M117 Chamber to {CHAMBER_TEMP}°C... TEMPERATURE_WAIT SENSOR="temperature_sensor chamber_temp" MINIMUM={CHAMBER_TEMP} ; Wait for chamber temp - + M117 Gantry Level QUAD_GANTRY_LEVEL + M117 Cleaning nozzle M109 S{CLEAN_TEMP} CLEAN_NOZZLE + M117 Eddy Tap G1 X175 Y175 Z2 PROBE_EDDY_NG_TAP - + M117 Bed mesh eddy scan STATUS_MESHING BED_MESH_CALIBRATE ;Well, this is fine and dandy... + M117 Final heat {EXTRUDER_TEMP}/{BED_TEMP} STATUS_HEATING M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached M109 S{EXTRUDER_TEMP} ; Finish heating the nozzle + M117 Clean and prime 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 @@ -43,13 +49,15 @@ 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 + M117 Print started STATUS_PRINTING # Use PRINT_END for the slicer ending script - please customise for your slicer of choice [gcode_macro PRINT_END] gcode: # safe anti-stringing move coords + M117 Print finished {% set th = printer.toolhead %} {% set x_safe = th.position.x + 20 * (1 if th.axis_maximum.x - th.position.x > 20 else -1) %} {% set y_safe = th.position.y + 20 * (1 if th.axis_maximum.y - th.position.y > 20 else -1) %} @@ -78,7 +86,15 @@ gcode: description: Cancel the actual running print rename_existing: CANCEL_PRINT_BASE gcode: + M117 Print cancelled + M400 ; wait for buffer to clear + G92 E0 ; zero the extruder + G1 E-5.0 F1800 ; retract filament TURN_OFF_HEATERS + SET_SKEW CLEAR=1 + BED_MESH_CLEAR + PROBE_EDDY_NG_SET_TAP_OFFSET VALUE=0 + STATUS_CANCELLED CANCEL_PRINT_BASE [gcode_macro G32] diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg index 16f388e..c5c325a 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu/mmu_vars.cfg @@ -1,5 +1,5 @@ [Variables] -mmu__revision = 2771 +mmu__revision = 2786 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': 194, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 51, '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': 197, '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} diff --git a/printer.cfg b/printer.cfg index 0f87d4e..75efa9e 100644 --- a/printer.cfg +++ b/printer.cfg @@ -455,7 +455,7 @@ x_offset: 0 y_offset: 21.42 reg_drive_current: 15 #tap_drive_current: 16 -tap_adjust_z: 0.36 +tap_adjust_z: 0.4 [temperature_sensor btt_eddy_mcu] sensor_type: temperature_mcu @@ -476,15 +476,15 @@ enable_force_move: True #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -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 +#*# -0.029513, -0.021060, -0.032127, -0.011774, -0.005980, -0.016984, 0.000649, -0.021052, -0.036216 +#*# 0.025007, 0.018156, 0.013012, 0.026144, 0.004675, -0.011774, 0.030130, 0.011278, 0.006119 +#*# 0.023876, 0.004380, 0.025010, 0.025007, -0.005980, 0.012416, 0.024433, 0.002091, -0.008875 +#*# 0.003239, 0.008404, -0.004828, 0.003239, -0.009804, -0.000794, 0.021017, -0.000794, -0.018740 +#*# -0.010023, 0.008996, -0.003731, 0.015880, 0.000355, -0.005980, 0.010135, -0.018740, -0.036824 +#*# 0.021561, 0.002091, 0.013012, 0.019879, 0.004679, 0.000355, 0.021017, 0.008996, -0.008875 +#*# 0.035821, 0.014719, 0.017015, 0.025010, 0.008996, 0.008996, 0.030420, 0.008996, 0.002091 +#*# 0.040915, 0.038656, 0.017015, 0.040915, 0.013275, 0.026144, 0.031844, 0.039785, 0.008404 +#*# 0.017015, 0.028996, 0.010089, 0.003239, -0.001938, 0.010123, 0.017015, 0.019290, -0.004831 #*# x_count = 9 #*# y_count = 9 #*# mesh_x_pps = 9 @@ -497,9 +497,9 @@ enable_force_move: True #*# max_y = 310.0 #*# #*# [skew_correction calilantern_skew_profile] -#*# xy_skew = 0.007318697823262824 -#*# xz_skew = 0.0004313347372552723 -#*# yz_skew = -0.0005939714989857676 +#*# xy_skew = 0.002269819397871509 +#*# xz_skew = 0.0 +#*# yz_skew = 0.0 #*# #*# [probe_eddy_ng btt_eddy] #*# calibrated_drive_currents = 15, 16 diff --git a/stealthburner_leds.cfg b/stealthburner_leds.cfg index 66dc8c2..9df407b 100644 --- a/stealthburner_leds.cfg +++ b/stealthburner_leds.cfg @@ -40,12 +40,14 @@ variable_colors: { 'off': {'r': 0.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, 'printing': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, 'standby': {'r': 0.01, 'g': 0.01, 'b': 0.01, 'w': 0.1}, + 'cancelled': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, }, 'nozzle': { # Colors for nozzle states 'heating': {'r': 0.8, 'g': 0.35, 'b': 0.0, 'w':0.5}, 'off': {'r': 0.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, 'on': {'r': 1.0, 'g': 1.0, 'b': 1.0, 'w':1.0}, 'standby': {'r': 0.6, 'g': 0.0, 'b': 0.0, 'w':0.8}, + 'cancelled': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, }, 'thermal': { 'hot': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0}, @@ -191,3 +193,8 @@ gcode: gcode: _set_sb_leds_by_name leds="logo" color="printing" transmit=0 set_nozzle_leds_on + +[gcode_macro status_cancelled] +gcode: + _set_sb_leds_by_name leds="logo" color="cancelled" transmit=0 + _set_sb_leds_by_name leds="nozzle" color="cancelled" transmit=1 \ No newline at end of file