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.

Sign up for GitHub

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

Jump to bottom

Fix M503C #25688

Merged
merged 3 commits into from
Apr 16, 2023
Merged

Fix M503C #25688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eed64f
Fix M503C
GMagician Apr 15, 2023
62d30d3
Fix privacy leaking
GMagician Apr 15, 2023
824b85e
Add "bad" original code copy
GMagician Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Marlin/src/gcode/eeprom/M500-M504.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,19 @@ void GcodeSuite::M502() {

#if ENABLED(CONFIGURATION_EMBEDDING)
if (parser.seen_test('C')) {
SdBaseFile file;
const uint16_t size = sizeof(mc_zip);
MediaFile file;
// Need to create the config size on the SD card
if (file.open(card.getroot(), "mc.zip", O_WRITE|O_CREAT) && file.write(pgm_read_ptr(mc_zip), size) != -1 && file.close())
SERIAL_ECHO_MSG("Configuration saved as 'mc.zip'");
MediaFile root = card.getroot();
if (file.open(&root, "mc.zip", O_WRITE|O_CREAT)) {
bool success = true;
for (uint16_t i = 0; success && i < sizeof(mc_zip); ++i) {
const uint8_t c = pgm_read_byte(&mc_zip[i]);
file.write(c);
}
success = file.close() && success;

if (success) SERIAL_ECHO_MSG("Configuration saved as 'mc.zip'");
}
}
#endif
}
Expand Down
3 changes: 2 additions & 1 deletion buildroot/share/PlatformIO/scripts/signature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@ def compute_build_signature(env):
files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]

build_path = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
build_path_relative = Path('.pio', 'build', env['PIOENV'])

# Check if we can skip processing
hashes = ''
for header in files_to_keep:
hashes += get_file_sha256sum(header)[0:10]

marlin_json = build_path / 'marlin_config.json'
marlin_json = build_path_relative / 'marlin_config.json'
marlin_zip = build_path / 'mc.zip'

# Read existing config file
Expand Down