Skip to content

[2.0.x] option to enable firmware retraction but disable autoretract#11904

Merged
thinkyhead merged 3 commits intoMarlinFirmware:bugfix-2.0.xfrom
Palatis:bugfix-2.0.x-autoretract
Sep 28, 2018
Merged

[2.0.x] option to enable firmware retraction but disable autoretract#11904
thinkyhead merged 3 commits intoMarlinFirmware:bugfix-2.0.xfrom
Palatis:bugfix-2.0.x-autoretract

Conversation

@Palatis
Copy link
Contributor

@Palatis Palatis commented Sep 23, 2018

Description

add a configuration_adv.h option to enable firmware retraction but disable auto-retract.
auto-retract will stay off (ignores M209) and firmware retraction can only be issued by G10 and G11.

Benefits

saves ~500 bytes of PROGMEM on AVR when auto-retract is disabled.

@thinkyhead thinkyhead force-pushed the bugfix-2.0.x branch 2 times, most recently from 9d867f9 to 849dea9 Compare September 24, 2018 03:23
@Palatis Palatis changed the title option to enable firmware retraction but disable autoretract [2.0.x] option to enable firmware retraction but disable autoretract Sep 25, 2018
@Palatis
Copy link
Contributor Author

Palatis commented Sep 26, 2018

should have the indentation corrected

Copy link
Member

Choose a reason for hiding this comment

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

Should be #if ENABLED(...)

Copy link
Member

Choose a reason for hiding this comment

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

It would be better to disable M209 completely, so the G-code throws an “unknown G-code” error when this feature is not enabled.

@Palatis
Copy link
Contributor Author

Palatis commented Sep 28, 2018

weird... why does travis fail?
I can compile over here.

@thinkyhead
Copy link
Member

Travis tests a large number of configuration options. Some of them will pass, others will fail. In this case the error was a simple typo in configuration_store.cpp.

@thinkyhead
Copy link
Member

thinkyhead commented Sep 28, 2018

When the code has been rebased, as we do here in Marlin-land, you must not force-push your branch or you end up destroying all the corrections we've made.

I've added a single commit containing all the changes that your last force-push stomped on. Check it out. It's instructive.

In future, please ask for guidance before force-pushing any changes to an open PR.

@thinkyhead thinkyhead merged commit 93839e2 into MarlinFirmware:bugfix-2.0.x Sep 28, 2018
thinkyhead added a commit that referenced this pull request Sep 29, 2018
@Palatis Palatis deleted the bugfix-2.0.x-autoretract branch September 29, 2018 09:07
@Palatis
Copy link
Contributor Author

Palatis commented Oct 5, 2018

I'm really sorry about the force-push, as described in #11869.

I'll see what I can do and tweak the script, finally push by hand to avoid breaking anything.

Apologize again for the inconvenience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants