sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpress keys when switching layers

Browse Source
This commit is contained in:
Jeremy Soller 2019-11-24 14:24:23 -07:00
parent 1ecae5e9f9
commit fe613e093c
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/board/system76/galp3-c/kbscan.c
View File

@ -21,6 +21,7 @@ void kbscan_init(void) {
void kbscan_event(void) { void kbscan_event(void) {
static uint8_t kbscan_layer = 0; static uint8_t kbscan_layer = 0;
uint8_t layer = kbscan_layer;
static uint8_t kbscan_last[KM_OUT] = { 0 }; static uint8_t kbscan_last[KM_OUT] = { 0 };
int i; int i;
@ -41,15 +42,15 @@ void kbscan_event(void) {
uint8_t last = kbscan_last[i]; uint8_t last = kbscan_last[i];
if (new != last) { if (new != last) {
int j; int j;
for (j = 0; j < 8; j++) { for (j = 0; j < KM_IN; j++) {
bool new_b = new & (1 << j); bool new_b = new & (1 << j);
bool last_b = last & (1 << j); bool last_b = last & (1 << j);
if (new_b != last_b) { if (new_b != last_b) {
uint16_t key = keymap(i, j, kbscan_layer); uint16_t key = keymap(i, j, kbscan_layer);
DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, kbscan_layer, key, new_b); DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, kbscan_layer, key, new_b);
if (key == K_FN) { if (key == K_FN) {
if (new_b) kbscan_layer = 1; if (new_b) layer = 1;
else kbscan_layer = 0; else layer = 0;
} else if (kbscan_enabled && key) { } else if (kbscan_enabled && key) {
kbc_scancode(&KBC, key, new_b); kbc_scancode(&KBC, key, new_b);
} }
@ -60,6 +61,36 @@ void kbscan_event(void) {
} }
} }
if (layer != kbscan_layer) {
//TODO: unpress keys before going to scratch rom
// Unpress all currently pressed keys
for (i = 0; i < KM_OUT; i++) {
uint8_t new = 0;
uint8_t last = kbscan_last[i];
if (last) {
int j;
for (j = 0; j < KM_IN; j++) {
bool new_b = new & (1 << j);
bool last_b = last & (1 << j);
if (new_b != last_b) {
uint16_t key = keymap(i, j, kbscan_layer);
DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, kbscan_layer, key, new_b);
if (key == K_FN) {
// N/A
} else if (kbscan_enabled && key) {
kbc_scancode(&KBC, key, new_b);
}
}
}
}
kbscan_last[i] = new;
}
kbscan_layer = layer;
}
// Reset all lines to inputs // Reset all lines to inputs
KSOLGOEN = 0; KSOLGOEN = 0;
KSOHGOEN = 0; KSOHGOEN = 0;