Skip to content

Commit 292afa8

Browse files
BlackNetBlackNet
committed
Autocommit from 2024-04-18 07:36:47
Klipper on commit: 2425a74 Moonraker on commit: 99b97af Mainsail version: v2.10.0
1 parent b6ae27d commit 292afa8

28 files changed

+2182
-240
lines changed

‎.moonraker.conf.bkp

+1
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,5 @@ managed_services = klipper
154154

155155
[mmu_server]
156156
enable_file_preprocessor = False
157+
enable_toolchange_next_pos = True
157158

‎KlipperScreen.conf

-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ titlebar_items: chamber, MCU, Pi
129129
#~# extruder = False
130130
#~#
131131
#~# [graph Voron 2.4952]
132-
#~# extruder = False
133132
#~# temperature_sensor octopus = False
134133
#~# temperature_sensor raspberry = False
135-
#~# heater_bed = False
136134
#~#

‎config/macros.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ gcode:
135135
{% if CHAMBER_TEMP > 0 %}
136136
HEATSOAK_CHAMBER TEMP={CHAMBER_TEMP} BED={BED_TEMP}
137137
{% else %}
138-
M118 No chamber temp, call heat soak chamber to 35C.
139-
HEATSOAK_CHAMBER TEMP=35 BED={BED_TEMP}
138+
M118 No chamber temp, call heat soak chamber to 45C.
139+
HEATSOAK_CHAMBER TEMP=45 BED={BED_TEMP}
140140
{% endif %}
141141
M118 return from heat soak chamber.
142142
{% else %}

‎mmu-20240415_134931/addons/blobifier.cfg

+761
Large diffs are not rendered by default.

‎mmu-20240415_134931/addons/blobifier_hw.cfg

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
##########################################################################################
3+
# The servo hardware configuration. Change the values to your needs.
4+
#
5+
[servo blobifier]
6+
# Pin for the servo.
7+
pin: PG14
8+
# Adjust this value until a 'BLOBIFIER_SERVO POS=in' retracts the tray fully without a
9+
# buzzing sound
10+
minimum_pulse_width: 0.00053
11+
# Adjust this value until a 'BLOBIFIER_SERVO POS=out' extends the tray fully without a
12+
# buzzing sound
13+
maximum_pulse_width: 0.0023
14+
# Leave this value at 180
15+
maximum_servo_angle: 180
16+
17+
18+
##########################################################################################
19+
# The bucket hardware configuration. Change the pin to whatever pin you've connected the
20+
# switch to.
21+
#
22+
[gcode_button bucket]
23+
pin: ^PG15 # The pullup ( ^ ) is important here.
24+
press_gcode:
25+
M117 bucket installed
26+
release_gcode:
27+
M117 bucket removed
28+
_BLOBIFIER_COUNT_RESET

‎mmu-20240415_134931/addons/mmu_erec_cutter.cfg

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# Include servo hardware definition separately to allow for automatic upgrade
2+
[include mmu_erec_cutter_hw.cfg]
3+
4+
###########################################################################
5+
# Optional EREC Filament Cutter Support
6+
#
7+
# https://github.com/kevinakasam/ERCF_Filament_Cutter
8+
#
9+
# This is the supplementary macro to support filament cutting at the MMU
10+
# on a ERCF design.
11+
#
12+
# To configure:
13+
# 1. Add this to your printer.cfg:
14+
#
15+
# [include mmu/addons/mmu_erec_cutter.cfg]
16+
#
17+
# 2. In mmu_macro_vars.cfg, change this line:
18+
#
19+
# variable_user_post_unload_extension : "EREC_CUTTER_ACTION"
20+
#
21+
# 3. Tune the servo configuration and macro "variables" below
22+
#
23+
24+
# EREC CUTTER CONFIGURATION -----------------------------------------------
25+
# (addons/mmu_erec_cutter.cfg)
26+
#
27+
[gcode_macro _EREC_VARS]
28+
description: Empty macro to store the variables
29+
gcode: # Leave empty
30+
31+
# These variables control the servo movement
32+
variable_servo_closed_angle : 70 ; Servo angle for closed postion with bowden aligned MMU
33+
variable_servo_open_angle : 10 ; Servo angle to open up the cutter and move bowden away from MMU
34+
variable_servo_duration : 0.4 ; Time (s) of PWM pulse to activate servo
35+
variable_servo_idle_time : 0.5 ; Time (s) to let the servo to reach it's position
36+
37+
# Controls for feed and cut lengths
38+
variable_feed_length : 58 ; Distance in mm from gate parking position to position of blade
39+
variable_cut_length : 10 ; Amount in mm of filament to cut
40+
variable_cut_attempts : 1 ; Number of times the cutter tries to cut the filament
41+
42+
43+
###########################################################################
44+
# Macro to perform the cutting step. Designed to be included to the
45+
# _MMU_POST_UNLOAD step
46+
#
47+
[gcode_macro EREC_CUTTER_ACTION]
48+
description: Cut off the filament tip at the MMU after the unload sequence is complete
49+
gcode:
50+
{% set vars = printer["gcode_macro _EREC_VARS"] %}
51+
52+
_CUTTER_OPEN
53+
_MMU_STEP_MOVE MOVE={vars.feed_length + vars.cut_length}
54+
{% for i in range(vars.cut_attempts) %}
55+
_CUTTER_CLOSE
56+
_CUTTER_OPEN
57+
{% endfor %}
58+
_MMU_STEP_MOVE MOVE=-1
59+
_CUTTER_CLOSE
60+
61+
_MMU_STEP_SET_FILAMENT STATE=2 # FILAMENT_POS_START_BOWDEN
62+
_MMU_STEP_UNLOAD_GATE # Repeat gate parking move
63+
_MMU_M400 # Wait on both move queues
64+
65+
[gcode_macro _CUTTER_CLOSE]
66+
description: Helper macro to set cutting servo the closed position
67+
gcode:
68+
{% set vars = printer["gcode_macro _EREC_VARS"] %}
69+
SET_SERVO SERVO=cut_servo ANGLE={vars.servo_closed_angle} DURATION={vars.servo_duration}
70+
G4 P{vars.servo_idle_time * 1000}
71+
RESPOND MSG="EREC Cutter closed"
72+
M400
73+
74+
[gcode_macro _CUTTER_OPEN]
75+
description: Helper macro to set cutting servo the open position
76+
gcode:
77+
{% set vars = printer["gcode_macro _EREC_VARS"] %}
78+
SET_SERVO SERVO=cut_servo ANGLE={vars.servo_open_angle} DURATION={vars.servo_duration}
79+
G4 P{vars.servo_idle_time * 1000}
80+
RESPOND MSG="EREC Cutter open"
81+
M400
82+

‎mmu-20240415_134931/addons/mmu_erec_cutter_hw.cfg

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
##########################################################################################
3+
# The servo hardware configuration. Change the values to your needs.
4+
#
5+
[mmu_servo cut_servo]
6+
pin: mmu:PA7 # Extra Pin on the ERCF easy Board
7+
maximum_servo_angle: 180 # Set this to 60 for a 60° Servo
8+
minimum_pulse_width: 0.0005 # Adapt these for your servo
9+
maximum_pulse_width: 0.0025 # Adapt these for your servo
10+

‎mmu-20240415_134931/base/mmu.cfg

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
###########################################################################
2+
# Happy Hare MMU hardware pin config
3+
#
4+
# This contains aliases for pins for MCU type MMB
5+
#
6+
[mcu mmu]
7+
serial: /dev/serial/by-id/ERCF-MMU # Config guess. Run ls -l /dev/serial/by-id and set manually # Change to `canbus_uuid: 1234567890` for CANbus setups
8+
9+
# Section to create alias for pins used by MMU for easier integration into Klippain and RatOS.
10+
# The names match those referenced in the mmu_hardware.cfg file. If you get into difficulty
11+
# you can also comment out this aliases definition and configure the pin names directly
12+
# into mmu_hardware.cfg.
13+
#
14+
[board_pins mmu]
15+
mcu: mmu # Assuming using an external / extra mcu dedicated to MMU
16+
aliases:
17+
MMU_GEAR_UART=PA10,
18+
MMU_GEAR_STEP=PB15,
19+
MMU_GEAR_DIR=PB14,
20+
MMU_GEAR_ENABLE=PA8,
21+
MMU_GEAR_DIAG=PA3,
22+
MMU_SEL_UART=PC7,
23+
MMU_SEL_STEP=PD2,
24+
MMU_SEL_DIR=PB13,
25+
MMU_SEL_ENABLE=PD1,
26+
MMU_SEL_DIAG=PA4,
27+
MMU_SEL_ENDSTOP=PB2,
28+
MMU_SERVO=PA0,
29+
MMU_ENCODER=PA1,
30+
MMU_GATE_SENSOR=,
31+
MMU_NEOPIXEL=PA2,
32+
MMU_PRE_GATE_0=PB9,
33+
MMU_PRE_GATE_1=PB8,
34+
MMU_PRE_GATE_2=PC15,
35+
MMU_PRE_GATE_3=PC13,
36+
MMU_PRE_GATE_4=PC14,
37+
MMU_PRE_GATE_5=PB12,
38+
MMU_PRE_GATE_6=PB11,
39+
MMU_PRE_GATE_7=PB10,
40+
MMU_PRE_GATE_8=,
41+
MMU_PRE_GATE_9=,
42+
MMU_PRE_GATE_10=,
43+
MMU_PRE_GATE_11=,
44+

‎mmu-20240415_134931/base/mmu_cut_tip.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/pi/Happy-Hare/config/base/mmu_cut_tip.cfg

‎mmu-20240415_134931/base/mmu_form_tip.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/pi/Happy-Hare/config/base/mmu_form_tip.cfg

0 commit comments

Comments
 (0)