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

Custom boot screen feature improvement #4305

Merged

Conversation

jbrazio
Copy link
Contributor

@jbrazio jbrazio commented Jul 14, 2016

This PR improves the custom boot screen handling by adding the configuration as an optional section on Configuration_adv.h (Please pay attention that not all Configuration_adv.h files were updated, look at the vendor notice section near the SHOW_BOOTSCREEN directive on every Configuration.h).

We no longer require a centralized custom bitmap file, each example configuration can carry inside their own custom boot screen.

Marlin boot screen has now a customizable timeout.

By default the second LCD line now shows the marlinfw.org website address.

@jbrazio jbrazio added this to the 1.1.0 milestone Jul 14, 2016
0x00, 0x00, 0x00, 0x00, 0x30
};
#endif

Copy link
Member

@thinkyhead thinkyhead Jul 15, 2016

Choose a reason for hiding this comment

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

I'm thinking it would work better (for our many configurations) if this is just an optional #include. Keep it simple, like this:

//#define CUSTOM_BOOTSCREEN
#if ENABLED(CUSTOM_BOOTSCREEN) && ENABLED(SHOW_BOOTSCREEN)
  #include "custom_bootscreen.h"
#endif

…and this data can live in custom_bootscreen.h alongside the example config, uncommenting CUSTOM_BOOTSCREEN for those configs that include one, so the compiler will throw an error if you forget to move over the bootscreen file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could go both ways, but the idea was really to simplify.
This means IMO not to add additional files, thus reusing exactly the same concept we have for Deltas. Their config files are the only ones having some sections which are dedicated to them.

As this feature targets vendors we won't be seeing much of it on the wild I guess.

Copy link
Member

@thinkyhead thinkyhead Jul 16, 2016

Choose a reason for hiding this comment

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

And yet… I don't think we should have such a blob (with an include) in the middle of Configuration_adv.h. So even if it is only this one file, I strongly favor the extra file and the #include to minimize the amount of cruft in the config file. And it does make the existence of the custom boot screen more "conspicuous" in the folder, which might catch attention of other vendors thinking of the same idea.

Heh-heh. We should make a few ourselves, starting with Printrbot.

@jbrazio jbrazio force-pushed the feature/splash-improvement branch 6 times, most recently from 0c922e9 to 53c095f Compare July 17, 2016 00:08
@jbrazio jbrazio force-pushed the feature/splash-improvement branch from 53c095f to 5cc8192 Compare July 17, 2016 00:19
@jbrazio jbrazio force-pushed the feature/splash-improvement branch from 5cc8192 to 9775af0 Compare July 17, 2016 00:32
@thinkyhead thinkyhead merged commit 0f32320 into MarlinFirmware:RCBugFix Jul 17, 2016
@jbrazio jbrazio deleted the feature/splash-improvement branch July 17, 2016 17:32
@thinkyhead thinkyhead mentioned this pull request Jul 25, 2016
thinkyhead pushed a commit that referenced this pull request Sep 28, 2016
About Configuration.h:
・Fix the PR #4899 (ABL: Enable by type. Bilinear for all.)
Remove Duplicated contents

・Fix the PR #4305 (Custom boot screen feature improvement)
Revert from "during boot" to "during bootup" in all the example
Configuration.h

・Fix the PR #4207 (Clean up, simplify and generalize the Allen-key-probe
code.)
Resolve and relocate the duplicated definitions in Z_PROBE_ALLEN_KEY
section

・Follow-up the PR #4805 (Additional documentation of Configuration.h)
Add forgotten changes to all the example Configuration.h

Adjust spacing

About Configuration_adv.h:
Add missing description of SLOWDOWN for DELTA

Adjust spacing
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.

2 participants