# HG changeset patch
# User Jacob Alexander <triplehaata@gmail.com>
# Date 1324264879 28800
# Node ID b0ca370c4341254a41b192b97abc718149122be2
# Parent  86c4b91e90770426e30deba52b0976cd2b7669ae
Adding bootloader jump macro into buffered keypress module

diff -r 86c4b91e9077 -r b0ca370c4341 Macro/buffer/macro.c
--- a/Macro/buffer/macro.c	Sun Dec 18 19:02:56 2011 -0800
+++ b/Macro/buffer/macro.c	Sun Dec 18 19:21:19 2011 -0800
@@ -46,11 +46,34 @@
 static uint8_t Bootloader_ConditionSequence[] = {1,16,6,11};
        uint8_t Bootloader_ConditionState      = 0;
        uint8_t Bootloader_NextPositionReady   = 1;
+       uint8_t Bootloader_KeyDetected         = 0;
 
 
 
 // ----- Functions -----
 
+inline void macro_finishedWithBuffer(void)
+{
+	// Boot loader sequence state handler
+	switch ( KeyIndex_BufferUsed )
+	{
+	// The next bootloader key can now be pressed, if there were no keys processed
+	case 0:
+		Bootloader_NextPositionReady = 1;
+		break;
+	// If keys were detected, and it wasn't in the sequence (or there was multiple keys detected), start bootloader sequence over
+	// This case purposely falls through
+	case 1:
+		if ( Bootloader_KeyDetected )
+			break;
+	default:
+		Bootloader_ConditionState = 0;
+		break;
+	}
+
+	Bootloader_KeyDetected = 0;
+}
+
 void jumpToBootloader(void)
 {
 	cli();
@@ -190,7 +213,21 @@
 	}
 	return 1;
 	*/
-	return 0;
+	// Is this a bootloader sequence key?
+	if ( !Bootloader_KeyDetected
+	   && Bootloader_NextPositionReady
+	   && scanCode == Bootloader_ConditionSequence[Bootloader_ConditionState] )
+	{
+		Bootloader_KeyDetected = 1;
+		Bootloader_NextPositionReady = 0;
+		Bootloader_ConditionState++;
+	}
+	else if ( Bootloader_ConditionState > 0 && scanCode == Bootloader_ConditionSequence[Bootloader_ConditionState - 1] )
+	{
+		Bootloader_KeyDetected = 1;
+	}
+
+	return 1;
 }
 
 uint8_t sendCode = 0;
@@ -292,6 +329,9 @@
 		}
 	}
 
+	// Signal Macro processor that all of the buffered keys have been processed
+	macro_finishedWithBuffer();
+
 	// Signal buffer that we've used it
 	scan_finishedWithBuffer();
 }
@@ -306,7 +346,7 @@
 	keyPressBufferRead( MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK );
 
 	// Check for bootloader condition
-	//if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) )
-	//	jumpToBootloader();
+	if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) )
+		jumpToBootloader();
 }