removed pressRaw + releaseRaw because this functionality is already contained in the fix for issue arduino#1391 and the code was redundant

Author: nospam2000

hardware/arduino/cores/arduino/HID.cpp

@@ -458,33 +458,9 @@ uint8_t USBPutChar(uint8_t c);
 // to the persistent key report and sends the report.  Because of the way 
 // USB HID works, the host acts like the key remains pressed until we 
 // call release(), releaseAll(), or otherwise clear the report and resend.
-size_t Keyboard_::pressRaw(uint8_t k) 
-{
-	uint8_t i;
-	// Add k to the key report only if it's not already present
-	// and if there is an empty slot.
-	if (_keyReport.keys[0] != k && _keyReport.keys[1] != k && 
-		_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
-		_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
-		
-		for (i=0; i<6; i++) {
-			if (_keyReport.keys[i] == 0x00) {
-				_keyReport.keys[i] = k;
-				break;
-			}
-		}
-		if (i == 6 || (k >= 0xE0)) {
-			setWriteError();
-			return 0;
-		}	
-	}
-	sendReport(&_keyReport);
-	return 1;
-}
-
-// translates ASCII characters to usage
 size_t Keyboard_::press(uint8_t k) 
 {
+	uint8_t i;
 	if (k >= 136) {			// it's a non-printing key (not a modifier)
 		k = k - 136;
 	} else if (k >= 128) {	// it's a modifier key
@@ -501,48 +477,28 @@ size_t Keyboard_::press(uint8_t k)
 			k &= 0x7F;
 		}
 	}
-	return pressRaw(k);
-}
-
-// release() takes the specified key out of the persistent key report and
-// sends the report.  This tells the OS the key is no longer pressed and that
-// it shouldn't be repeated any more.
-size_t Keyboard_::releaseRaw(uint8_t k) 
-{
-	uint8_t i;
-	// Test the key report to see if k is present.  Clear it if it exists.
-	// Check all positions in case the key is present more than once (which it shouldn't be)
-	for (i=0; i<6; i++) {
-		if (0 != k && _keyReport.keys[i] == k) {
-			_keyReport.keys[i] = 0x00;
+	
+	// Add k to the key report only if it's not already present
+	// and if there is an empty slot.
+	if (_keyReport.keys[0] != k && _keyReport.keys[1] != k && 
+		_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
+		_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
+		
+		for (i=0; i<6; i++) {
+			if (_keyReport.keys[i] == 0x00) {
+				_keyReport.keys[i] = k;
+				break;
+			}
 		}
+		if (i == 6) {
+			setWriteError();
+			return 0;
+		}	
 	}
-
 	sendReport(&_keyReport);
 	return 1;
 }
 
-// translates ASCII characters to usage
-size_t Keyboard_::release(uint8_t k) 
-{
-	if (k >= 136) {			// it's a non-printing key (not a modifier)
-		k = k - 136;
-	} else if (k >= 128) {	// it's a modifier key
-		_keyReport.modifiers &= ~(1<<(k-128));
-		k = 0;
-	} else {				// it's a printing key
-		k = pgm_read_byte(_asciimap + k);
-		if (!k) {
-			return 0;
-		}
-		if (k & 0x80) {							// it's a capital letter or other character reached with shift
-			_keyReport.modifiers &= ~(0x02);	// the left shift modifier
-			k &= 0x7F;
-		}
-	}
-	return releaseRaw(k);
-}
-
 // System Control
 //  k is one of the SYSTEM_CONTROL defines which come from the HID usage table "Generic Desktop Page (0x01)"
 // in "HID Usage Tables" (HUT1_12v2.pdf)
@@ -575,6 +531,40 @@ size_t Keyboard_::systemControl(uint8_t k)
 	}
 }
 
+// release() takes the specified key out of the persistent key report and
+// sends the report.  This tells the OS the key is no longer pressed and that
+// it shouldn't be repeated any more.
+size_t Keyboard_::release(uint8_t k) 
+{
+	uint8_t i;
+	if (k >= 136) {			// it's a non-printing key (not a modifier)
+		k = k - 136;
+	} else if (k >= 128) {	// it's a modifier key
+		_keyReport.modifiers &= ~(1<<(k-128));
+		k = 0;
+	} else {				// it's a printing key
+		k = pgm_read_byte(_asciimap + k);
+		if (!k) {
+			return 0;
+		}
+		if (k & 0x80) {							// it's a capital letter or other character reached with shift
+			_keyReport.modifiers &= ~(0x02);	// the left shift modifier
+			k &= 0x7F;
+		}
+	}
+	
+	// Test the key report to see if k is present.  Clear it if it exists.
+	// Check all positions in case the key is present more than once (which it shouldn't be)
+	for (i=0; i<6; i++) {
+		if (0 != k && _keyReport.keys[i] == k) {
+			_keyReport.keys[i] = 0x00;
+		}
+	}
+
+	sendReport(&_keyReport);
+	return 1;
+}
+
 void Keyboard_::releaseAll(void)
 {
 	_keyReport.keys[0] = 0;
@@ -587,17 +577,10 @@ void Keyboard_::releaseAll(void)
 	sendReport(&_keyReport);
 }
 
-size_t Keyboard_::writeRaw(uint8_t c)
-{	
-	uint8_t p = pressRaw(c);		// Keydown
-	releaseRaw(c);		// Keyup
-	return (p);				// just return the result of press() since release() almost always returns 1
-}
-
 size_t Keyboard_::write(uint8_t c)
 {	
 	uint8_t p = press(c);		// Keydown
-	release(c);		// Keyup
+	uint8_t r = release(c);		// Keyup
 	return (p);					// just return the result of press() since release() almost always returns 1
 }
 

hardware/arduino/cores/arduino/USBAPI.h

@@ -154,11 +154,8 @@ class Keyboard_ : public Print
 	void begin(void);
 	void end(void);
 	virtual size_t write(uint8_t k);
-	virtual size_t writeRaw(uint8_t c);
 	virtual size_t press(uint8_t k);
-	virtual size_t pressRaw(uint8_t k);
 	virtual size_t release(uint8_t k);
-	virtual size_t releaseRaw(uint8_t k);
 	virtual void releaseAll(void);
 	virtual size_t systemControl(uint8_t k);
 };