Fixed skethbook+bootloader hex merger. #744
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
facchinm
approved these changes
Jun 8, 2020
facchinm
reviewed
Jun 8, 2020
facchinm
approved these changes
Jun 11, 2020
Previous merger doesn't take into account .bin bootloaders and it may have problems if .hex data is not sorted by address.
cmaglie
added a commit
to arduino/arduino-builder
that referenced
this pull request
Jun 12, 2020
- Removed automatic '--relax' hack for compiles on Atmega2560 MCU arduino/arduino-cli#749 - Fixed skethbook+bootloader hex merger. arduino/arduino-cli#744 - Fixed race condition in legacy i18n.LoggerToCustomStreams arduino/arduino-cli#704 - Fixed path-relativization error when traversing different partitions arduino/arduino-cli#658 - Add macro during lib discovery phase arduino/arduino-cli#633 - legacy: Improved progress report from Compile arduino/arduino-cli#625
umbynos
pushed a commit
that referenced
this pull request
Jun 17, 2020
…at (#744) * Fixed skethbook+bootloader hex merger. Previous merger doesn't take into account .bin bootloaders and it may have problems if .hex data is not sorted by address. * output a merged sketch+bootloader bin file too * Replace logger with utils.LogIfVerbose Co-authored-by: Martino Facchin <m.facchin@arduino.cc>
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.
Previous hex merger:
This PR use a proper .hex parser and fix the above problems.
This PR should not introduce regressions, but testing is required.
Fix:
arduino/arduino-builder#295
arduino/arduino-builder#286