forked from MarlinFirmware/Marlin
-
Notifications
You must be signed in to change notification settings - Fork 83
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
Patch for "buildroot\share\PlatformIO\scripts\marlin.py" #347
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
Replaces: for define in env['CPPDEFINES']: with: envdefs = env['CPPDEFINES'].copy() for define in envdefs: in buildroot\share\PlatformIO\scripts\marlin.py on extui branch
Update marlin.py to fix compile error
Indent was spaces, is now tab
Fix update of marlin.py
TBArchives
commented
Mar 6, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found spaces instead of tab as indent at line23.
Fixed and verified compiles in VSCode Studio.
PR updated with fix.
The monitor_flags command is no longer available in Platformio. Commented it out, to preserve the settings for reference, in case a future problem requires implementing this redacted functionality in a new way.
Replace src_filter with build_src_filter Replace src_build_flags with build_src_flags
Update platformio scripts
Thnx, LGTM |
TBArchives
added a commit
to TBArchives/CR6Community_Marlin
that referenced
this pull request
Mar 31, 2024
Merge pull request CR6Community#347 from TBArchives/extui
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
Ref commit 2d87886
This patch of marlin.py has been posted and repeated on the CR6Community Discord quite often, as various users encounter problems with PlatformIO and VSCode trying to recompile CF6.1 to modify their configuration. files
It has been repeatedly confirmed to work by both Lifendel and richiedc.
I recommend that we just patch the online copy of marlin.py for the CF6.1 extui branch, so that it ceases to be a problem.
NOTE: Apologies if I have screwed up this PR by trying to push a second PR while this one is still open...
I expected #348 to be independent of this one, but it looks like merging both PRs in my repo has caused the two PRs to merge, here.
I do also recommend making the platfomio edits, to stop VS Code Studio from throwing errors when compiling the CF6.1 code. Struggling to get GitHub to treat them as separate PRs... Maybe you can "cherry-pick" just the marlin.py commits from this PR?
Requirements
n/a
Benefits
VSCode will once again be able to compile the CF6.1 code, without error.
Configurations
n/a
Related Issues
#334