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.

Sign up for GitHub

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

Jump to bottom

Z Safe Homing for all #3576

Merged
merged 1 commit into from
Apr 21, 2016
Merged

Z Safe Homing for all #3576

merged 1 commit into from
Apr 21, 2016

Conversation

thinkyhead
Copy link
Member

The Z_SAFE_HOMING feature is coupled in a pretty basic way with probes and not leveling, so we might as well make it available for general use. This keeps it enabled or disabled as it was in the existing configs.

@thinkyhead
Z Safe Homing for all
0c2aa92 
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
@thinkyhead thinkyhead merged commit fa81b01 into MarlinFirmware:RCBugFix Apr 21, 2016
@thinkyhead thinkyhead mentioned this pull request Apr 21, 2016
Merged
@thinkyhead thinkyhead deleted the rc_heres_your_z_safe_homing branch April 21, 2016 22:51
@thinkyhead thinkyhead mentioned this pull request Apr 21, 2016
Merged
@AnHardt
Copy link
Contributor

AnHardt commented Apr 21, 2016 •
edited
Loading

So here's the question! Should these options (and the rest of the probe options) be moved out of the AUTO_BED_LEVELING_FEATURE block? Or, should I alter the code so Z_SAFE_HOMING will work without these options defined?

Yes. Please move all the probe stuff out of AUTO_BED_LEVELING_FEATURE. Alexanders wish to use Z_SAFE_HOMING indicates he is using a probe for homing. If he'd use an ordinary endtop there would no need for Z_SAFE_HOMING.

But i'm still convinced this 'bigger plan' is not necessary a good one for an RC. If you try to do it in the configurations only, you will realize very soon, how deep the probes are woven in, into the bed leveling code, in MarlinMain.cpp.

@thinkyhead
Copy link
Member Author

I'm sure it's a tangle. I will proceed with great care.

@jbrazio
Copy link
Contributor

jbrazio commented Apr 22, 2016

@thinkyhead I will agree with @AnHardt here, we should go stable on this branch.

@thinkyhead
Copy link
Member Author

@jbrazio I agree this can wait till 1.1.1. I'm just looking for something new to fix so I won't get bored waiting for the 5 issues that are blocking RC6 to get some resolution.

@jbrazio
Copy link
Contributor

jbrazio commented Apr 22, 2016 •
edited
Loading

@thinkyhead have you decided how to proceed into MarlinDev ? Will you rebase it against RC or manually push the patches there ? Or start from scratch based on HEAD RC ?

@thinkyhead
Copy link
Member Author

thinkyhead commented Apr 22, 2016 •
edited
Loading

Well, I started reorganizing the RCBugFix files into the MarlinKimbra layout, and that seems ok. The dev and RC code have diverged a lot, but it shouldn't take me more than a few hours to bring them into full parity, each with their current layout. Some bits may have been fixed in dev that haven't yet migrated to RCBugFix, but most migration will be going the other way. I wish it was as easy as rebasing all commits from RC onto dev. But, it would take some tricky maneuvering. (First, match the file layout of RCBugFix, then rebase RC on top of dev, then move dev back into its new layout…) Anyway, I will figure out some way to make it go quicker.

@ghost ghost mentioned this pull request May 2, 2016
Merged
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 4, 2016
Some clean-up for example configuration files
cc9ba21 
Some clean-up for example configuration files

Follow-up and fix the PR MarlinFirmware#3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR MarlinFirmware#3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR MarlinFirmware#3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
CONSULitAS pushed a commit to CONSULitAS/Marlin-K8200 that referenced this pull request Aug 18, 2016
Some clean-up for example configuration files
9672bde 
Some clean-up for example configuration files

Follow-up and fix the PR MarlinFirmware#3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR MarlinFirmware#3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR MarlinFirmware#3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR MarlinFirmware#3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
PR: Improvement
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@thinkyhead @AnHardt @jbrazio @Alex9779