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

added AWD support (2x X, 2x Y) #508

Merged
merged 9 commits into from
Jun 19, 2024
Merged

added AWD support (2x X, 2x Y) #508

merged 9 commits into from
Jun 19, 2024

Conversation

Surion79
Copy link
Collaborator

this adds additional config possibilities for "AWD" or multi driver per axis X and Y. (max 2 per axis)
It is implemented like the Z implementation.

For not breaking, the original files reference to the "1-Motor" variant of the new files.

@Surion79 Surion79 requested a review from Frix-x February 26, 2024 17:33
@Frix-x
Copy link
Owner

Frix-x commented Feb 26, 2024

Thanks for the PR!

I think it's giving a lot of changes and there is already a lot ready for the new release. So if you don't mind, I'll merge it later when you get your motors and everything to test it properly :)

@Surion79
Copy link
Collaborator Author

Surion79 commented Feb 26, 2024

I'm fine with it. I do need it merged in develop at 18th march 2024. then i have the last parts delivered. Motors are in about next week (ldo nema14 high temp).
I won't be able to test all tmcs since i don't own 5160s. since it is derived from the newest develop version, it should have the correct parameters.

@Kcdc3d
Copy link

Kcdc3d commented May 9, 2024

Hi there, I am trying to figure out if the AWD_XY branch is usable or if I should wait until this is merged to Main... I have the AWD-330 vzbot and would like to try out your suite when it's ready.

@Surion79
Copy link
Collaborator Author

Surion79 commented May 9, 2024

due to personal stuff i wasn't able to test it out, although there is no coding per se involved. it is just configuration files for the additional X/Y motors.
you can add the X1/Y1 sections to your overrides. you need to set the pins there manually then.
Otherwise you can wait until it is finally merged

@Kcdc3d
Copy link

Kcdc3d commented May 10, 2024

Ok I thought I saw a few files changed but after going back, it was just another driver setup for the second motor in The Axis Folder Thanks for clearing that up!

@tristanmcpherson
Copy link

tristanmcpherson commented May 31, 2024

Testing this now, we will also need a replacement for the default wiring imports in [include config/hardware/axis/X/1.8deg.cfg] so possible alongside [include config/hardware/axis/X/1.8deg_2-Motors.cfg], etc?

I can look at added something alongside tomorrow and I'll PR to this branch

@Surion79
Copy link
Collaborator Author

let me have a look

@Surion79
Copy link
Collaborator Author

@tristanmcpherson mind testing again with the new addition? or is there something different missing as well?
It is not possible to add templates like Z axis, as there is not really a typical AWD only builds for referencing

@tristanmcpherson
Copy link

@tristanmcpherson mind testing again with the new addition? or is there something different missing as well? It is not possible to add templates like Z axis, as there is not really a typical AWD only builds for referencing

Working good with the new changes. Was the difference in file name for 0.9deg intentional? The space seems potentially problematic

@Surion79
Copy link
Collaborator Author

well, copy paste topic :D anything else? :)

@tristanmcpherson
Copy link

Working good for me! I can confirm good enough to be merged @Frix-x

@tristanmcpherson
Copy link

Oh, we should add user template for the new motor configs in https://github.com/Frix-x/klippain/blob/main/user_templates/printer.cfg#L27

@Surion79
Copy link
Collaborator Author

added, anything else? :)

@Kcdc3d
Copy link

Kcdc3d commented Jun 12, 2024

cheers and thanks for the updates

Copy link
Owner

@Frix-x Frix-x left a comment

Choose a reason for hiding this comment

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

I'm almost ready to merge it. Just a small change in the comments added in the printer.cfg are requested to generalize a bit more the lines

user_templates/printer.cfg Outdated Show resolved Hide resolved
@Surion79
Copy link
Collaborator Author

i removed the whole "e.g." parts to make it more generic

@Surion79 Surion79 requested a review from Frix-x June 19, 2024 15:46
Copy link
Owner

@Frix-x Frix-x left a comment

Choose a reason for hiding this comment

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

Ok that's good now

@Frix-x Frix-x merged commit e46365c into develop Jun 19, 2024
@Frix-x Frix-x deleted the AWD_XY branch June 19, 2024 19:08
tehniemer added a commit to tehniemer/klippain that referenced this pull request Aug 22, 2024
* 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)

* removed old artifacts from TMC2240 init feature

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

* Message update to show "Available RAM" rather than "Used RAM" (Frix-x#579)

* fixed max_z bug in PARK macro

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

* added a fix for filament sensor activation for material as default (Frix-x#582)

* code cleanup in some templates (removed extra spaces) (Frix-x#570)

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

* add expander templates support (Frix-x#567)

with Klipper expander and Arduino nano templates as first expanders

* Reset layers stats on start print (Frix-x#565)

* optional setting for adaptive primeline (Frix-x#522)

* fix typo in qgl.cfg

* added AWD support (2x X, 2x Y) (Frix-x#508)

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

* Update LDO_Nitehawk-SB_v1.0.cfg (Frix-x#594)

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

* fixed default pins for SB2209 v1.0 (Frix-x#609)

* added function for pause at (next) layer (Frix-x#606)

* Add FYSETC Nozzle-Input-Shaper accelerometer support (Frix-x#603)

---------

Co-authored-by: Félix Boisselier <felix@fboisselier.fr>
Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com>
Co-authored-by: Colten Edwards <cd.edwards@sasktel.net>
Co-authored-by: Nick Danyluk <ndanyluk7@gmail.com>
Co-authored-by: Christian Johnson <cjohnson-phys@users.noreply.github.com>
Co-authored-by: tsk-2222 <111063724+tsk-2222@users.noreply.github.com>
Co-authored-by: o1hitman1o <o1hitman1o@gmail.com>
Co-authored-by: ksummers92 <66363414+ksummers92@users.noreply.github.com>
Co-authored-by: Benoitone <63300355+Benoitone@users.noreply.github.com>
Co-authored-by: dev-aphex <dev-aphex@users.noreply.github.com>
Co-authored-by: Minims <github@minims.fr>
tehniemer added a commit to tehniemer/klippain that referenced this pull request Aug 22, 2024
* 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)

* removed old artifacts from TMC2240 init feature

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

* Message update to show "Available RAM" rather than "Used RAM" (Frix-x#579)

* fixed max_z bug in PARK macro

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

* added a fix for filament sensor activation for material as default (Frix-x#582)

* code cleanup in some templates (removed extra spaces) (Frix-x#570)

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

* add expander templates support (Frix-x#567)

with Klipper expander and Arduino nano templates as first expanders

* Reset layers stats on start print (Frix-x#565)

* optional setting for adaptive primeline (Frix-x#522)

* fix typo in qgl.cfg

* added AWD support (2x X, 2x Y) (Frix-x#508)

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

* Update LDO_Nitehawk-SB_v1.0.cfg (Frix-x#594)

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

* fixed default pins for SB2209 v1.0 (Frix-x#609)

* added function for pause at (next) layer (Frix-x#606)

* Add FYSETC Nozzle-Input-Shaper accelerometer support (Frix-x#603)

---------

Co-authored-by: Félix Boisselier <felix@fboisselier.fr>
Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com>
Co-authored-by: Colten Edwards <cd.edwards@sasktel.net>
Co-authored-by: Nick Danyluk <ndanyluk7@gmail.com>
Co-authored-by: Christian Johnson <cjohnson-phys@users.noreply.github.com>
Co-authored-by: tsk-2222 <111063724+tsk-2222@users.noreply.github.com>
Co-authored-by: o1hitman1o <o1hitman1o@gmail.com>
Co-authored-by: ksummers92 <66363414+ksummers92@users.noreply.github.com>
Co-authored-by: Benoitone <63300355+Benoitone@users.noreply.github.com>
Co-authored-by: dev-aphex <dev-aphex@users.noreply.github.com>
Co-authored-by: Minims <github@minims.fr>
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