From 259a2f18b3a7ce34610b6198f3c7b62a56288200 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Mon, 26 Mar 2012 17:28:02 -0400
Subject: [PATCH] added methods to Keyboard to handle multiple simultaneous key
 presses or releases (up to six each)

---
 hardware/arduino/cores/arduino/HID.cpp  | 92 ++++++++++++++++++++++---
 hardware/arduino/cores/arduino/USBAPI.h | 15 ++++
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/hardware/arduino/cores/arduino/HID.cpp b/hardware/arduino/cores/arduino/HID.cpp
index b0ef6e3b5..b556223a5 100644
--- a/hardware/arduino/cores/arduino/HID.cpp
+++ b/hardware/arduino/cores/arduino/HID.cpp
@@ -467,17 +467,6 @@ size_t Keyboard_::press(uint8_t k)
 // it shouldn't be repeated any more.
 size_t Keyboard_::release(uint8_t k) 
 {
-	/*
-	uint8_t i;
-	k = pgm_read_byte(_asciimap + k);
-	if (!k) {
-		return 0;
-	}
-	if (k & 0x80) {
-		_keyReport.modifiers |= 0x02;	// the left shift modifier
-		k &= 0x7F;
-	}
-	*/
 	uint8_t i;
 	if (k >= 136) {			// it's a non-printing key (not a modifier)
 		k = k - 136;
@@ -509,6 +498,87 @@ size_t Keyboard_::release(uint8_t k)
 	return 1;
 }
 
+size_t Keyboard_::press(uint8_t k[], uint8_t len) {
+	uint8_t i;
+	uint8_t result = 0;
+	for (i=0; i<len; i++) {
+		result += press(k[i]);
+	}
+	return result;
+}
+
+size_t Keyboard_::press(uint8_t k1, uint8_t k2) 
+{
+	uint8_t k[] = {k1, k2};
+	return press(k, 2);
+}
+
+size_t Keyboard_::press(uint8_t k1, uint8_t k2, uint8_t k3) 
+{
+	uint8_t k[] = {k1, k2, k3};
+	return press(k, 3);
+}
+
+size_t Keyboard_::press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4) 
+{
+	uint8_t k[] = {k1, k2, k3, k4};
+	return press(k, 4);
+}
+
+size_t Keyboard_::press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5) 
+{
+	uint8_t k[] = {k1, k2, k3, k4, k5};
+	return press(k, 5);
+}
+
+size_t Keyboard_::press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5, uint8_t k6) 
+{
+	uint8_t k[] = {k1, k2, k3, k4, k5, k6};
+	return press(k, 6);
+}
+
+
+
+size_t Keyboard_::release(uint8_t k[], uint8_t len) {
+	uint8_t i;
+	uint8_t result = 0;
+	for (i=0; i<len; i++) {
+		result += release(k[i]);
+	}
+	return result;
+}
+
+size_t Keyboard_::release(uint8_t k1, uint8_t k2) 
+{
+	uint8_t k[] = {k1, k2};
+	return release(k, 2);
+}
+
+size_t Keyboard_::release(uint8_t k1, uint8_t k2, uint8_t k3) 
+{
+	uint8_t k[] = {k1, k2, k3};
+	return release(k, 3);
+}
+
+size_t Keyboard_::release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4) 
+{
+	uint8_t k[] = {k1, k2, k3, k4};
+	return release(k, 4);
+}
+
+size_t Keyboard_::release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5) 
+{
+	uint8_t k[] = {k1, k2, k3, k4, k5};
+	return release(k, 5);
+}
+
+size_t Keyboard_::release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5, uint8_t k6) 
+{
+	uint8_t k[] = {k1, k2, k3, k4, k5, k6};
+	return release(k, 6);
+}
+
+
 void Keyboard_::releaseAll(void)
 {
 	_keyReport.keys[0] = 0;
diff --git a/hardware/arduino/cores/arduino/USBAPI.h b/hardware/arduino/cores/arduino/USBAPI.h
index c8948c176..e83089aea 100644
--- a/hardware/arduino/cores/arduino/USBAPI.h
+++ b/hardware/arduino/cores/arduino/USBAPI.h
@@ -130,6 +130,21 @@ public:
 	virtual size_t type(uint8_t k);
 	virtual size_t press(uint8_t k);
 	virtual size_t release(uint8_t k);
+	
+	virtual size_t press(uint8_t k[], uint8_t len);
+	virtual size_t press(uint8_t k1, uint8_t k2);	
+	virtual size_t press(uint8_t k1, uint8_t k2, uint8_t k3);	
+	virtual size_t press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4);	
+	virtual size_t press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5);	
+	virtual size_t press(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5, uint8_t k6);	
+
+	virtual size_t release(uint8_t k[], uint8_t len);
+	virtual size_t release(uint8_t k1, uint8_t k2);	
+	virtual size_t release(uint8_t k1, uint8_t k2, uint8_t k3);	
+	virtual size_t release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4);	
+	virtual size_t release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5);	
+	virtual size_t release(uint8_t k1, uint8_t k2, uint8_t k3, uint8_t k4, uint8_t k5, uint8_t k6);	
+	
 	virtual void releaseAll(void);
 };
 extern Keyboard_ Keyboard;