uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes the bug of additional characters when mod key is released before the other key

Browse Source
This commit is contained in:
Robert Csordas
2016-11-14 22:09:33 +01:00
parent 1d2f35dfe9
commit 5cf1da0cfe
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
right/src/keyboard_layout.c Normal file
View File

@@ -0,0 +1,3 @@
#include "keyboard_layout.h"
uint8_t keyMasks[LAYOUT_KEY_COUNT];

22
right/src/keyboard_layout.h
View File

@@ -35,11 +35,20 @@
#define MODIFIER_MOD_PRESSED 1 #define MODIFIER_MOD_PRESSED 1
#define MODIFIER_FN_PRESSED 2 #define MODIFIER_FN_PRESSED 2
extern uint8_t keyMasks[LAYOUT_KEY_COUNT];
static inline __attribute__((always_inline)) uint8_t getKeycode(KEYBOARD_LAYOUT(layout), uint8_t keyId, uint8_t modifierState) static inline __attribute__((always_inline)) uint8_t getKeycode(KEYBOARD_LAYOUT(layout), uint8_t keyId, uint8_t modifierState)
{ {
if (keyId<LAYOUT_KEY_COUNT) { if (keyId<LAYOUT_KEY_COUNT) {
if (keyMasks[keyId]!=0 && keyMasks[keyId]!=modifierState){
//Mask out key presses after releasing modifier keys
return 0;
}
uint8_t k = layout[keyId][modifierState]; uint8_t k = layout[keyId][modifierState];
keyMasks[keyId] = modifierState;
if (k==0) { if (k==0) {
k = layout[keyId][0]; k = layout[keyId][0];
} }
@@ -62,4 +71,17 @@ static inline __attribute__((always_inline)) uint8_t getModifierState(const uint
return mod; return mod;
} }
static inline __attribute__((always_inline)) void clearKeymasks(const uint8_t *leftKeyStates, const uint8_t *rightKeyStates){
int i;
for (i=0; i<KEY_STATE_COUNT; ++i){
if (rightKeyStates[i]==0){
keyMasks[i] = 0;
}
if (leftKeyStates[i]==0){
keyMasks[LAYOUT_LEFT_OFFSET+i] = 0;
}
}
}
#endif #endif

1
right/src/usb_interface_keyboard.c
View File

@@ -101,6 +101,7 @@ void usbKeyboadTask(){
readLeftKeys(leftKeyStates); readLeftKeys(leftKeyStates);
uint8_t modifierState = getModifierState(leftKeyStates, keyMatrix.keyStates); uint8_t modifierState = getModifierState(leftKeyStates, keyMatrix.keyStates);
clearKeymasks(leftKeyStates, keyMatrix.keyStates);
int scancodeIdx = 0; int scancodeIdx = 0;
for (uint8_t keyId=0; keyId<KEYBOARD_MATRIX_COLS_NUM*KEYBOARD_MATRIX_ROWS_NUM; keyId++) { for (uint8_t keyId=0; keyId<KEYBOARD_MATRIX_COLS_NUM*KEYBOARD_MATRIX_ROWS_NUM; keyId++) {