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

Patch for "buildroot\share\PlatformIO\scripts\marlin.py" #347

Merged
merged 8 commits into from
Mar 7, 2024

Conversation

TBArchives
Copy link

@TBArchives TBArchives commented Mar 4, 2024

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

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
TBArchives and others added 2 commits March 5, 2024 22:23
Indent was spaces, is now tab
Copy link
Author

@TBArchives TBArchives left a 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
@Sebazzz
Copy link
Collaborator

Sebazzz commented Mar 7, 2024

Thnx, LGTM

@Sebazzz Sebazzz merged commit 4a373e1 into CR6Community:extui Mar 7, 2024
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
Labels
t:bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants