Skip to content

Commit

Permalink
Merge pull request #593 from burkfers/spelling
Browse files Browse the repository at this point in the history
various spelling fixes
  • Loading branch information
moggieuk authored Jan 11, 2025
2 parents 19bf71a + 76c4f5e commit 5d34de2
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Some users have inquired about making donations to support this project (and to
- Automated calibration for easy setup
- Supports MMU "bypass" gate functionality
- Moonraker update-manager support
- Moonraker gcode pre-parsing to extract important print infomation
- Moonraker gcode pre-parsing to extract important print information
- Complete persistence of state and statistics across restarts
- Highly configurable speed control
- Optional integrated encoder driver that validates filament movement, runout, clog detection and flow rate verification!
Expand Down
16 changes: 8 additions & 8 deletions config/addons/blobifier.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# multicolored print without the need of a purge block and without the flurries of
# filament poops consuming your entire 3D printer room. The Blobifier achieves that by
# purging onto a retractable tray which causes the filament to turn into a tiny blob
# rather then a large spiral. This keeps the waste relativly small. The bucket should be
# rather then a large spiral. This keeps the waste relatively small. The bucket should be
# able to account for up to 200 filament swaps (for the 300mm V2).

# The Blobifier uses some room at the back-left side of your printer, depending on your
Expand Down Expand Up @@ -53,7 +53,7 @@
# variable_user_post_load_extension : `BLOBIFIER`
#
# Notes on parameters:
# PURGE_LENGTH=[float] (optional) The length to purge. If ommited (default) it will check
# PURGE_LENGTH=[float] (optional) The length to purge. If omitted (default) it will check
# the purge_volumes matrix or variable_purge_length. This can be used
# to override and for testing.
#
Expand Down Expand Up @@ -97,7 +97,7 @@ variable_wipe_spd_xy: 10000 # Nozzle wipe speed in mm/min.
# could be an 'outer contour' acceleration which is usually lower.
variable_brush_accel: 0

# Blobifier sends the toolhead to the maximum y position during purge oeprations and
# Blobifier sends the toolhead to the maximum y position during purge operations and
# minimum x position during shake operations. This can cause issues when skew correction
# is set up. If you have skew correction enabled and get 'move out of range' errors
# regarding blobifier while skew is enabled, try increasing this value. Keep the
Expand Down Expand Up @@ -222,14 +222,14 @@ variable_part_cooling_fan: 1 # Run it at full speed
variable_purge_length_minimum: 30

# The maximum amount of filament (in mm¹) to purge in a single blob. Blobifier will
# automatically purge multiple blobs if the purge amount exeeds this.
# automatically purge multiple blobs if the purge amount exceeds this.
variable_purge_length_maximum: 150

# Default purge length to fall back on when neither the tool map purge_volumes or
# parameter PURGE_LENGTH is set.
variable_purge_length: 150

# The slicer values often are a bit too wastefull. Tune it here to get optimal values.
# The slicer values often are a bit too wasteful. Tune it here to get optimal values.
# 0.6 (60%) is a good starting point.
variable_purge_length_modifier: 0.6

Expand All @@ -255,7 +255,7 @@ variable_max_blobs: 400
variable_enable_shaker: 1
# The number of back-and-forth motions of one shake
variable_bucket_shakes: 10
# During shaking acceleration can often be higher because you don't neeed to keep print
# During shaking acceleration can often be higher because you don't need to keep print
# quality in mind. Higher acceleration helps better with dispersing the blobs.
variable_shake_accel: 10000

Expand Down Expand Up @@ -454,7 +454,7 @@ gcode:
# Purge a tiny bit slowly
G1 Z{z_up * (1 - pulse_time_constant)} E{purge_per_pulse * 0.05} F{speed}

# retract and unretract filament every now and then for thourough cleaning
# retract and unretract filament every now and then for thorough cleaning
{% if pulse % pulses_per_retract == 0 and pulse > 0 %}
G1 E-2 F1800
G1 E2 F800
Expand Down Expand Up @@ -632,7 +632,7 @@ gcode:
gcode:
{% set safe = printer['gcode_macro _BLOBIFIER_SAFE_DESCEND'] %}
{action_respond_info(
"BLOBIIER: Safe descend possible:\n - tray: %s\n - brush: %s\n - shake: %s" %
"BLOBIFIER: Safe descend possible:\n - tray: %s\n - brush: %s\n - shake: %s" %
(
"yes" if safe.tray else "no",
"yes" if safe.brush else "no",
Expand Down
2 changes: 1 addition & 1 deletion config/addons/dc_espooler.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variable_min_distance: 200
# For the following examples, let's assume max_step_speed = 50.
# And remember actual eSpooler speed values are between 0.0 (off) and 1.0 (full speed) (inclusive)
#
# The forumula looks like this:
# The formula looks like this:
# ({step_speed} / {max_step_speed}) ^ {step_speed_exponent}
#
# With step_speed_exponent of 1 would have a linear ratio:
Expand Down
2 changes: 1 addition & 1 deletion config/addons/mmu_erec_cutter.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ description: Empty macro to store the variables
gcode: # Leave empty

# These variables control the servo movement
variable_servo_closed_angle : 70 ; Servo angle for closed postion with bowden aligned MMU
variable_servo_closed_angle : 70 ; Servo angle for closed position with bowden aligned MMU
variable_servo_open_angle : 10 ; Servo angle to open up the cutter and move bowden away from MMU
variable_servo_duration : 1.5 ; Time (s) of PWM pulse train to activate servo
variable_servo_idle_time : 1.8 ; Time (s) to let the servo to reach it's position
Expand Down
30 changes: 15 additions & 15 deletions config/base/mmu_hardware.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# (")_(") Happy Hare Ready
#
#
# Notes about setup of common external mcus can be found here:
# Notes about setup of common external MCUs can be found here:
# https://github.com/moggieuk/Happy-Hare/blob/main/doc/mcu_notes.md
#
# Note about "touch" endstops: Happy Hare provides extremely flexible homing options using both single steppers or
Expand All @@ -27,23 +27,23 @@
# - on gear stepper allows for the automatic detection of the extruder entrance
#
# These sound wonderful right? They are, but there are caveats:
# - Some external mcu's are terrible at detecting stallguard and often result in an "undervoltage error"
# - Some external MCUs are terrible at detecting stallguard and often result in an "undervoltage error"
# It is generally possible to get selector touch (TMC2209) tuned especially if you set 'stealthchop_threshold'
# to a value greater than homing speeds and less than move speed. I.e. the stepper runs in stealthchop mode when
# homing. [klipper experts will know that it switches the chip mode automatically to stealthchop and then back for
# Stallguard2 support, however the automatic switching back to spreadcycle at the end homing move seems to provoke
# the error condition and setting 'shealthchop_threshold' appropriately avoids this condition. More than you wanted
# the error condition and setting 'stealthchop_threshold' appropriately avoids this condition. More than you wanted
# to know I'm sure!
# - I have not had much luck with touch (stallguard) on the gear stepper with EASY-BRD and ERB mcu's and you really
# - I have not had much luck with touch (stallguard) on the gear stepper with EASY-BRD and ERB MCUs and you really
# want the extra torque of spreadcycle so adjusting 'stealthchop_threshold' is not really an option
# - Enabling on the extruder stepper is viable but you will likley have to change jumpers on your main mcu to expose
# - Enabling on the extruder stepper is viable but you will likely have to change jumpers on your main mcu to expose
# the DIAG pin for whichever driver the extruder stepper is connected to.
#
# In summary, "touch" homing with your MMU is an advanced option that requires patience and careful tuning. Everything
# works with regular endstops and there are workaround options for certain homing points (like extruder entry) in
# the absence of any endstop. I'm really interested in creative setups. Ping me on Discord (moggieuk#6538)
#
# See 'mmu.cfg' for serial definition and pins aliaes
# See 'mmu.cfg' for serial definition and pins aliases
#
# HOMING CAPABLE EXTRUDER (VERY ADVANCED) -----------------------------------------------------------------------------
# With Happy Hare installed even the extruder can be homed. You will find the usual 'endstop' parameters can be added
Expand Down Expand Up @@ -86,7 +86,7 @@ num_gates: {num_gates} # Number of selectable gates on MMU
# NightOwl 1.0
# 3MS 1.0
# 3D Chameleon 1.0
# Prusa 3.0 NOT YET SUPPORTED - COMMING SOON
# Prusa 3.0 NOT YET SUPPORTED - COMING SOON
# Other Generic setup that may require further customization of 'cad' parameters. See doc in mmu_parameters.cfg
#
mmu_vendor: {mmu_vendor} # MMU family
Expand All @@ -95,7 +95,7 @@ mmu_version: {mmu_version} # MMU hardware version number (add mod suffix docum
# These are set automatically from vendor/version above. Only uncomment and set for custom designs ("Other")
#selector_type: {selector_type} # LinearSelector (type-A) or VirtualSelector (type-B)
#variable_bowden_lengths: {variable_bowden_lengths} # 1 = If MMU design has different bowden lengths per gate, 0 = bowden length is the same
#variable_rotation_distances: {variable_rotation_distances} # 1 = If MMU design has disimilar drive/BMG gears, thus rotation distance, 0 = One drive gear (e.g. Tradrack)
#variable_rotation_distances: {variable_rotation_distances} # 1 = If MMU design has dissimilar drive/BMG gears, thus rotation distance, 0 = One drive gear (e.g. Tradrack)
#require_bowden_move: {require_bowden_move} # 1 = If MMU design has bowden move that is included in load/unload, 0 = zero length bowden (skip bowden move)
#filament_always_gripped: {filament_always_gripped} # 1 = Filament is always trapped by MMU (most type-B designs), 0 = MMU can release filament
#has_bypass: {has_bypass} # 1 = Bypass gate available, 0 = No filament bypass possible
Expand Down Expand Up @@ -130,7 +130,7 @@ stealthchop_threshold: 0 # Spreadcycle has more torque and better at speed
step_pin: mmu:MMU_GEAR_STEP
dir_pin: !mmu:MMU_GEAR_DIR
enable_pin: !mmu:MMU_GEAR_ENABLE
rotation_distance: 22.7316868 # Bondtech 5mm Drive Gears. Overriden by 'mmu_gear_rotation_distance' in mmu_vars.cfg
rotation_distance: 22.7316868 # Bondtech 5mm Drive Gears. Overridden by 'mmu_gear_rotation_distance' in mmu_vars.cfg
gear_ratio: {gear_gear_ratio} # E.g. ERCF 80:20, Tradrack 50:17
microsteps: 16 # Recommend 16. Increase only if you "step compress" issues when syncing
full_steps_per_rotation: 200 # 200 for 1.8 degree, 400 for 0.9 degree
Expand Down Expand Up @@ -210,7 +210,7 @@ maximum_pulse_width: {maximum_pulse_width}
#
# OPTIONAL GANTRY SERVO FOR TOOLHEAD FILAMENT CUTTER ------------------------------------------------------------------
#
# (uncomment this section if you have a ganty servo for toolhead cutter pin)
# (uncomment this section if you have a gantry servo for toolhead cutter pin)
#[mmu_servo mmu_gantry_servo]
#pin: {gantry_servo_pin}
#maximum_servo_angle:180
Expand All @@ -227,18 +227,18 @@ maximum_pulse_width: {maximum_pulse_width}
# ███████╗██║ ╚████║╚██████╗╚██████╔╝██████╔╝███████╗██║ ██║
# ╚══════╝╚═╝ ╚═══╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝
# Encoder measures distance, monitors for runout and clogging and constantly calculates % flow rate
# Note that the encoder_resolution set here is purely a default to get started. It will be correcly set after calibration
# Note that the encoder_resolution set here is purely a default to get started. It will be correctly set after calibration
# with the value stored in mmu_vars.cfg
#
# The encoder resolution will be calibrated but it needs a default approximation
# If BMG gear based:
# resolution = bmg_circumfrance / (2 * teeth)
# resolution = bmg_circumference / (2 * teeth)
# 24 / (2 * 17) = 0.7059 for TRCT5000 based sensor
# 24 / (2 * 12) = 1.0 for Binky with 12 tooth disc
#
[mmu_encoder mmu_encoder]
encoder_pin: ^mmu:MMU_ENCODER # EASY-BRD: ^PA6, Flytech ERB: ^gpio22
encoder_resolution: {encoder_resolution} # This is just a starter value. Overriden by 'mmu_encoder_resolution' in mmm_vars.cfg
encoder_resolution: {encoder_resolution} # This is just a starter value. Overridden by 'mmu_encoder_resolution' in mmm_vars.cfg
desired_headroom: 5.0 # The clog/runout headroom that MMU attempts to maintain (closest point to triggering runout)
average_samples: 4 # The "damping" effect of last measurement (higher value means slower clog_length reduction)
flowrate_samples: 20 # How many extruder "movements" on the encoder to measure over for flowrate calc
Expand All @@ -265,7 +265,7 @@ flowrate_samples: 20 # How many extruder "movements" on the encoder to measure
# 'sync_feedback_tension_pin' .. pin for switch activated when filament is under tension
# 'sync_feedback_compression_pin' .. pin for switch activated when filament is under compression
#
# Configuration is flexable: Simply define pins for any sensor you want to enable, if pin is not set (or the alias is empty)
# Configuration is flexible: Simply define pins for any sensor you want to enable, if pin is not set (or the alias is empty)
# it will be ignored. You can also just comment out what you are not using.
#
[mmu_sensors]
Expand Down Expand Up @@ -342,7 +342,7 @@ color_order: GRBW # Set based on your particular neopixel specification
# Note that Happy Hare provides a convenience wrapper [mmu_led_effect] that not only creates an effect on each of the
# [mmu_leds] specified segments but also each individual LED for atomic control. See mmu_leds.cfg for examples
#
# (this section is harmless and ignored if the 'led_strip' obove doesn't exist - LED support will simply be disabled)
# (this section is harmless and ignored if the 'led_strip' above doesn't exist - LED support will simply be disabled)
[mmu_leds]
led_strip: neopixel:mmu_leds
exit_range: 1-{num_gates}
Expand Down
16 changes: 8 additions & 8 deletions config/base/mmu_macro_vars.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ path: ~/printer_data/gcodes
description: Happy Hare optional configuration for print start/end checks
gcode: # Leave empty

# These variables control the behavor of the MMU_START_SETUP and MMU_START_LOAD_INITIAL_TOOL macros
# These variables control the behavior of the MMU_START_SETUP and MMU_START_LOAD_INITIAL_TOOL macros
variable_user_pre_initialize_extension : '' ; Executed at start of MMU_START_SETUP. Commonly G28 to home
variable_home_mmu : False ; True/False, Whether to home mmu before print starts
variable_check_gates : True ; True/False, Whether to check filament is loaded in all gates used
Expand Down Expand Up @@ -163,7 +163,7 @@ description: Happy Hare sequence macro configuration variables
gcode: # Leave empty

# Parking and movement controls:
# Happy Hare defines 7 operations that may require parking. You can specifiy
# Happy Hare defines 7 operations that may require parking. You can specify
# whether to park for each of those operations both during a print and
# standalone (not printing) with Happy Hare or when HH is disabled:
#
Expand Down Expand Up @@ -208,7 +208,7 @@ gcode: # Leave empty
# last - return to original position before park (frequently the default)
# next - return to next print position if possible else last logic will be applied.
# In print this reduces dwell time at the last position reducing blobbing
# and unecessary movement. Only applied to "toolchange" operation
# and unnecessary movement. Only applied to "toolchange" operation
# none - the toolhead is left wherever it ends up after change. In a print the
# next gcode command will restore toolhead x,y position
#
Expand All @@ -233,7 +233,7 @@ variable_enable_park_printing : 'toolchange,runout,load,unload,complete,pause,
variable_enable_park_standalone : 'toolchange,load,unload,pause,cancel' ; Empty '' to disable parking
variable_enable_park_disabled : 'pause,cancel' ; Empty '' to disable parking

variable_min_toolchange_z : 1.0 ; The absolute minimum saftey floor (z-height) for ALL parking moves
variable_min_toolchange_z : 1.0 ; The absolute minimum safety floor (z-height) for ALL parking moves

# These specify the parking location, z_hop and retraction for all enabled operation
# types. Each must be 5 values:
Expand Down Expand Up @@ -296,7 +296,7 @@ variable_user_post_load_extension : '' ; Executed after default logic but be
description: Happy Hare toolhead tip cutting macro configuration variables
gcode: # Leave empty

# Whether the toolhead tip cutting macro will return toolhead to initial postion
# Whether the toolhead tip cutting macro will return toolhead to initial position
# after the cut is complete. If using parking logic it is better to disable this
variable_restore_position : False ; True = return to initial position, False = don't return

Expand Down Expand Up @@ -324,7 +324,7 @@ variable_cutting_axis : "x" ; "x" or "y". Determines cut direction (axis) duri
variable_pin_loc_xy : 14, 250 ; 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 saftely distance that aids
# to determine the starting position and to create a small safety distance that aids
# in generating momentum
variable_pin_park_dist : 5.0 ; Distance in mm

Expand Down Expand Up @@ -422,8 +422,8 @@ variable_unloading_speed : 18 ; Speed in mm/s for slow move to cooling z
# break the string formed.
variable_cooling_tube_position : 35 ; Start of cooling tube. DragonST:35, DragonHF:30, Mosquito:30, Revo:35, RapidoHF:27
variable_cooling_tube_length : 10 ; Movement length. DragonST:15, DragonHF:10, Mosquito:20, Revo:10, RapidoHF:10
variable_initial_cooling_speed : 10 ; Inital slow movement (mm/s) to solidify tip and cool string if formed
variable_final_cooling_speed : 50 ; Fast movement (mm/s) Too fast: tip deformation on eject, Too Slow: long string/no seperation
variable_initial_cooling_speed : 10 ; Initial slow movement (mm/s) to solidify tip and cool string if formed
variable_final_cooling_speed : 50 ; Fast movement (mm/s) Too fast: tip deformation on eject, Too Slow: long string/no separation
variable_cooling_moves : 4 ; Number of back and forth cooling moves to make (2-4 is a good start)

# Step 4 - Skinnydip
Expand Down
Loading

0 comments on commit 5d34de2

Please sign in to comment.