diff options
| author | Jenna Fox <a@creativepony.com> | 2012-09-24 11:49:25 +1000 |
|---|---|---|
| committer | Jenna Fox <a@creativepony.com> | 2012-09-24 11:49:25 +1000 |
| commit | 808a0bacf449834b19897563ecd6b568d4582757 (patch) | |
| tree | 7f7dce44bbc5932414e44ebd0d7788cdc5f6e1a5 /firmware | |
| parent | f7d3ec87196a19323ead9419894c20d694339ee5 (diff) | |
| download | micronucleus-808a0bacf449834b19897563ecd6b568d4582757.tar.gz micronucleus-808a0bacf449834b19897563ecd6b568d4582757.tar.bz2 micronucleus-808a0bacf449834b19897563ecd6b568d4582757.zip | |
I totally know how to use git. heh.
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/upload.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/firmware/upload.rb b/firmware/upload.rb index 7faa19f..52c108e 100644 --- a/firmware/upload.rb +++ b/firmware/upload.rb @@ -31,13 +31,8 @@ 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 } @@ -50,15 +45,9 @@ class MicroBoot 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 |