diff options
Diffstat (limited to 'firmware/upload.rb')
| -rw-r--r-- | firmware/upload.rb | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/firmware/upload.rb b/firmware/upload.rb index a457a42..7faa19f 100644 --- a/firmware/upload.rb +++ b/firmware/upload.rb @@ -31,8 +31,13 @@ class MicroBoot @info = { flash_length: flash_length, page_size: page_size, +<<<<<<< HEAD + write_sleep: write_sleep.to_f / 1000.0, + pages: (flash_length.to_f / page_size.to_f).ceil, +======= pages: (flash_length.to_f / page_size.to_f).ceil, write_sleep: write_sleep.to_f / 1000.0, +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 version: "#{@device.bcdDevice >> 8}.#{@device.bcdDevice & 0xFF}", version_numeric: @device.bcdDevice } @@ -41,12 +46,19 @@ class MicroBoot end def erase! + puts "Erasing chip..." info = self.info control_transfer(function: :erase_application) +<<<<<<< HEAD + info[:pages].times do |index| + puts "Erasing: #{((index.to_f / info[:pages].to_f) * 100.0).round}%" if index % 5 == 0 + sleep(info[:write_sleep]) # sleep for as many pages as the chip has +======= # sleep for long enough for application to completely erase info[:pages].times do sleep(info[:write_sleep]) +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 end end @@ -59,16 +71,23 @@ class MicroBoot erase! address = 0 - bytes.each_slice(info[:page_size]) do |bytes| - control_transfer(function: :write_page, wIndex: address, wValue: bytes.length, dataOut: bytes.pack('C*')) + bytes.each_slice(info[:page_size]) do |slice| + puts "Uploading: #{(address.to_f / bytes.length.to_f * 100.0).round}%: @#{address} of #{bytes.length}" + control_transfer(function: :write_page, wIndex: address, wValue: slice.length, dataOut: slice.pack('C*')) sleep(info[:write_sleep]) - address += bytes.length + address += slice.length end end def finished + puts "Asking device to finish writing program..." control_transfer(function: :run_program) - sleep(info[:write_sleep]) # not sure if this is worth having? It's okay if USB fails now... + + # this could be shorter, relative to how many pages we uploaded.. + info[:pages].times do |index| + puts "Finishing Upload: #{((index.to_f / info[:pages].to_f) * 100.0).round}%" if index % 5 == 0 + sleep(info[:write_sleep]) # sleep for as many pages as the chip has + end @io.close @io = nil |