Skip to content

Update Delta example files #684

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

Merged

Conversation

jrbenito
Copy link
Contributor

I've upmerged the Delta example configuration files to somehow match the newer Configuration.h and Configuration_adv.h

Signed-off-by: Joseivaldo Benito Junior [email protected]

Signed-off-by: Joseivaldo Benito Junior <[email protected]>
@jrbenito jrbenito closed this Dec 18, 2013
@jrbenito jrbenito reopened this Dec 18, 2013
ErikZalm added a commit that referenced this pull request Dec 18, 2013
@ErikZalm ErikZalm merged commit 000b710 into MarlinFirmware:Marlin_v1 Dec 18, 2013
@diametric
Copy link

Uh yeah, these new configs are missing -#define DELTA_DIAGONAL_ROD_2 sq(DELTA_DIAGONAL_ROD) now, and Marlin won't compile since Marlin_main.cpp references that define in three places.

@jrbenito
Copy link
Contributor Author

Wow! I may messed up during manual merge. I will redo it ASAP. sorry.

(actually my personal delta config is in another branch I merged this just to upgrade... correcting it, sorry again)

@jrbenito
Copy link
Contributor Author

As I told I have messed up during up-merge process and lost this parameter. Now correct and pull request #687 sent.

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.

3 participants