Fixed the issue with number-pad enter key; support shift-NP enter

Author: dplassgit

keyboardv1/keyboardv1.ino

@@ -98,7 +98,6 @@ int numLockTable[256];
 
 /* Send a key chord over the USB. */
 void sendChar(byte key) {
-  // TEMPORARY
   if (key == VG_F6 + VG_CTRL + VG_SHIFT) { // 246
     // Toggles the keyboard-iness
     setUseSerialLibrary(!useSerialLibrary);
@@ -108,6 +107,9 @@ void sendChar(byte key) {
   if (numLock) {
     translated = numLockTable[key];
   }
+  if (useSerialLibrary) {
+    Serial.print("Before: "); Serial.print(key); Serial.print(" after: "); Serial.println(translated);
+  }
 
   // Figure out what to do with the key
   //  * If "next is alt", send this char as alt
@@ -170,7 +172,7 @@ void sendChar(byte key) {
 }
 
 void pressKey(int translated, byte key) {
-  byte rawCode = (translated & 0xff);
+  byte rawCode = (byte) (translated & 0xff);
   if (useSerialLibrary) {
     if ((translated & CTRL_MOD) == CTRL_MOD) {
       Serial.print("ctrl+");

keyboardv1/setup.ino

@@ -51,7 +51,7 @@ void setupTable() {
   setupKeyWModifiers(VG_RIGHT, KEY_RIGHT_ARROW);
 
   translationTable[VG_NP_ENTER] = KEY_RETURN;
-  translationTable[VG_NP_ENTER + VG_SHIFT] = KEY_RETURN;
+  translationTable[VG_NP_ENTER + VG_SHIFT] = SHIFT_MOD + KEY_RETURN;
 
   // Numlock off: cursor keys:
   translationTable[VG_NP_0] = KEY_INSERT;
@@ -96,11 +96,6 @@ void setupTable() {
   }
 
   // Numlock overrides:
-
-  // Not sure why I needed these...
-  numLockTable[VG_NP_ENTER] = KEY_RETURN;
-  numLockTable[VG_NP_ENTER + VG_SHIFT] = KEY_RETURN;
-
   numLockTable[VG_NP_0] = '0';
   numLockTable[VG_NP_1] = '1';
   numLockTable[VG_NP_2] = '2';
@@ -113,7 +108,7 @@ void setupTable() {
   numLockTable[VG_NP_9] = '9';
   numLockTable[VG_NP_DOT] = '.';
 
-  numLockTable[VG_NP_0 + VG_CTRL] = CTRL_MOD + '0';
+  // For future me: np0 + ctrl returns the same code as np0
   numLockTable[VG_NP_1 + VG_CTRL] = CTRL_MOD + '1';
   numLockTable[VG_NP_2 + VG_CTRL] = CTRL_MOD + '2';
   numLockTable[VG_NP_3 + VG_CTRL] = CTRL_MOD + '3';