-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
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
Delta auto-calibration updates #6410
Conversation
Need some help here, resolving the conflicts |
- Making M665 compatible with repetier (see http://reprap.org/wiki/G_code#M665:_Set_delta_configuration) - M665 B also sets the radius for manual calibration menu - Converting tower ajustment definitions to arrays - tower angle corrections compatible with Esher 3D wizzard - Only tower angles need to be adjustable with M665 and stored to EEPROM - tower radius and diag rod can be adjusted in the FW only with #define
and getting rid off verbose level 3 and configuration_adv settings
- adding Cn 5, 6 and 7
Rebased and resolved conflicts. I've done what I can without knowing more about the subject so if you can take a quick look everything is there. I only had to go through the configuration_store.cpp file. |
Adding '7-point' tower angle correction calibration
I was just one bracket short? The rest seems to be fine... Thanks a lot |
Before this is merged I have 2 small changes to add. How do I proceed? I open this PR in my desktop - made the changes but I can't publish: no write access... |
You can make the PR against my repo and I'll merge it then. |
You lost me again, how do I do that? Whatever I try Desktop tells me I do not have permission to do it... I'm done with GitHub, I'm not allowed to do anything whatsoever. |
I've given you push access to my repo for a while. Maybe that'll help. |
No luck, I'm no longer allowed to clone your branch now... (a debug log of 3 pages cryptic error messages). I can no longer make PR either some 'validation failed' error. GitHub doesn't like me and the feeling is very mutual. I have only made 2 little changes in marlin_main: https://github.com/LVD-AC/Marlin-LVD/commit/1b3e677711142e3297c7856f076cf3c3774682c6 |
* 372 M665 B delta_calibration_radius (float) | ||
* 376 M665 X delta_tower_angle_trim[A] (float) | ||
* 380 M665 Y delta_tower_angle_trim[B] (float) | ||
* --- M665 Z delta_tower_angle_trim[C] (float) is always 0.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the EEPROM layout changes, the EEPROM version should change too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, I leave that EEPROM version up to you, so it's done properly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just increment the version number by 1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thinkyhead Done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not seeing it reflected in this PR yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to include delta_tower_angle_trim[C]
here.
For one thing, it doesn't exist. The array now has only A and B.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EEPROM version was updated in https://github.com/LVD-AC/Marlin-LVD/commit/46a6dfd33e2380a10a7e6839b8eecab665f19d88
@@ -461,28 +461,30 @@ | |||
// See http://minow.blogspot.com/index.html#4918805519571907051 | |||
//#define DELTA_CALIBRATION_MENU | |||
|
|||
|
|||
|
|||
// set the radius for the calibration probe points - max 0.8 * DELTA_PRINTABLE_RADIUS if DELTA_AUTO_CALIBRATION enabled |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably don't need these extra blank lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thinkyhead Done
Overall looking pretty good. Only small spacing changes required. If needed, I can apply cleanup and squash to a single commit before merging. |
The tower angles are normalized by rotating all three (ABC) until C-tower = zero. Two options here:
I made a mix of both approaches : so either disable the 'M665 Z' option or apply commit https://github.com/LVD-AC/Marlin-LVD/commit/065b915502a2fa00624e492a44cb9751830fecfd that allows the input of 3 values in the #define statement and normalizes them internally (makes more sense to me) @teemuatlut : can you add that commit as well |
More consistent with M665 where C-value is allowed as well, then normalized
Pretty soon. Busy days. |
Take your time. Thanks for the help. |
@teemuatlut : One more commit to add, if you can beat @thinkyhead to it: https://github.com/LVD-AC/Marlin-LVD/commit/4688393e963f716f0e40e2c225624c19ada01a7a |
Avoids to have to recalibrate the delta_height after a z_offset change
@teemuatlut I added another feature : https://github.com/LVD-AC/Marlin-LVD/commit/46a6dfd33e2380a10a7e6839b8eecab665f19d88 |
Giving a negative number of probe points disables the tower angle correction calibration ('4point' instead of '7point' solution) EEPROM version updated
@teemuatlut : Flsun FB group is pretty buzzy beta testing. Dotting some i's: https://github.com/LVD-AC/Marlin-LVD/commit/5aece3363c273cf0252adb8f693b3eb27fb607a9 |
I'll update tomorrow morning if you have more than one that still needs adding. |
did: But nothing comes up in desktop??? Do I need to close that process with something like "Git push –f"? Tried it but still nothing in the desktop? OK got it I have to go trough all the files to see the changes made |
I made 2 commits, synced it, squashed it to one commit LVD-AC@49d09f9 but when I try to make a pull request it says the usual error: "Request failed - validation error" @thinkyhead what now??? Didn't work in desktop, but did work online ???? Strange : teemuatlut#3 |
This is what I did yesterday: - basicly gave the tests more comprehensive names; put all the declarations at the top; got rid of the magic negative C-value (renamed to P + A, O, T) - "cos(RADIANS(180 + 30 * axis)) * (1 + circles * 0.1 * ((zig_zag) ? 1 : -1)) * delta_calibration_radius" compiles wrong is zig_zag statement is without brackets - DELTA_TOWER_ANGLE_TRIM reset to 3 values (the calcs use the 3th value to normalize will not compile otherwise) -Wrote 3 dummies to keep EEPROM lenght the same -Reset the configs to the 'original' with autocal + menu disabled (but can be enabled of course)
I do not know what happend in the last BugFix but my printer almost went through the roof just homing it. The speed went up by at least a factor 10. All 3 carriages cracked when trying to send the end-stops in outer space. This is undoable and this is nothing I changed. My non Git copy were I put all the same changes as in this PR (except all the changes of the last days that had nothing to do with me in RCBugFix branche) is still performing normally. I just flag this up since you want to release tomorrow. And there is serious problem there. |
now I'm done @teemuatlut @thinkyhead thanks for all the help |
Best to avoid using Github Desktop except for the simplest things like making commits, comparing changes, and making simple PRs to targets that it knows about. It forces the use of " |
So I'm curious, what happens when you use the command like |
It opens notepad to squash (if no conflicts or errors were encountered) but for fixing conflicts it loads a file in desktop, I'm using Arduino to edit them. (I have been playing a bit since @thinkyhead pointed me in the right direction by fixing that wrong upstream that blocked me from everything). (y) |
That speed problem I had/have, seems to be solved in the RCBugFix branche, so I guess that will be OK once this is merged. |
Ouch. I'd recommend Sublime Text 3. It's great. With the DevIoT plugin you can build and upload Marlin from within the editor. It also has github integration and other excellent features. Makes working on the code so much easier. I also hear NotePad++ is good for doing diffs — with the right plugin. |
So we made the deadline? |
Looks that way! And we have an extra 18 hours for last-minute patches…. |
Haha! The more I mess with git the better my luck seems to become. |
done : http://reprap.org/wiki/G-code#G33:_Delta_Auto_Calibration_.28Marlin_1.1.0.29 |
Good to have documentation! But now as I look at the RepRap wiki, it seems like |
Actually, meh, |
We can move G26 to G33. But I do think 'Mesh Validation Pattern' is going to be important enough to have its own number. We can move it up to G123 or some other easy to remember number. |
The time is nigh to document your |
I tried to do that. It won't give me a log in to make changes. They shut down the credential process and only people that originally registered can make any changes to the Wiki. |
Twats. Well, here's the page source code. Edit it as you wish, and then post the updated version here and I will publish it for you. |
I just did send an e-mail asking for a login, 2 days later I got a message back with my password... ??? And why G33, because a year ago when I started developing this it was available... |
Thanks to @teemuatlut, I was able to recreate