Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed skethbook+bootloader hex merger. #744

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

Merged
merged 3 commits into from
Jun 12, 2020
Merged

Fixed skethbook+bootloader hex merger. #744

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d58886e
Fixed skethbook+bootloader hex merger.
cmaglie Jun 6, 2020
9b2842c
output a merged sketch+bootloader bin file too
cmaglie Jun 8, 2020
2da824d
Replace logger with utils.LogIfVerbose
facchinm Jun 11, 2020
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
Prev Previous commit
Next Next commit
output a merged sketch+bootloader bin file too
  • Loading branch information
@cmaglie @facchinm
cmaglie authored and facchinm committed Jun 11, 2020
commit 9b2842cc61fc943ba8d7484b6dbbef7dbb471f43
18 changes: 9 additions & 9 deletions legacy/builder/merge_sketch_with_bootloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ func merge(builtSketchPath, bootloaderPath, mergedSketchPath *paths.Path, maximu
return err
}

// size := lastAddress - initialAddress
// if size > uint32(maximumBinSize) {
// return nil
// }
// mergedSketchPathBin := paths.New(strings.TrimSuffix(mergedSketchPath.String(), ".hex") + ".bin")
// data := memMerged.ToBinary(initialAddress, size, 0xFF)
// return mergedSketchPathBin.WriteFile(data)

return nil
// Write out a .bin if the addresses doesn't go too far away from origin
// (and consequently produce a very large bin)
size := lastAddress - initialAddress
if size > uint32(maximumBinSize) {
return nil
}
mergedSketchPathBin := paths.New(strings.TrimSuffix(mergedSketchPath.String(), ".hex") + ".bin")
data := memMerged.ToBinary(initialAddress, size, 0xFF)
return mergedSketchPathBin.WriteFile(data)
}