add Delete and return to shifted thumb keys. Add numpad

ArduinoKeyboard.ino

@@ -28,7 +28,7 @@
 
 
 
-byte matrixState[ROWS][COLS];
+ byte matrixState[ROWS][COLS];
 
 
 byte charsBeingReported[KEYS_HELD_BUFFER]; // A bit vector for the 256 keys we might conceivably be holding down

Makefile

@@ -2,7 +2,7 @@
 
 #BOARD_TAG    = keyboardio
 BOARD    = micro
-PORT =  /dev/cu.usbmodem1421
+PORT =  /dev/cu.usbmodem1411
 ARDUINO_LIBS = 
 #ARDUINO_CORE_PATH = hardware/keyboardio/cores/keyboardio
 #ALTERNATE_CORE = keyboardio

keymaps_generated.h

@@ -14,7 +14,7 @@
 	{Key_Tab, Key_mouseBtnM, Key_mouseUp, Key_skip, Key_mouseWarpNW, Key_mouseWarpNE, Key_NoKey, Key_NoKey, Key_LCurlyBracket, Key_RCurlyBracket, Key_LSquareBracket, Key_RSquareBracket, Key_BacklightUp, Key_sleep},\
 	{Key_Home, Key_mouseL, Key_mouseDn, Key_mouseR, Key_mouseWarpSW, Key_mouseWarpSE, Key_nextTrack, Key_playPause, Key_LArrow, Key_DnArrow, Key_UpArrow, Key_RArrow, Key_BacklightDn, Key_F11},\
 	{Key_End, Key_Z, Key_X, Key_C, Key_V, Key_mouseWarpEnd, Key_prevTrack, Key_Enter, Key_volumeMute, Key_volumeDown, Key_volumeUp, Key_skip, Key_Backslash, Key_Pipe},\
-	{Key_LCtrl, Key_mouseBtnL, Key_LShift, Key_LGUI, Key_NoKey, Key_skip, Key_skip, Key_skip, Key_skip, Key_NoKey, Key_RAlt, Key_RShift, Key_mouseBtnR, Key_RCtrl},\
+	{Key_LCtrl, Key_Delete, Key_mouseBtnL, Key_LGUI, Key_NoKey, Key_skip, Key_skip, Key_skip, Key_skip, Key_NoKey, Key_RAlt, Key_mouseBtnR, Key_Return, Key_RCtrl},\
 },
 #define KEYMAP_MALTRON { /* Generated keymap for MALTRON */ 	{Key_skip, Key_1, Key_2, Key_3, Key_4, Key_5, Key_skip, Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip},\
 	{Key_Backtick, Key_Q, Key_P, Key_Y, Key_C, Key_B, Key_skip, Key_skip, Key_V, Key_M, Key_U, Key_Z, Key_L, Key_Equals},\
@@ -45,10 +45,10 @@
 static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
-	KEYMAP_COLEMAK
 	KEYMAP_NUMPAD
     KEYMAP_DVORAK
 	KEYMAP_GENERIC_FN2
+	KEYMAP_COLEMAK
     KEYMAP_WORKMAN
 	KEYMAP_GENERIC_FN2
 

keymaps_h-template

@@ -3,10 +3,10 @@
 static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
-	KEYMAP_COLEMAK
 	KEYMAP_NUMPAD
     KEYMAP_DVORAK
 	KEYMAP_GENERIC_FN2
+	KEYMAP_COLEMAK
     KEYMAP_WORKMAN
 	KEYMAP_GENERIC_FN2
 

layouts/generic_fn2

@@ -3,4 +3,4 @@ skip 	F1         F2        F3        F4             F5            NoKey       No
 Tab 	mouseBtnM  mouseUp   skip      mouseWarpNW    mouseWarpNE   NoKey       NoKey     {          }           [           ]          BacklightUp   sleep
 Home    mouseL 	   mouseDn   mouseR    mouseWarpSW    mouseWarpSE   nextTrack   playPause LArrow     DnArrow     UpArrow     RArrow     BacklightDn   F11
 End     Z          X         C         V              mouseWarpEnd  prevTrack   Enter     volumeMute volumeDown  volumeUp    skip       \             |
-LCtrl mouseBtnL LShift LGUI NoKey skip  skip skip skip  NoKey RAlt RShift mouseBtnR  RCtrl
+LCtrl Delete mouseBtnL LGUI NoKey skip  skip skip skip  NoKey RAlt mouseBtnR Return RCtrl