Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update primeline so that it runs along the rectangle of the first layer #498

Merged
merged 5 commits into from
Feb 27, 2024

Conversation

elpopo-eng
Copy link
Collaborator

Thanks to @fbeauKmi

Now prime_line_xy defines the origin of the baseline
The primeline is made on the corner of the FL_SIZE rectangle closest to the origin.

Add Variable prime_line_margin wich define distance of purge line from fl_size rectangle

If FL_SIZE is not defined, old primeline is used

@elpopo-eng elpopo-eng requested a review from Frix-x February 24, 2024 10:42
@Surion79
Copy link
Collaborator

Surion79 commented Feb 24, 2024

i don't see the benefit of it except 2 seconds of travel. for me it looks overcomplicating stuff, including possible debugging.

Aside of that: This will fail after updating klippain via moonraker as it is defaulting on a non-existing variable.
also: this function should be available via variable. Because i don't want to use it. i want my primeline exact at the same place, all the time. even with bed mesh.

@elpopo-eng
Copy link
Collaborator Author

elpopo-eng commented Feb 24, 2024

The aim is to place the primeline as close as possible to the bdemesh area.
If we place the primeline on the edge of the bed, you can engrave your PEI, but if you like that, we can introduce a variable to use the legacy primeline...

@Surion79
Copy link
Collaborator

Engrave? The location is so near the border, it would never get printed on anyway.

@Surion79
Copy link
Collaborator

Don't forget my other comments regarding breaking klippain on update without the default fix.

Copy link
Collaborator

@Surion79 Surion79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default on a non existing variable will break all installations which are updating existing klippain installations. Fix is to add another default with the default value. That was the solution @Benoitone suggested when we worked on the mmu verification of his branch.

macros/helpers/prime_line.cfg Outdated Show resolved Hide resolved
macros/helpers/prime_line.cfg Outdated Show resolved Hide resolved
@fbeauKmi
Copy link
Contributor

Thanks for this PR @elpopo-eng . I think this is a nice to have. IMO the purge line should always be inside the bed mesh.Then it could be possible to go lower at the end of the prime line (Z<0.05) to wipe the nozzle on the bed.

@Surion79 If you don't intend to use this feature, you can remove prime_line from your startup sequence and then add it to your startup gcode in the slicer.

That's the beauty of Klippain being fully overridable ❤️ .

@Surion79
Copy link
Collaborator

Thanks for this PR @elpopo-eng . I think this is a nice to have. IMO the purge line should always be inside the bed mesh.Then it could be possible to go lower at the end of the prime line (Z<0.05) to wipe the nozzle on the bed.

@Surion79 If you don't intend to use this feature, you can remove prime_line from your startup sequence and then add it to your startup gcode in the slicer.

That's the beauty of Klippain being fully overridable ❤️ .

errr.... My Klippain tag is reading Collaborator, and i proposed a solution? I could also just push my proposal to the Klippain branch primeline_FLSIZE_dependent, but I won't.

Anyway, you don't override stuff by making users override existing functionality in klippain to tell them "do that in your slicer now".

@fbeauKmi
Copy link
Contributor

Anyway, you don't override stuff by making users override existing functionality in klippain to tell them "do that in your slicer now".

No offense, override in Klippain if you prefer 👍

@Surion79
Copy link
Collaborator

Surion79 commented Feb 25, 2024

still a no regarding overrides, because this change contradicts existing configuration in variables.cfg. without proper parametrization or setting an enable/disable variable, the prime line location is moved away from the settings in the variables.cfg.
i just ask for a variable to disable/enable this feature. i have no idea, why this is such hassle? it is a couple lines of code and a variable, additional to the variable which is already introduced by this PR.

something like enable_variable_primeline_placement or place_primeline_in_bedmesh

@Frix-x
Copy link
Owner

Frix-x commented Feb 25, 2024

I appreciate the discussion surrounding this PR and the thoughtful contributions from everyone involved, but please keep it friendly. To address the concerns raised, here is my point:

  1. The demand for adaptive purge integrated within Klippain is something that I get everyday on Discord or in PMs. As currently there is no solution in Klippain, I push the users over using KAMP. The problem is that using KAMP in Klippain is not that easy and can easily break the adaptive mesh: this create a lot of support work for me to help them going. So I'm definitely full on to integrate this to Klippain to have something just working out of the box.

  2. The initiative for developing adaptive purge has been collaboratively discussed on Discord and is supported by contributions from Elpopo and Fbeaukmi since I had no time to develop it myself. This collaboration allowed to bring this PR and is also followed by a lot of people on Discord just waiting for it to be merged.

  3. The concerns about a printed line (as the purge operation is doing) outside the meshed print zone are valid, particularly for printers with warped beds like Ender3, Prusa or Switchwire. This was mitigated by using a fixed height of 0.6mm for the prime line, but it was changed in a previous commit with an adjustable height parameter, that, while enhancing flexibility, also reintroduces the risk of crashes if using a small value closer to the print layer height like 0.2mm. Positioning the purge as close as possible to the part emerges as a prudent strategy to mitigate these risks.

  4. Finally, I think that having adaptive mesh enabled by default sets a precedent for incorporating adaptive purge in a similar manner. Users can still not use the option by removing the SIZE parameter. I do not see any point in doing an adaptive mesh and not an adaptive purge or vice versa. On a good bed, it will be nothing more than a shiny feature but will not have any cons, on a warped bed it can avoid a crash.

This PR represents a step forward in aligning Klippain's features with the community's evolving needs and Klipper's advancements (like the adaptive mesh that is now mainline). So I'll review and test it properly to validate that everything is working and merge it in the current state.

@Surion79
Copy link
Collaborator

I still request to add a disable variable, so users can choose to make a bed mesh and an outside prime line.
It can be enabled by default.

@Frix-x Since i invested a lot of time to this project, i think it is not too much to ask.

@elpopo-eng
Copy link
Collaborator Author

@Frix-x we have chosen to always orient the primeline towards the centre of the bed (case 1) in order to avoid a possible end of prime_line outside the bed (case 2) and to have a simple code.
We can change this behaviour if you don't think it's correct.

case 1 :
image

case 2 :
image

@Frix-x
Copy link
Owner

Frix-x commented Feb 26, 2024

Ok, I made some changes to make it a bit more flexible and cleaner:

  • There is now an ADAPTIVE_PRIMELINE variable that you can use from your slicer to enable/disable the "adaptive mode" of the primeline directly from the START_PRINT sequence. By default, if nothing is set, it's True, so adaptive mode will be enabled for everyone unless we force it to be disabled.
  • The PRIMELINE' macro can now also take an ADAPTIVE_MODE' parameter that allow you to set the behavior when calling it manually. I think this is useful because when called manually, there is no printing going on and I understand that someone would want to know where the primeline is going to be and not randomly put it where the last print was done.
  • I've extended the SIZE parameter to work as it does with the bed_mesh by also allowing the exclude objects tags to be used when they are found and when SIZE is omitted. So in this case it will default to something like KAMP.
  • I also added a very small move at the end to prevent the head from crashing back in the primeline if the slicer starts to emit a Z down move, as I noticed some actually do and this was asked multiple times by the community.

As my main printer is currently running for a couple of hours, can someone test it and let me know if everything is working ok?

@Frix-x Frix-x dismissed Surion79’s stale review February 26, 2024 22:24

outdated, changes were done

@Frix-x Frix-x requested a review from fbeauKmi February 26, 2024 22:24
@Surion79
Copy link
Collaborator

Surion79 commented Feb 26, 2024

I have currently an open printer and don't mind testing it. Anything specific to test? Fl size near the border?

(Just for testing i can activate it, not just in general for me)

macros/base/start_print.cfg Outdated Show resolved Hide resolved
macros/helpers/prime_line.cfg Outdated Show resolved Hide resolved
macros/helpers/prime_line.cfg Show resolved Hide resolved
macros/helpers/prime_line.cfg Outdated Show resolved Hide resolved
macros/helpers/prime_line.cfg Outdated Show resolved Hide resolved
@Frix-x
Copy link
Owner

Frix-x commented Feb 27, 2024

New push, new tests needed before a final merge :)

@Frix-x Frix-x requested a review from fbeauKmi February 27, 2024 17:40
@Frix-x Frix-x merged commit 20f41e8 into develop Feb 27, 2024
@Frix-x Frix-x deleted the primeline_FLSIZE_dependent branch February 27, 2024 21:54
tehniemer added a commit to tehniemer/klippain that referenced this pull request Mar 19, 2024
* BTT S2DW V1.0 and similar RP2040 + lis2dw boards (Frix-x#439)

* Add Octopus Pro 1.0 MCU definition as duplicate of Octopus MCU

* fix typo in BTT_Octopus_Pro_v1.1.cfg (Frix-x#460)

* Turn on filter only if it was used during printing. (Frix-x#380)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>

* added parameters to park (Frix-x#391)

* M8P v2.0 SPI fix (Frix-x#389)


Co-authored-by: Félix Boisselier <[email protected]>

* Add per material filament sensor management (Frix-x#381)

* Remove _TIP_SHAPING from End/cancel print macros (Frix-x#357)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* Klipper SET_PRINT_STATS_INFO compatibility (Frix-x#392)


Co-authored-by: Félix Boisselier <[email protected]>

* Fix error with turning on filter only if it was used during printing. (Frix-x#406)

Fix issue discovered after merging Frix-x#380

* fix missing variable to cancel_print (Frix-x#408)

* filament sensor status checks universal (Frix-x#411)

* proper Shake&Tune integration in Klippain

* add mellow SB2040 v2 and SB2040 Pro toolhead boards (Frix-x#417)

* correct overriders misspelling (Frix-x#425)

* check if heatsoak is configured to verbose message (Frix-x#424)

* typo

* Add pin definitions for Fysetc S6 V2.X

* add TR8x2 leadscrew config for trident

* Add older version of Fysetc mini12864 display

* HappyHare & other related dev (Frix-x#371)

* HappyHare MMU integration in Klippain

* Spoolman support

* Multiple MCU templates added or modified, especially MMU templates

* LED system rework to support the LED_effects plugin and rainbow barf, etc... ( Frix-x#416 )

* TMC Autotune moonraker updater predefined config (add your motor defs to your overrides.cfg or mcu.cfg)

---------

Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: ksummers92 <[email protected]>

* fix status leds at startup (Frix-x#448)

* Status leds on startup fix

* display menu and V0 Display (Frix-x#420)

* Better display menu adapted to Klippain

* V0 display support

* Klippain boot logo

---------

Co-authored-by: Elias Huwyler <[email protected]>

* improved display management structure

* fixed MMU includes for HappyHare symlink

* Add BLTouch support (Frix-x#450)

* fixed nozzle and status led on/off.  (Frix-x#454)

* reverted update manager to main branch

* followed naming scheme for bltouch include as virtual

* moved the machine.cfg include and included additional thermistor defs

* Mellow fly super8 template (Frix-x#463)

* Support for TMC5160 on Z Axis (Frix-x#469)

* added fix to prevent issues when updating Klippain without MMU (Frix-x#462)

* Add configs for Fysetc SB Can TH boards (Frix-x#464)


Co-authored-by: Félix Boisselier <[email protected]>

* fix: make prime line height a variable parameter (Frix-x#466)

Fix Frix-x#465

* fix for extrude when temperature is too low (Frix-x#480)

* Add BTT Kraken MCU support (Frix-x#476)

* Update Fysetc_Spider_v3.x.cfg to fix fan ports (Frix-x#474)

* fix BTT_MMB pin (Frix-x#486)

* added fix for rsense for TMC5160 (Frix-x#489)

* Add support for dockable probes with separate retainer (Frix-x#401)

This is needed for probes like https://github.com/kevinakasam/KlackEnder-Probe

* fix for rsense on TMC5160 Z (Frix-x#490)

* Create stale action workflow (Frix-x#449)


Co-authored-by: Félix Boisselier <[email protected]>

* fixed K-Shake&Tune integration

* Avoid cooling hotend in extruder_preheating Frix-x#495 (Frix-x#496)

* Add a park front macro for toolhead maintenance (Frix-x#494)

* Update MMU include order to allow overriding default HH defs (Frix-x#497)

* avoid led effect flashing on startup if leds desabled on startup (Frix-x#500)

* Added BTT SKR2 board template (Frix-x#503)

* fixed the regression introduced in startup call

* fix typo in stale.yml

* fixed probe pin for BTT_SB2209_RP2040_v1.0 (Frix-x#507)

* LDO Nitehawk MCU template and tachometer management (Frix-x#505)


Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>

* update primeline to make it adaptive (Frix-x#498)


Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* fixed missing adaptive primeline variable

* remplaced CANCEL_PRINT by PARK in the automated error management gcode

* fixed typo in LDO Nitehawk manufacturer template

* Add support for Manta_M5P v1.0 and 0.9 degree steppers on Trident Z axis (Frix-x#514)

* fix homing check for PARK in error gcode (Frix-x#513)

* fix typo in Fysetc_ERCF_ERB.cfg (Frix-x#519)

* Update BTT_Kraken_v1.0.cfg, RGB1 fix

listed as PF10, but should be PF12 (pf10 is mcu_min7 already, an endstop)

verified rest of pins as well

* reverted PARK and PARK_FRONT to fail if axis are not homed

* fix PARK with overriden param E (Frix-x#515)

* install and uninstall scripts improvement (Frix-x#511)

* Don't fail uninstall if the backup folder has been removed
* Make uninstall work when backup has sub-directories
* Make sure we don't fail making a backup when there is no current user config folder

* added Mellow Fly Gemini v3 MCU template (Frix-x#527)

* fix pinout for Fysetc_ERB board (Frix-x#530)

* updated homing_override to improve sensorless homing (Frix-x#531)

by using M400 vs the old 2 second dwell time that is not required anymore

* fixed v0_display pin and improved overrides docs (Frix-x#535)

* Update rpi_temp.cfg

Format with _ so a space is in the name, like other temps

* Update cabinet_temp.cfg

* switched to the new minimum_cruise_ratio Klipper parameter

* commented the default minimum_cruise_ratio to not break older Klipper versions

---------

Co-authored-by: Gustavo Ribeiro Alves <[email protected]>
Co-authored-by: Andrew Wickham <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: Benoitone <[email protected]>
Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Arsène Thieffry <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: ksummers92 <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Neil Smith <[email protected]>
Co-authored-by: Reiner Uhry <[email protected]>
Co-authored-by: lokiagent <[email protected]>
Co-authored-by: Arcadien <[email protected]>
Co-authored-by: Tyler Olson <[email protected]>
Co-authored-by: Felix Boisselier <[email protected]>
Co-authored-by: elpopo <[email protected]>
Co-authored-by: tsk-2222 <[email protected]>
Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>
Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Birkemosen <[email protected]>
Co-authored-by: Eric <[email protected]>
Co-authored-by: Magne Rasmussen <[email protected]>
Co-authored-by: Parker <[email protected]>
ksummers92 added a commit to ksummers92/klippain that referenced this pull request Jun 22, 2024
* Fysetc Catalyst Config

* added respond on idle_timeout

* sherpa mini config (Frix-x#385)


Co-authored-by: Félix Boisselier <[email protected]>

* switch moonraker update management to dev channel (Frix-x#390)

* Update orbiter2.0.cfg (Frix-x#405)

Add comment about required current. At the default of 0.45 on the Orbiter 2 motor, very poor performance will occur including significant underextrusion on infill, etc.

* chore(mcu): properly label CAN H/L (Frix-x#418)

TX and RX are not helpful, looking at the back of the m8p v2 shows that RX is high, and TX is low.

* added back the proper idle timeout behavior

* BTT S2DW V1.0 and similar RP2040 + lis2dw boards (Frix-x#439)

* Add Octopus Pro 1.0 MCU definition as duplicate of Octopus MCU

* fix typo in BTT_Octopus_Pro_v1.1.cfg (Frix-x#460)

* Turn on filter only if it was used during printing. (Frix-x#380)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>

* added parameters to park (Frix-x#391)

* M8P v2.0 SPI fix (Frix-x#389)


Co-authored-by: Félix Boisselier <[email protected]>

* Add per material filament sensor management (Frix-x#381)

* Remove _TIP_SHAPING from End/cancel print macros (Frix-x#357)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* Klipper SET_PRINT_STATS_INFO compatibility (Frix-x#392)


Co-authored-by: Félix Boisselier <[email protected]>

* Fix error with turning on filter only if it was used during printing. (Frix-x#406)

Fix issue discovered after merging Frix-x#380

* fix missing variable to cancel_print (Frix-x#408)

* filament sensor status checks universal (Frix-x#411)

* proper Shake&Tune integration in Klippain

* add mellow SB2040 v2 and SB2040 Pro toolhead boards (Frix-x#417)

* correct overriders misspelling (Frix-x#425)

* check if heatsoak is configured to verbose message (Frix-x#424)

* typo

* Add pin definitions for Fysetc S6 V2.X

* add TR8x2 leadscrew config for trident

* Add older version of Fysetc mini12864 display

* HappyHare & other related dev (Frix-x#371)

* HappyHare MMU integration in Klippain

* Spoolman support

* Multiple MCU templates added or modified, especially MMU templates

* LED system rework to support the LED_effects plugin and rainbow barf, etc... ( Frix-x#416 )

* TMC Autotune moonraker updater predefined config (add your motor defs to your overrides.cfg or mcu.cfg)

---------

Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: ksummers92 <[email protected]>

* fix status leds at startup (Frix-x#448)

* Status leds on startup fix

* display menu and V0 Display (Frix-x#420)

* Better display menu adapted to Klippain

* V0 display support

* Klippain boot logo

---------

Co-authored-by: Elias Huwyler <[email protected]>

* improved display management structure

* fixed MMU includes for HappyHare symlink

* Add BLTouch support (Frix-x#450)

* fixed nozzle and status led on/off.  (Frix-x#454)

* reverted update manager to main branch

* followed naming scheme for bltouch include as virtual

* moved the machine.cfg include and included additional thermistor defs

* Mellow fly super8 template (Frix-x#463)

* Support for TMC5160 on Z Axis (Frix-x#469)

* added fix to prevent issues when updating Klippain without MMU (Frix-x#462)

* Add configs for Fysetc SB Can TH boards (Frix-x#464)


Co-authored-by: Félix Boisselier <[email protected]>

* fix: make prime line height a variable parameter (Frix-x#466)

Fix Frix-x#465

* fix for extrude when temperature is too low (Frix-x#480)

* Add BTT Kraken MCU support (Frix-x#476)

* Update Fysetc_Spider_v3.x.cfg to fix fan ports (Frix-x#474)

* fix BTT_MMB pin (Frix-x#486)

* added fix for rsense for TMC5160 (Frix-x#489)

* Add support for dockable probes with separate retainer (Frix-x#401)

This is needed for probes like https://github.com/kevinakasam/KlackEnder-Probe

* fix for rsense on TMC5160 Z (Frix-x#490)

* Create stale action workflow (Frix-x#449)


Co-authored-by: Félix Boisselier <[email protected]>

* fixed K-Shake&Tune integration

* Avoid cooling hotend in extruder_preheating Frix-x#495 (Frix-x#496)

* Add a park front macro for toolhead maintenance (Frix-x#494)

* Update MMU include order to allow overriding default HH defs (Frix-x#497)

* avoid led effect flashing on startup if leds desabled on startup (Frix-x#500)

* Added BTT SKR2 board template (Frix-x#503)

* fixed the regression introduced in startup call

* fix typo in stale.yml

* fixed probe pin for BTT_SB2209_RP2040_v1.0 (Frix-x#507)

* LDO Nitehawk MCU template and tachometer management (Frix-x#505)


Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>

* update primeline to make it adaptive (Frix-x#498)


Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* fixed missing adaptive primeline variable

* remplaced CANCEL_PRINT by PARK in the automated error management gcode

* fixed typo in LDO Nitehawk manufacturer template

* Add support for Manta_M5P v1.0 and 0.9 degree steppers on Trident Z axis (Frix-x#514)

* fix homing check for PARK in error gcode (Frix-x#513)

* fix typo in Fysetc_ERCF_ERB.cfg (Frix-x#519)

* Update BTT_Kraken_v1.0.cfg, RGB1 fix

listed as PF10, but should be PF12 (pf10 is mcu_min7 already, an endstop)

verified rest of pins as well

* reverted PARK and PARK_FRONT to fail if axis are not homed

* fix PARK with overriden param E (Frix-x#515)

* install and uninstall scripts improvement (Frix-x#511)

* Don't fail uninstall if the backup folder has been removed
* Make uninstall work when backup has sub-directories
* Make sure we don't fail making a backup when there is no current user config folder

* added Mellow Fly Gemini v3 MCU template (Frix-x#527)

* fix pinout for Fysetc_ERB board (Frix-x#530)

* updated homing_override to improve sensorless homing (Frix-x#531)

by using M400 vs the old 2 second dwell time that is not required anymore

* fixed v0_display pin and improved overrides docs (Frix-x#535)

* Update rpi_temp.cfg

Format with _ so a space is in the name, like other temps

* Update cabinet_temp.cfg

* switched to the new minimum_cruise_ratio Klipper parameter

* commented the default minimum_cruise_ratio to not break older Klipper versions

* added Beacon accelerometer support (Frix-x#552)

* Happy hare v2.5 merge (#8)

* make Klippain compatible with HH v2.5

* start print for HH > v2.5

* move HHv2.5 init in _KLIPPAIN_MMU_INIT

* add some info in mmu.md for 2.5

* add sync fonction with HH>2.5

* add eject slicer option for HH>2.5

* typo error

* Update end_print.cfg

Change EJECT to boolean for MMU_END

* show HH version on startup

* added custom4..9 in start_print (Frix-x#539)

* updated beeper sections (Frix-x#549)

by switching to pwm_cycle_time instead of output pin

* removed M204 in favor of SET_VELOCITY_LIMIT (Frix-x#555)

* support for LDO Picobilical (Frix-x#533)

* removed M204 for SET_VELOCITY_LIMIT (Frix-x#554)

* removed last M204 for SET_VELOCITY_LIMIT (Frix-x#553)

* added Beacon accelerometer support (Frix-x#552)

* deprecate HH<v2.5 and small typos

* removed old artifacts from TMC2240 init feature

Please use https://github.com/andrewmcgr/klipper_tmc_autotune instead!

* error on changes in _INIT_CHECK_MMU

---------

Co-authored-by: Benoitone <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Colten Edwards <[email protected]>
Co-authored-by: Nick Danyluk <[email protected]>
Co-authored-by: Svennixx <[email protected]>

* Align hardware/mmu.cfg with upstream

* Update nozzle brushing to accomodate offset for situations in which standard nozzle brushing parameters lead to undesired interactions.

* Modify starting move prior to brush procedure to accomodate for brush_offset

* Fix brush center calculation

* Add some debugging messages

* ???

* Fixed brush stroke maths

* Removed unneccessary if statement

* Update Shake&Tune path

This is due to a change in Shake&Tune v3.0.0

---------

Co-authored-by: Surion79 <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: Benoitone <[email protected]>
Co-authored-by: Eric <[email protected]>
Co-authored-by: Devon Hazelett <[email protected]>
Co-authored-by: Gustavo Ribeiro Alves <[email protected]>
Co-authored-by: Andrew Wickham <[email protected]>
Co-authored-by: tehniemer <[email protected]>
Co-authored-by: Arsène Thieffry <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Neil Smith <[email protected]>
Co-authored-by: Reiner Uhry <[email protected]>
Co-authored-by: lokiagent <[email protected]>
Co-authored-by: Arcadien <[email protected]>
Co-authored-by: Tyler Olson <[email protected]>
Co-authored-by: Felix Boisselier <[email protected]>
Co-authored-by: elpopo <[email protected]>
Co-authored-by: tsk-2222 <[email protected]>
Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>
Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Birkemosen <[email protected]>
Co-authored-by: Magne Rasmussen <[email protected]>
Co-authored-by: Parker <[email protected]>
Co-authored-by: Svennixx <[email protected]>
Co-authored-by: Colten Edwards <[email protected]>
Co-authored-by: Nick Danyluk <[email protected]>
ksummers92 added a commit to ksummers92/klippain that referenced this pull request Jun 22, 2024
* feat: add LDO Leviathan main board (Frix-x#365)

Signed-off-by: Stefan Dej <[email protected]>

* fix fans pins in BTT_Manta_M8P_v2.0.cfg

* fix wrong LDO Leviathan cfg location

* added Octopus Pro v1.1 template (Frix-x#349) (Frix-x#367)

Co-authored-by: Jan-Gerrit Drexhage <[email protected]>

* Fysetc Catalyst Config

* added respond on idle_timeout

* sherpa mini config (Frix-x#385)


Co-authored-by: Félix Boisselier <[email protected]>

* switch moonraker update management to dev channel (Frix-x#390)

* Update orbiter2.0.cfg (Frix-x#405)

Add comment about required current. At the default of 0.45 on the Orbiter 2 motor, very poor performance will occur including significant underextrusion on infill, etc.

* chore(mcu): properly label CAN H/L (Frix-x#418)

TX and RX are not helpful, looking at the back of the m8p v2 shows that RX is high, and TX is low.

* added back the proper idle timeout behavior

* BTT S2DW V1.0 and similar RP2040 + lis2dw boards (Frix-x#439)

* Add Octopus Pro 1.0 MCU definition as duplicate of Octopus MCU

* fix typo in BTT_Octopus_Pro_v1.1.cfg (Frix-x#460)

* Turn on filter only if it was used during printing. (Frix-x#380)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>

* added parameters to park (Frix-x#391)

* M8P v2.0 SPI fix (Frix-x#389)


Co-authored-by: Félix Boisselier <[email protected]>

* Add per material filament sensor management (Frix-x#381)

* Remove _TIP_SHAPING from End/cancel print macros (Frix-x#357)


Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* Klipper SET_PRINT_STATS_INFO compatibility (Frix-x#392)


Co-authored-by: Félix Boisselier <[email protected]>

* Fix error with turning on filter only if it was used during printing. (Frix-x#406)

Fix issue discovered after merging Frix-x#380

* fix missing variable to cancel_print (Frix-x#408)

* filament sensor status checks universal (Frix-x#411)

* proper Shake&Tune integration in Klippain

* add mellow SB2040 v2 and SB2040 Pro toolhead boards (Frix-x#417)

* correct overriders misspelling (Frix-x#425)

* check if heatsoak is configured to verbose message (Frix-x#424)

* typo

* Add pin definitions for Fysetc S6 V2.X

* add TR8x2 leadscrew config for trident

* Add older version of Fysetc mini12864 display

* HappyHare & other related dev (Frix-x#371)

* HappyHare MMU integration in Klippain

* Spoolman support

* Multiple MCU templates added or modified, especially MMU templates

* LED system rework to support the LED_effects plugin and rainbow barf, etc... ( Frix-x#416 )

* TMC Autotune moonraker updater predefined config (add your motor defs to your overrides.cfg or mcu.cfg)

---------

Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: ksummers92 <[email protected]>

* fix status leds at startup (Frix-x#448)

* Status leds on startup fix

* display menu and V0 Display (Frix-x#420)

* Better display menu adapted to Klippain

* V0 display support

* Klippain boot logo

---------

Co-authored-by: Elias Huwyler <[email protected]>

* improved display management structure

* fixed MMU includes for HappyHare symlink

* Add BLTouch support (Frix-x#450)

* fixed nozzle and status led on/off.  (Frix-x#454)

* reverted update manager to main branch

* followed naming scheme for bltouch include as virtual

* moved the machine.cfg include and included additional thermistor defs

* Mellow fly super8 template (Frix-x#463)

* Support for TMC5160 on Z Axis (Frix-x#469)

* added fix to prevent issues when updating Klippain without MMU (Frix-x#462)

* Add configs for Fysetc SB Can TH boards (Frix-x#464)


Co-authored-by: Félix Boisselier <[email protected]>

* fix: make prime line height a variable parameter (Frix-x#466)

Fix Frix-x#465

* fix for extrude when temperature is too low (Frix-x#480)

* Add BTT Kraken MCU support (Frix-x#476)

* Update Fysetc_Spider_v3.x.cfg to fix fan ports (Frix-x#474)

* fix BTT_MMB pin (Frix-x#486)

* added fix for rsense for TMC5160 (Frix-x#489)

* Add support for dockable probes with separate retainer (Frix-x#401)

This is needed for probes like https://github.com/kevinakasam/KlackEnder-Probe

* fix for rsense on TMC5160 Z (Frix-x#490)

* Create stale action workflow (Frix-x#449)


Co-authored-by: Félix Boisselier <[email protected]>

* fixed K-Shake&Tune integration

* Avoid cooling hotend in extruder_preheating Frix-x#495 (Frix-x#496)

* Add a park front macro for toolhead maintenance (Frix-x#494)

* Update MMU include order to allow overriding default HH defs (Frix-x#497)

* avoid led effect flashing on startup if leds desabled on startup (Frix-x#500)

* Added BTT SKR2 board template (Frix-x#503)

* fixed the regression introduced in startup call

* fix typo in stale.yml

* fixed probe pin for BTT_SB2209_RP2040_v1.0 (Frix-x#507)

* LDO Nitehawk MCU template and tachometer management (Frix-x#505)


Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>

* update primeline to make it adaptive (Frix-x#498)


Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>

* fixed missing adaptive primeline variable

* remplaced CANCEL_PRINT by PARK in the automated error management gcode

* fixed typo in LDO Nitehawk manufacturer template

* Add support for Manta_M5P v1.0 and 0.9 degree steppers on Trident Z axis (Frix-x#514)

* fix homing check for PARK in error gcode (Frix-x#513)

* fix typo in Fysetc_ERCF_ERB.cfg (Frix-x#519)

* Update BTT_Kraken_v1.0.cfg, RGB1 fix

listed as PF10, but should be PF12 (pf10 is mcu_min7 already, an endstop)

verified rest of pins as well

* reverted PARK and PARK_FRONT to fail if axis are not homed

* fix PARK with overriden param E (Frix-x#515)

* install and uninstall scripts improvement (Frix-x#511)

* Don't fail uninstall if the backup folder has been removed
* Make uninstall work when backup has sub-directories
* Make sure we don't fail making a backup when there is no current user config folder

* added Mellow Fly Gemini v3 MCU template (Frix-x#527)

* fix pinout for Fysetc_ERB board (Frix-x#530)

* updated homing_override to improve sensorless homing (Frix-x#531)

by using M400 vs the old 2 second dwell time that is not required anymore

* fixed v0_display pin and improved overrides docs (Frix-x#535)

* Update rpi_temp.cfg

Format with _ so a space is in the name, like other temps

* Update cabinet_temp.cfg

* switched to the new minimum_cruise_ratio Klipper parameter

* commented the default minimum_cruise_ratio to not break older Klipper versions

* added Beacon accelerometer support (Frix-x#552)

* Update Shake&Tune path

This is due to a change in Shake&Tune v3.0.0

* fixed max_z bug in PARK macro

* Update BTT_SKR_2.cfg to fix EXP1_4 typo (Frix-x#578)

* Nozzle cleaning parameters update (Frix-x#569)

* add built in adxl sensor from nitehawk sb board (Frix-x#602)

* add: mcu Fystec Cheetah v3 (Frix-x#604)

---------

Signed-off-by: Stefan Dej <[email protected]>
Co-authored-by: Stefan Dej <[email protected]>
Co-authored-by: Félix Boisselier <[email protected]>
Co-authored-by: Jan-Gerrit Drexhage <[email protected]>
Co-authored-by: Benoitone <[email protected]>
Co-authored-by: Eric <[email protected]>
Co-authored-by: Devon Hazelett <[email protected]>
Co-authored-by: Gustavo Ribeiro Alves <[email protected]>
Co-authored-by: Andrew Wickham <[email protected]>
Co-authored-by: tehniemer <[email protected]>
Co-authored-by: Arsène Thieffry <[email protected]>
Co-authored-by: claudioguareschi <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Elias Huwyler <[email protected]>
Co-authored-by: Neil Smith <[email protected]>
Co-authored-by: Reiner Uhry <[email protected]>
Co-authored-by: lokiagent <[email protected]>
Co-authored-by: Arcadien <[email protected]>
Co-authored-by: Tyler Olson <[email protected]>
Co-authored-by: Felix Boisselier <[email protected]>
Co-authored-by: elpopo <[email protected]>
Co-authored-by: tsk-2222 <[email protected]>
Co-authored-by: Meindert <[email protected]>
Co-authored-by: Akash Patel <[email protected]>
Co-authored-by: Frédéric Beaucamp <[email protected]>
Co-authored-by: Birkemosen <[email protected]>
Co-authored-by: Magne Rasmussen <[email protected]>
Co-authored-by: Parker <[email protected]>
Co-authored-by: Svennixx <[email protected]>
Co-authored-by: dev-aphex <[email protected]>
Co-authored-by: Minims <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants