noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved Leonardo bootloader 

The power-on reset detection didn't work properly, but has now been
fixed
This commit is contained in:
Kristian Lauszus 2012-10-01 04:33:26 +02:00 committed by Cristian Maglie
parent 554c211ec4
commit ef6f1eb11d
2 changed files with 257 additions and 1026 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1279
hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
View File

File diff suppressed because it is too large Load Diff

4
hardware/arduino/bootloaders/caterina/Caterina.c
View File

@ -123,11 +123,11 @@ int main(void)
if (mcusr_state & (1<<EXTRF)) {
// External reset - we should continue to self-programming mode.
} else if (mcusr_state == (1<<PORF) && pgm_read_word(0) != 0xFFFF) {
} else if ((mcusr_state & (1<<PORF)) && (pgm_read_word(0) != 0xFFFF)) {
// After a power-on reset skip the bootloader and jump straight to sketch
// if one exists.
StartSketch();
} else if ((mcusr_state == (1<<WDRF)) && (bootKeyPtrVal != bootKey) && (pgm_read_word(0) != 0xFFFF)) {
} else if ((mcusr_state & (1<<WDRF)) && (bootKeyPtrVal != bootKey) && (pgm_read_word(0) != 0xFFFF)) {
// If it looks like an "accidental" watchdog reset then start the sketch.
StartSketch();
}