From 2b13fd3b4091049ebdf295986d834de4c9ea3c32 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Thu, 27 Oct 2011 11:27:24 -0400
Subject: bootloader runs sketch after timeout, added bootloader LED breathing

---
 bootloaders/diskloader/src/DiskLoader.cpp | 48 +++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 12 deletions(-)

(limited to 'bootloaders/diskloader/src')

diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index e984375..30ac1b6 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -23,7 +23,7 @@ u8 _flashbuf[128];
 u8 _inSync;
 u8 _ok;
 u16 do_reset = 0;
-volatile u16 _timeout;
+volatile u16 _timeout = 0;
 
 void Program(u8 ep, u16 page, u8 count)
 {
@@ -49,6 +49,20 @@ void Program(u8 ep, u16 page, u8 count)
     boot_rww_enable ();
 }
 
+u16 _pulse;
+void LEDPulse() 
+{
+	_pulse += 1;
+	u8 p = _pulse >> 9;
+	if (p > 63)
+		p = 127-p;
+	p += p;
+	if (((u8)_pulse) > p)
+		L_LED_OFF();
+	else
+		L_LED_ON();
+}
+
 #define HW_VER	 0x02
 #define SW_MAJOR 0x01
 #define SW_MINOR 0x10
@@ -95,6 +109,19 @@ const u8 _consts[] =
 
 void start_sketch()
 {
+	L_LED_OFF();
+	RX_LED_OFF();
+	TX_LED_OFF();
+	/* move interrupts to application section:
+	 * uses inline assembly because the procedure must be completed in four cycles.
+	 */
+	cli();	// disable interrupts first
+	asm volatile (
+				  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
+				  "out 0x35,  r16\n"		// MCUCR
+				  "ldi r16,	  0x00\n"		// (1<<IVSEL)	/* Move interrupts to application flash section */
+				  "out 0x35,  r16\n"		// MCUCR				  
+				  );							
 	UDCON = 1;		// Detatch USB
 	UDIEN = 0;
 	asm volatile (	// Reset vector to run firmware
@@ -133,7 +160,7 @@ int main()
 		u8* packet = _flashbuf;
 		u16 address = 0;
 		for (;;)
-		{
+		{		
 			if (USB_Available(CDC_RX)) 
 			{
 				u8 cmd = USB_Recv(CDC_RX);
@@ -208,19 +235,16 @@ int main()
 				if ('Q' == cmd) 
 				{
 					_delay_ms(100);
-					/* move interrupts to application section:
-					 * uses inline assembly because the procedure must be completed in four cycles.
-					 */
-					cli();	// disable interrupts
-					asm volatile (
-								  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
-								  "out 0x35,  r16\n"		// MCUCR
-								  "ldi r16,	  0x00\n"		// (1<<IVSEL)	/* Move interrupts to application flash section */
-								  "out 0x35,  r16\n"		// MCUCR				  
-								  );						
 					start_sketch();
 				}
 			}
+			else 
+			{
+				LEDPulse();
+				_delay_us(100);
+				if (_timeout-- == 1)
+					start_sketch();
+			}
 		}
 	}
 }
-- 
cgit v1.2.3-18-g5258