From 0c0dc27de7ce2228f08d3c85c69c98edfd013d6d Mon Sep 17 00:00:00 2001
From: Kristian Lauszus <lauszus@gmail.com>
Date: Mon, 1 Oct 2012 04:33:26 +0200
Subject: Improved Leonardo bootloader

The power-on reset detection didn't work properly, but has now been
fixed
---
 bootloaders/caterina/Caterina.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bootloaders/caterina/Caterina.c')

diff --git a/bootloaders/caterina/Caterina.c b/bootloaders/caterina/Caterina.c
index abcba2b..9860b3a 100755
--- a/bootloaders/caterina/Caterina.c
+++ b/bootloaders/caterina/Caterina.c
@@ -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();
 	}
-- 
cgit v1.2.3-18-g5258


From 1668039101ddee651f9b8e9b763134e0a5aebf59 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Fri, 7 Dec 2012 18:11:07 +0100
Subject: Added support for Arduino Esplora

---
 bootloaders/caterina/Caterina.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 bootloaders/caterina/Caterina.c

(limited to 'bootloaders/caterina/Caterina.c')

diff --git a/bootloaders/caterina/Caterina.c b/bootloaders/caterina/Caterina.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3-18-g5258