From 42f28a70890947c48f43dd933db7b0742ebb3b66 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sun, 23 Mar 2014 12:48:40 +0100 Subject: [PATCH] I found a nasty bug I made that also could make the bootloader hang. This fixes it. I should not have redefined the blocksize variable to make the output look good. It screewed up the flash... --- radio/src/bootloader/boot.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/src/bootloader/boot.cpp b/radio/src/bootloader/boot.cpp index 6daf4c637..ff3a0a893 100644 --- a/radio/src/bootloader/boot.cpp +++ b/radio/src/bootloader/boot.cpp @@ -883,11 +883,12 @@ int main() BlockCount = 0; } } - firmwareWritten += 8; // 4K blocks + firmwareWritten += 4; // 4K blocks - lcd_rect(INDENT_WIDTH, 6*FH+4, 202, 4); - lcd_hline(INDENT_WIDTH, 6*FH+5, (200*firmwareWritten/(FlashSize-64)), FORCE); - lcd_hline(INDENT_WIDTH, 6*FH+6, (200*firmwareWritten/(FlashSize-64)), FORCE); + lcd_rect( 3, 6*FH+4, 204, 7); + lcd_hline(5, 6*FH+6, (200*2*firmwareWritten-32)/(FlashSize), FORCE); + lcd_hline(5, 6*FH+7, (200*2*firmwareWritten-32)/(FlashSize), FORCE); + lcd_hline(5, 6*FH+8, (200*2*firmwareWritten-32)/(FlashSize), FORCE); fr = f_read(&FlashFile, (BYTE *)Block_buffer, sizeof(Block_buffer), &BlockCount); if (BlockCount == 0) {