aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2012-01-24 18:04:10 -0500
committerZach Eveland <zeveland@blacklabel-development.com>2012-01-24 18:04:10 -0500
commit45d3b102956c74f837eb0297af45939ca46b09a0 (patch)
tree214ee5479addd44cc7ca17dce2f0cc7ce3196c38 /cores
parent014466a7880e1424aaeedd66c269ea1197624535 (diff)
Caterina now cleanly hands off operation to the sketch
had to remove TIMER1 operation from bootloader - was interfering with normal sketch operation
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/CDC.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index 8605ce3..eb1b2c5 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -27,7 +27,10 @@ void Reboot()
{
USB.detach();
cli();
- asm volatile("jmp 0x7800"); // jump to bootloader - DiskLoader takes up last 2 kB
+
+ // Reset the microcontroller to run the bootloader
+ wdt_enable(WDTO_250MS);
+ for (;;);
}
// Define constants and variables for buffering incoming serial data. We're