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

update mc-apply.py #27628

Merged
merged 11 commits into from
Jan 8, 2025
Merged

Conversation

ellensp
Copy link
Contributor

@ellensp ellensp commented Jan 7, 2025

Description

mc-apply.py no longer works with current CONFIG_EXPORT type 1

re wrote almost all of it from scratch so now it works.

Added help and documentation
extended to take a path to the input file on command line, but defaults to still looking for marlin_config.json in the current working directory

Requirements

use mc-apply.py

Benefits

  • Produces requested files
  • Updates Configuration.h and Configuration_adv.h
  • A lot more readable
  • Actually useful errors

Related Issues

@thisiskeithb thisiskeithb linked an issue Jan 7, 2025 that may be closed by this pull request
1 task
@thinkyhead
Copy link
Member

I updated the config dump so it has file groupings as expected by mc-apply.py and then adjusted mc-apply.py to use our standard config.set(file, key, val) and config.add(file, key). I discovered that the ZIP format used for embedding is not compatible with macOS unzip so I switched to a more compatible algorithm. Compression is less efficient, but I also removed the ignore fields in the export, so the ZIP should not be too much larger.

@thinkyhead thinkyhead merged commit 36623a2 into MarlinFirmware:bugfix-2.1.x Jan 8, 2025
64 checks passed
@ellensp ellensp deleted the update-mc-pply branch January 9, 2025 00:43
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.

[BUG] mc-apply script doesn't function
2 participants