diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 16:23:29 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 16:23:29 -0400 |
| commit | 874cacf143330bf156d44102faba83ade270029d (patch) | |
| tree | a4bc644d35723ea3e2d7f41e2872ba2b6ec8b3d9 /bootloaders/diskloader/src/DiskLoader.cpp | |
| parent | 63ec4aba2221ce5f9d57cfa305e2ad3f253de732 (diff) | |
misc. bootloader fixes: increased wait time after receiving avrdude 'Q', increased bootloader timeout, and fixed LED one-shot timing
Diffstat (limited to 'bootloaders/diskloader/src/DiskLoader.cpp')
| -rw-r--r-- | bootloaders/diskloader/src/DiskLoader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp index 34a9c94..da57e75 100644 --- a/bootloaders/diskloader/src/DiskLoader.cpp +++ b/bootloaders/diskloader/src/DiskLoader.cpp @@ -210,7 +210,7 @@ int main() if (cmd == 'Q') break; } - _timeout = 1; // signal to exit the bootloader + _timeout = 1000; // wait a moment before exiting the bootloader - may need to finish responding to 'Q' for example _ejected = 1; } } @@ -232,7 +232,8 @@ void LEDPulse() void Reboot() { - /* TODO - ZE - this should probably be a WDT reset instead, right? */ + TXLED0; // switch off the RX and TX LEDs before starting the user sketch + RXLED0; UDCON = 1; // Detatch USB UDIEN = 0; asm volatile ( // Reset vector to run firmware |