]> git.donarmstrong.com Git - kiibohd-controller.git/commitdiff
Enabling USB keycodes.
authorJacob Alexander <haata@kiibohd.com>
Fri, 25 Apr 2014 09:35:49 +0000 (02:35 -0700)
committerJacob Alexander <haata@kiibohd.com>
Fri, 25 Apr 2014 09:35:49 +0000 (02:35 -0700)
- There are some bugs here:
  * Press/Release (this is a keymapping bug, has nothing to do with capsense press/release which is working)
  * Some keys give incorrect USB codes

Scan/DPH/defaultMap.h
Scan/DPH/scan_loop.c

index 9cb532dfca2b44f1be0ed068d43aaaed35d5edf5..de4e0835be77617e7cd91f9f96d653b2fa7d7e2c 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef __KEYMAP_H
 #define __KEYMAP_H
 
-// This file contains various key layouts for the AVR DPH Capsense Controller
+// This file contains the a basic US ANSI-like layout for the Kishsaver using the AVR DPH Capsense Controller
 
 
 // ----- Variables -----
@@ -33,12 +33,12 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0x05
                                0, // 0x06
                                0, // 0x07
-                               KEY_BACKSPACE, // 0x08
-                               KEY_TAB, // 0x09
+                               0, // 0x08
+                               0, // 0x09
                                0, // 0x0A
                                0, // 0x0B
                                0, // 0x0C
-                               KEY_ENTER, // 0x0D
+                               0, // 0x0D
                                0, // 0x0E
                                0, // 0x0F
                                0, // 0x10
@@ -52,107 +52,107 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0x18
                                0, // 0x19
                                0, // 0x1A
-                               KEY_ESC, // 0x1B
+                               0, // 0x1B
                                0, // 0x1C
                                0, // 0x1D
                                0, // 0x1E
                                0, // 0x1F
-                               KEY_SPACE, // 0x20
+                               0, // 0x20
                                0, // 0x21
                                0, // 0x22
                                0, // 0x23
                                0, // 0x24
                                0, // 0x25
                                0, // 0x26
-                               KEY_QUOTE, // 0x27
+                               0, // 0x27
                                0, // 0x28
                                0, // 0x29
                                0, // 0x2A
                                0, // 0x2B
-                               KEY_COMMA, // 0x2C
-                               KEY_MINUS, // 0x2D
-                               KEY_PERIOD, // 0x2E
-                               KEY_SLASH, // 0x2F
-                               KEY_0, // 0x30
-                               KEY_1, // 0x31
-                               KEY_2, // 0x32
-                               KEY_3, // 0x33
-                               KEY_4, // 0x34
-                               KEY_5, // 0x35
-                               KEY_6, // 0x36
-                               KEY_7, // 0x37
-                               KEY_8, // 0x38
-                               KEY_9, // 0x39
+                               0, // 0x2C
+                               0, // 0x2D
+                               0, // 0x2E
+                               0, // 0x2F
+                               0, // 0x30
+                               0, // 0x31
+                               0, // 0x32
+                               0, // 0x33
+                               0, // 0x34
+                               0, // 0x35
+                               0, // 0x36
+                               0, // 0x37
+                               0, // 0x38
+                               0, // 0x39
                                0, // 0x3A
-                               KEY_SEMICOLON, // 0x3B
+                               0, // 0x3B
                                0, // 0x3C
-                               KEY_EQUAL, // 0x3D
+                               0, // 0x3D
                                0, // 0x3E
                                0, // 0x3F
-                               0, // 0x40
+                               KEY_BACKSPACE, // 0x40
                                0, // 0x41
-                               0, // 0x42
-                               0, // 0x43
-                               0, // 0x44
+                               KEY_RIGHT_BRACE, // 0x42
+                               KEY_DELETE, // 0x43
+                               KEY_ENTER, // 0x44
                                0, // 0x45
-                               0, // 0x46
-                               0, // 0x47
-                               0, // 0x48
-                               0, // 0x49
-                               0, // 0x4A
-                               0, // 0x4B
-                               0, // 0x4C
-                               0, // 0x4D
-                               0, // 0x4E
-                               0, // 0x4F
-                               0, // 0x50
-                               0, // 0x51
-                               0, // 0x52
-                               0, // 0x53
-                               0, // 0x54
-                               0, // 0x55
-                               0, // 0x56
-                               0, // 0x57
-                               0, // 0x58
-                               0, // 0x59
-                               0, // 0x5A
-                               KEY_LEFT_BRACE, // 0x5B
-                               KEY_BACKSLASH, // 0x5C
-                               KEY_RIGHT_BRACE, // 0x5D
-                               0, // 0x5E
-                               0, // 0x5F
-                               KEY_TILDE, // 0x60
-                               KEY_A, // 0x61
-                               KEY_B, // 0x62
-                               KEY_C, // 0x63
-                               KEY_D, // 0x64
-                               KEY_E, // 0x65
-                               KEY_F, // 0x66
-                               KEY_G, // 0x67
-                               KEY_H, // 0x68
-                               KEY_I, // 0x69
-                               KEY_J, // 0x6A
-                               KEY_K, // 0x6B
-                               KEY_L, // 0x6C
-                               KEY_M, // 0x6D
-                               KEY_N, // 0x6E
-                               KEY_O, // 0x6F
-                               KEY_P, // 0x70
+                               KEY_RSHIFT, // 0x46
+                               KEY_RCTRL, // 0x47
+                               KEY_EQUAL, // 0x48
+                               KEY_MINUS, // 0x49
+                               KEY_LEFT_BRACE, // 0x4A
+                               KEY_BACKSLASH, // 0x4B
+                               KEY_QUOTE, // 0x4C
+                               KEY_SLASH, // 0x4D
+                               KEY_RGUI, // 0x4E
+                               KEY_RALT, // 0x4F
+                               KEY_0, // 0x50
+                               KEY_9, // 0x51
+                               KEY_P, // 0x52
+                               KEY_O, // 0x53
+                               KEY_SEMICOLON, // 0x54
+                               KEY_L, // 0x55
+                               KEY_PERIOD, // 0x56
+                               KEY_COMMA, // 0x57
+                               KEY_8, // 0x58
+                               KEY_7, // 0x59
+                               KEY_I, // 0x5A
+                               KEY_U, // 0x5B
+                               KEY_J, // 0x5C
+                               KEY_K, // 0x5D
+                               KEY_N, // 0x5E
+                               KEY_M, // 0x5F
+                               KEY_6, // 0x60
+                               KEY_5, // 0x61
+                               KEY_Y, // 0x62
+                               KEY_T, // 0x63
+                               KEY_H, // 0x64
+                               KEY_G, // 0x65
+                               KEY_B, // 0x66
+                               KEY_SPACE, // 0x67
+                               KEY_4, // 0x68
+                               KEY_3, // 0x69
+                               KEY_R, // 0x6A
+                               KEY_E, // 0x6B
+                               KEY_F, // 0x6C
+                               KEY_D, // 0x6D
+                               KEY_C, // 0x6E
+                               KEY_V, // 0x6F
+                               KEY_2, // 0x70
                                KEY_Q, // 0x71
-                               KEY_R, // 0x72
-                               KEY_S, // 0x73
-                               KEY_T, // 0x74
-                               KEY_U, // 0x75
-                               KEY_V, // 0x76
-                               KEY_W, // 0x77
-                               KEY_X, // 0x78
-                               KEY_Y, // 0x79
-                               KEY_Z, // 0x7A
-                               0, // 0x7B
-                               0, // 0x7C
-                               0, // 0x7D
-                               0, // 0x7E
-                               KEY_DELETE, // 0x7F
+                               KEY_W, // 0x72
+                               KEY_A, // 0x73
+                               KEY_S, // 0x74
+                               KEY_X, // 0x75
+                               KEY_Z, // 0x76
+                               KEY_LALT, // 0x77
+                               KEY_1, // 0x78
+                               KEY_TILDE, // 0x79
+                               KEY_TAB, // 0x7A
+                               KEY_CAPS_LOCK, // 0x7B
+                               KEY_LSHIFT, // 0x7C
+                               KEY_INTER1, // 0x7D
+                               KEY_LGUI, // 0x7E
+                               KEY_LCTRL, // 0x7F
                                0, // 0x80
                                0, // 0x81
                                0, // 0x82
@@ -202,8 +202,8 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0xAE
                                0, // 0xAF
                                0, // 0xB0
-                               KEYPAD_0, // 0xB1
-                               KEYPAD_PERIOD, // 0xB2
+                               0, // 0xB1
+                               0, // 0xB2
                                0, // 0xB3
                                0, // 0xB4
                                0, // 0xB5
@@ -217,10 +217,10 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0xBD
                                0, // 0xBE
                                0, // 0xBF
-                               KEYPAD_1, // 0xC0
-                               KEYPAD_2, // 0xC1
-                               KEYPAD_3, // 0xC2
-                               KEYPAD_ENTER, // 0xC3
+                               0, // 0xC0
+                               0, // 0xC1
+                               0, // 0xC2
+                               0, // 0xC3
                                0, // 0xC4
                                0, // 0xC5
                                0, // 0xC6
@@ -233,10 +233,10 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0xCD
                                0, // 0xCE
                                0, // 0xCF
-                               KEYPAD_4, // 0xD0
-                               KEYPAD_5, // 0xD1
-                               KEYPAD_6, // 0xD2
-                               KEYPAD_COMMA, // 0xD3
+                               0, // 0xD0
+                               0, // 0xD1
+                               0, // 0xD2
+                               0, // 0xD3
                                0, // 0xD4
                                0, // 0xD5
                                0, // 0xD6
@@ -250,10 +250,10 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0xDE
                                0, // 0xDF
                                0, // 0xE0
-                               KEYPAD_7, // 0xE1
-                               KEYPAD_8, // 0xE2
-                               KEYPAD_9, // 0xE3
-                               KEYPAD_MINUS, // 0xE4
+                               0, // 0xE1
+                               0, // 0xE2
+                               0, // 0xE3
+                               0, // 0xE4
                                0, // 0xE5
                                0, // 0xE6
                                0, // 0xE7
@@ -266,12 +266,12 @@ static uint8_t DefaultMap_Lookup[] = {
                                0, // 0xEE
                                0, // 0xEF
                                0, // 0xF0
-                               KEY_UP, // 0xF1
-                               KEY_DOWN, // 0xF2
-                               KEY_LEFT, // 0xF3
-                               KEY_RIGHT, // 0xF4
+                               0, // 0xF1
+                               0, // 0xF2
+                               0, // 0xF3
+                               0, // 0xF4
                                0, // 0xF5
-                               KEY_CTRL, // 0xF6
+                               0, // 0xF6
                                0, // 0xF7
                                0, // 0xF8
                                0, // 0xF9
index 27eb92ee32fd0aa9b21c5dbeec2800c44a8b89a8..132b39fb046e4358f18b2c7a585f923ba89c37b1 100644 (file)
@@ -23,6 +23,7 @@
 // Project Includes
 #include <cli.h>
 #include <led.h>
+#include <macro.h>
 #include <print.h>
 
 // Local Includes
@@ -805,7 +806,7 @@ void testColumn( uint8_t strobe )
                                        // Only add the key to the buffer once
                                        // NOTE: Buffer can easily handle multiple adds, just more efficient
                                        //        and nicer debug messages :P
-                                       //Macro_bufferAdd( key );
+                                       Macro_bufferAdd( key );
                                }
 
                                keys_debounce[key]++;