cm/cmdr-keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed keypad pinning references. First functional release.

Browse Source
This commit is contained in:
Christoffer Martinsson 2022-11-03 18:46:25 +01:00
parent 8b17c06193
commit 855e3fefcb
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/src/main.cpp
View File

@ -45,8 +45,8 @@
* -------------------------- -------------------------
* Layer 2
* ------------------------------------------ ---------------------------------------------
* | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | | CapsLock |
* | Ctrl/Esc | Prev| Play| Next| | | | Left| Down| Up |Right| | |
* | Tab/Fn2 | F12 | F13 | F14 | F15 | F16 | | ML | MD | MU | MR | MWU | CapsLock |
* | Ctrl/Esc | Prev| Play| Next| | | | Left| Down| Up |Right| MWD | Game Mode |
* | Shift | | | | | | | Home| PgD | PgU | End | Ins | Shift/Enter |
* ----------------| M1/M2 | Alt | BSpc/Fn1 | | Spc/Fn1 | AltGr | Win |--------------------
* -------------------------- -------------------------
@ -123,8 +123,8 @@ struct Button
const byte KP_ROWS = 4;
const byte KP_COLS = 12;
byte kp_rowPins[KP_ROWS] = {1, 2, 3, 4};
byte kp_colPins[KP_COLS] = {12, 11, 10, 9, 8, 7, 26, 25, 24, 23, 22, 21};
byte kp_rowPins[KP_ROWS] = {0, 1, 2, 3};
byte kp_colPins[KP_COLS] = {9, 8, 7, 6, 5, 4, 19, 18, 17, 16, 15, 14};
char kp_keys[KP_ROWS][KP_COLS] = {
{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12},
@ -157,17 +157,17 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS,
Button buttons[NBR_OF_BUTTONS] =
{
/* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key GM replace key Hold direct Combo keys */
{1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, KEY_TAB, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{3, KEY_W, NO_KEY, KEY_F2, KEY_F13, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{4, KEY_E, NO_KEY, KEY_F3, KEY_F14, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{5, KEY_R, NO_KEY, KEY_F4, KEY_F15, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{6, KEY_T, NO_KEY, KEY_F5, KEY_F16, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{8, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{9, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{10, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{11, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{7, KEY_Y, NO_KEY, KEY_F6, KEY_ML, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{8, KEY_U, NO_KEY, KEY_F7, KEY_MD, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{9, KEY_I, NO_KEY, KEY_F8, KEY_MU, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{10, KEY_O, NO_KEY, KEY_F9, KEY_MR, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{11, KEY_P, NO_KEY, KEY_F10, KEY_MWU, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, KEY_LEFT_CTRL, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PREV_TRACK, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
@ -179,7 +179,7 @@ Button buttons[NBR_OF_BUTTONS] =
{20, KEY_J, NO_KEY, KEY_7, KEY_DOWN_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{21, KEY_K, NO_KEY, KEY_8, KEY_UP_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{22, KEY_L, NO_KEY, KEY_9, KEY_RIGHT_ARROW, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{23, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{23, 'ö', NO_KEY, KEY_0, KEY_MWD, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{24, 'ä', NO_KEY, KEY_EQUAL, KEY_GM, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{25, KEY_LEFT_SHIFT, NO_KEY, KEY_LEFT_SHIFT, KEY_LEFT_SHIFT, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{26, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
@ -193,7 +193,7 @@ Button buttons[NBR_OF_BUTTONS] =
{34, KEY_PERIOD, NO_KEY, KEY_MINUS, KEY_END, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{35, KEY_SLASH, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{36, KEY_RIGHT_SHIFT, KEY_ENTER, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{37, KEY_M1, KEY_M2, NO_KEY, NO_KEY, KEY_LEFT_ALT, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{37, KEY_M2, KEY_M1, NO_KEY, NO_KEY, KEY_LEFT_ALT, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{38, KEY_LEFT_ALT, NO_KEY, KEY_LEFT_ALT, KEY_LEFT_ALT, KEY_SPACE, false, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{39, KEY_FN1, KEY_BACKSPACE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
{40, KEY_FN1, KEY_SPACE, NO_KEY, NO_KEY, NO_KEY, true, {NO_KEY, NO_KEY, NO_KEY}, IDLE, false, 0, false, false, 0, 0, false},
@ -361,15 +361,15 @@ void scan_buttons()
{
reboot += 1;
}
if ((kp_keypad.key[i].kchar == 6) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
if ((kp_keypad.key[i].kchar == 25) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
{
reboot += 1;
}
if ((kp_keypad.key[i].kchar == 13) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
if ((kp_keypad.key[i].kchar == 12) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
{
reboot += 1;
}
if ((kp_keypad.key[i].kchar == 18) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
if ((kp_keypad.key[i].kchar == 36) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD))
{
reboot += 1;
}