Mostly revert Revert "Fix at90usb1286 build (#19687)" #19733
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts most of the changes from commit 7d030ba. (cherry picked from commit 6cbee9c14008edd7196e650142953204bc50a398)
|
Confirmed that after applying this PR, build failure for Printrbot RevF is now back to original failure as reported in earlier issue #19216 |
Zorchz
pushed a commit
to Zorchz/Marlin-1
that referenced
this pull request
Oct 17, 2020
Zorchz
pushed a commit
to Zorchz/Marlin-1
that referenced
this pull request
Oct 17, 2020
thinkyhead
pushed a commit
to thinkyhead/Marlin
that referenced
this pull request
Oct 21, 2020
Speaka
pushed a commit
to Speaka/Marlin
that referenced
this pull request
Oct 23, 2020
Speaka
pushed a commit
to Speaka/Marlin
that referenced
this pull request
Nov 2, 2020
vgadreau
pushed a commit
to vgadreau/Marlin
that referenced
this pull request
Dec 9, 2020
tharts
pushed a commit
to tharts/Marlin
that referenced
this pull request
Jan 6, 2021
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
thinkyhead
pushed a commit
to thinkyhead/Marlin
that referenced
this pull request
Apr 29, 2021
thinkyhead
pushed a commit
that referenced
this pull request
Apr 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This reverts most of the changes from commit 7d030ba.
The earlier addition of
IS_AT90USBin Conditionals_adv.h did not work, becauseUSBCONwas utilized in HAL.h, long before the new flag was set. This caused inconsistencies depending on include order, which caused various build failures.The original problem with inspired the change was that the
USBCONcheck in the pins file broke pre-build scripts. I have retained the change which fixed thatUSBCONcheck, while reverting the addition of theIS_AT90USBflag.Benefits
AT90USB boards can now build.
Configurations
I discovered the build issues when building the Printrbot/Simple Metal RevD example, but they would have impacted all AT90USB builds.
Related Issues
#19592