Fixe FS / SD file global definition conflict#82
Open
pfeerick wants to merge 2 commits intodigistump:masterfrom
Open
Fixe FS / SD file global definition conflict#82pfeerick wants to merge 2 commits intodigistump:masterfrom
pfeerick wants to merge 2 commits intodigistump:masterfrom
Conversation
Using the implementation of FS and SD included as part of the Oak package in a single sketch was not possible, due to them having conflicting file definitions. This was fixed in a later commit on the ESP8266 Arduino core (esp8266/Arduino@1829745). This commit simply imports those changes, plus some other minor additions that have occurred since as there is nothing that will break existing code.
It looks like I was a bit too hasty in saying no code-breaking changes... some of the changes were reliant on other changes in the core. So now this is *just* the global re-defines needed to remove SD/FS conflicts.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Using the implementation of FS and SD included as part of the Oak package in a single sketch was not possible, due to them having conflicting file definitions. This was fixed as part of a commit on the ESP8266 Arduino core (esp8266/Arduino@1829745). This commit simply imports those fixes, and was going to include some other minor additions that have occurred since, but that will break as there are underlying dependencies.