diff --git a/martyn_macros.cfg b/martyn_macros.cfg index f1328a2..9bdabb2 100644 --- a/martyn_macros.cfg +++ b/martyn_macros.cfg @@ -33,7 +33,7 @@ gcode: G1 E-5 ; Retract before cleaning, or we will still have stringing CLEAN_NOZZLE ; doing this again is probably gonna make it work! ;SKEW_PROFILE LOAD=calilantern_skew_profile - G1 E5 ; "UnRetract" + G1 E3 ; "UnRetract" STATUS_PRINTING # Use PRINT_END for the slicer ending script - please customise for your slicer of choice @@ -62,6 +62,13 @@ gcode: RESTORE_GCODE_STATE NAME=STATE_PRINT_END BACKUP_CFG ;backup the config in case anything changed since last print. +[gcode_macro CANCEL_PRINT] +description: Cancel the actual running print +rename_existing: CANCEL_PRINT_BASE +gcode: + TURN_OFF_HEATERS + CANCEL_PRINT_BASE + [gcode_macro G32] gcode: SAVE_GCODE_STATE NAME=STATE_G32 @@ -108,7 +115,7 @@ variable_start_z: 0 variable_wipe_dist: -40 variable_wipe_qty: 5 variable_wipe_spd: 200 -variable_raise_distance: 30 +variable_raise_distance: 5 gcode: {% if "xyz" not in printer.toolhead.homed_axes %} diff --git a/mmu/addons/blobifier.cfg b/mmu-20250326_121743/addons/blobifier.cfg similarity index 100% rename from mmu/addons/blobifier.cfg rename to mmu-20250326_121743/addons/blobifier.cfg diff --git a/mmu/addons/blobifier_hw.cfg b/mmu-20250326_121743/addons/blobifier_hw.cfg similarity index 100% rename from mmu/addons/blobifier_hw.cfg rename to mmu-20250326_121743/addons/blobifier_hw.cfg diff --git a/mmu/addons/dc_espooler.cfg b/mmu-20250326_121743/addons/dc_espooler.cfg similarity index 100% rename from mmu/addons/dc_espooler.cfg rename to mmu-20250326_121743/addons/dc_espooler.cfg diff --git a/mmu/addons/dc_espooler_hw.cfg b/mmu-20250326_121743/addons/dc_espooler_hw.cfg similarity index 100% rename from mmu/addons/dc_espooler_hw.cfg rename to mmu-20250326_121743/addons/dc_espooler_hw.cfg diff --git a/mmu/addons/mmu_eject_buttons.cfg b/mmu-20250326_121743/addons/mmu_eject_buttons.cfg similarity index 100% rename from mmu/addons/mmu_eject_buttons.cfg rename to mmu-20250326_121743/addons/mmu_eject_buttons.cfg diff --git a/mmu/addons/mmu_eject_buttons_hw.cfg b/mmu-20250326_121743/addons/mmu_eject_buttons_hw.cfg similarity index 100% rename from mmu/addons/mmu_eject_buttons_hw.cfg rename to mmu-20250326_121743/addons/mmu_eject_buttons_hw.cfg diff --git a/mmu/addons/mmu_erec_cutter.cfg b/mmu-20250326_121743/addons/mmu_erec_cutter.cfg similarity index 100% rename from mmu/addons/mmu_erec_cutter.cfg rename to mmu-20250326_121743/addons/mmu_erec_cutter.cfg diff --git a/mmu/addons/mmu_erec_cutter_hw.cfg b/mmu-20250326_121743/addons/mmu_erec_cutter_hw.cfg similarity index 100% rename from mmu/addons/mmu_erec_cutter_hw.cfg rename to mmu-20250326_121743/addons/mmu_erec_cutter_hw.cfg diff --git a/mmu/base/mmu.cfg b/mmu-20250326_121743/base/mmu.cfg similarity index 100% rename from mmu/base/mmu.cfg rename to mmu-20250326_121743/base/mmu.cfg diff --git a/mmu/base/mmu_cut_tip.cfg b/mmu-20250326_121743/base/mmu_cut_tip.cfg similarity index 100% rename from mmu/base/mmu_cut_tip.cfg rename to mmu-20250326_121743/base/mmu_cut_tip.cfg diff --git a/mmu/base/mmu_form_tip.cfg b/mmu-20250326_121743/base/mmu_form_tip.cfg similarity index 100% rename from mmu/base/mmu_form_tip.cfg rename to mmu-20250326_121743/base/mmu_form_tip.cfg diff --git a/mmu/base/mmu_hardware.cfg b/mmu-20250326_121743/base/mmu_hardware.cfg similarity index 100% rename from mmu/base/mmu_hardware.cfg rename to mmu-20250326_121743/base/mmu_hardware.cfg diff --git a/mmu/base/mmu_leds.cfg b/mmu-20250326_121743/base/mmu_leds.cfg similarity index 100% rename from mmu/base/mmu_leds.cfg rename to mmu-20250326_121743/base/mmu_leds.cfg diff --git a/mmu/base/mmu_macro_vars.cfg b/mmu-20250326_121743/base/mmu_macro_vars.cfg similarity index 99% rename from mmu/base/mmu_macro_vars.cfg rename to mmu-20250326_121743/base/mmu_macro_vars.cfg index 352f57c..7777c82 100644 --- a/mmu/base/mmu_macro_vars.cfg +++ b/mmu-20250326_121743/base/mmu_macro_vars.cfg @@ -327,7 +327,7 @@ variable_simple_tip_forming : True ; True = Perform simple tip forming, Fal # This should be the position of the toolhead where the cutter arm just # lightly touches the depressor pin variable_cutting_axis : "x" ; "x" or "y". Determines cut direction (axis) during cut motion, used for park distance -variable_pin_loc_xy : 14, 250 ; x,y coordinates of depressor pin +variable_pin_loc_xy : 14, 355 ; x,y coordinates of depressor pin # This distance is added to "pin_loc_x" or "pin_loc_y" depending on the 'cutting_axis' # to determine the starting position and to create a small safety distance that aids diff --git a/mmu/base/mmu_parameters.cfg b/mmu-20250326_121743/base/mmu_parameters.cfg similarity index 100% rename from mmu/base/mmu_parameters.cfg rename to mmu-20250326_121743/base/mmu_parameters.cfg diff --git a/mmu/base/mmu_sequence.cfg b/mmu-20250326_121743/base/mmu_sequence.cfg similarity index 100% rename from mmu/base/mmu_sequence.cfg rename to mmu-20250326_121743/base/mmu_sequence.cfg diff --git a/mmu/base/mmu_software.cfg b/mmu-20250326_121743/base/mmu_software.cfg similarity index 100% rename from mmu/base/mmu_software.cfg rename to mmu-20250326_121743/base/mmu_software.cfg diff --git a/mmu/base/mmu_state.cfg b/mmu-20250326_121743/base/mmu_state.cfg similarity index 100% rename from mmu/base/mmu_state.cfg rename to mmu-20250326_121743/base/mmu_state.cfg diff --git a/mmu/mmu_vars.cfg b/mmu-20250326_121743/mmu_vars.cfg similarity index 74% rename from mmu/mmu_vars.cfg rename to mmu-20250326_121743/mmu_vars.cfg index 69ba7e3..4072660 100644 --- a/mmu/mmu_vars.cfg +++ b/mmu-20250326_121743/mmu_vars.cfg @@ -1,5 +1,5 @@ [Variables] -mmu__revision = 143 +mmu__revision = 177 mmu_calibration_bowden_home = 'encoder' mmu_calibration_bowden_lengths = [-1, -1, -1, -1, -1, -1, -1, -1] mmu_gear_rotation_distances = [-1, -1, -1, -1, -1, -1, -1, -1] @@ -7,6 +7,6 @@ mmu_selector_bypass = -1 mmu_selector_offsets = [-1, -1, -1, -1, -1, -1, -1, -1] mmu_state_filament_pos = 10 mmu_state_gate_selected = -1 -mmu_statistics_counters = {'servo_down': {'count': 10, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 31, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 0, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} -nvm_offset = 0.1 +mmu_statistics_counters = {'servo_down': {'count': 15, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 37, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 0, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}} +nvm_offset = -0.02 diff --git a/mmu/optional/client_macros.cfg b/mmu-20250326_121743/optional/client_macros.cfg similarity index 100% rename from mmu/optional/client_macros.cfg rename to mmu-20250326_121743/optional/client_macros.cfg diff --git a/mmu/optional/mmu_menu.cfg b/mmu-20250326_121743/optional/mmu_menu.cfg similarity index 100% rename from mmu/optional/mmu_menu.cfg rename to mmu-20250326_121743/optional/mmu_menu.cfg diff --git a/moonraker.conf b/moonraker.conf index 8d62c7f..7f9738b 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -86,17 +86,6 @@ info_tags: desc=Cartographer Probe -[update_manager happy-hare] -type: git_repo -path: ~/Happy-Hare -origin: https://github.com/moggieuk/Happy-Hare.git -primary_branch: main -managed_services: klipper - -[mmu_server] -enable_file_preprocessor: True -enable_toolchange_next_pos: True -update_spoolman_location: True [spoolman] server: http://spoolman.martyn.berlin:80 diff --git a/printer.cfg b/printer.cfg index a2839bd..1a067e7 100644 --- a/printer.cfg +++ b/printer.cfg @@ -1,6 +1,3 @@ -[include mmu/base/*.cfg] -[include mmu/optional/client_macros.cfg] -[include mmu/optional/mmu_menu.cfg] # This file contains common pin mappings for the BigTreeTech Octopus V1. # To use this config, the firmware should be compiled for the STM32F446 with a "32KiB bootloader" # Enable "extra low-level configuration options" and select the "12MHz crystal" as clock reference @@ -25,8 +22,8 @@ ## Fine tune E steps [extruder] section [mcu] -# now a canbus node -canbus_uuid: 970febd72165 +# katapulted klipper on usb +serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_210044000150335331383520-if00 [include ebb36.cfg] #[include klicky-probe.cfg] @@ -38,6 +35,8 @@ canbus_uuid: 970febd72165 [include martyn_macros.cfg] [include shaketune.cfg] +[save_variables] +filename: printer_variables.cfg [printer] kinematics: corexy @@ -455,23 +454,25 @@ enable_force_move: True #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.022344, 0.015122, 0.035312, 0.034622, 0.052584, 0.032138, 0.010100 -#*# 0.012184, 0.008422, 0.020506, 0.024766, 0.043691, 0.035916, 0.002167 -#*# 0.007548, -0.005669, 0.003979, 0.010653, 0.021664, 0.012377, -0.020468 -#*# -0.007927, -0.003268, 0.003824, 0.008708, 0.012917, 0.000969, -0.033321 -#*# 0.011999, 0.006491, 0.020277, 0.022756, 0.035240, 0.021950, -0.016566 -#*# 0.013978, 0.011913, 0.030722, 0.017923, 0.038969, 0.020484, -0.008177 -#*# 0.005963, 0.006327, 0.023102, 0.015728, 0.027294, 0.017356, -0.012762 -#*# x_count = 7 -#*# y_count = 7 -#*# mesh_x_pps = 7 -#*# mesh_y_pps = 7 +#*# -0.023250, -0.021727, -0.009465, 0.043817, 0.013887, 0.009949, 0.028724, 0.008964, -0.009072 +#*# -0.028055, -0.009469, 0.002964, 0.006523, 0.010569, 0.011918, 0.033499, 0.022341, -0.009074 +#*# -0.018168, -0.018562, -0.002915, 0.004830, 0.011554, 0.011553, 0.020738, 0.011918, 0.004430 +#*# -0.029127, -0.013363, -0.009467, 0.007247, -0.002917, 0.004828, 0.020008, 0.013995, -0.016696 +#*# -0.032741, -0.013760, -0.012008, -0.004779, -0.000145, 0.006263, 0.010933, 0.001889, -0.012008 +#*# -0.033928, -0.022971, -0.006133, -0.003988, -0.004269, 0.007872, 0.021617, 0.023431, -0.010542 +#*# -0.024042, -0.020032, -0.002799, 0.008964, 0.005621, 0.018765, 0.023073, 0.002964, 0.003474 +#*# -0.034211, -0.020821, -0.008278, -0.003196, -0.015228, 0.017674, 0.029452, 0.013991, -0.004101 +#*# -0.042252, -0.039703, -0.020822, -0.007997, -0.015624, 0.000532, 0.011554, -0.009750, -0.022971 +#*# x_count = 9 +#*# y_count = 9 +#*# mesh_x_pps = 9 +#*# mesh_y_pps = 9 #*# algo = bicubic #*# tension = 0.2 #*# min_x = 35.0 -#*# max_x = 310.0 +#*# max_x = 309.96 #*# min_y = 35.0 -#*# max_y = 310.0 +#*# max_y = 309.96000000000004 #*# #*# [skew_correction calilantern_skew_profile] #*# xy_skew = 0.007318697823262824