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

Improve keyboard scanning and add function key

Browse Source
This commit is contained in:
Jeremy Soller
2019-11-18 19:19:55 -07:00
parent 1f81503c55
commit 788fa5ee52
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/board/system76/galp3-c/include/board/keymap.h
View File

@ -19,6 +19,10 @@ uint16_t keymap_translate(uint16_t key);
// Should send 0xE0 before scancode bytes // Should send 0xE0 before scancode bytes
#define K_E0 0x0100 #define K_E0 0x0100
// Layer selection
#define K_FN (0x8000)
// Function keys // Function keys
#define K_F1 (0x05) #define K_F1 (0x05)

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

@ -10,14 +10,13 @@ void kbscan_init(void) {
KSOCTRL = 0x05; KSOCTRL = 0x05;
KSICTRLR = 0x04; KSICTRLR = 0x04;
// Set all outputs to GPIO mode and low // Set all outputs to GPIO mode, low, and inputs
KSOL = 0; KSOL = 0;
KSOH1 = 0; KSOH1 = 0;
KSOH2 = 0;
KSOLGCTRL = 0xFF; KSOLGCTRL = 0xFF;
KSOLGOEN = 0xFF; KSOLGOEN = 0;
KSOHGCTRL = 0xFF; KSOHGCTRL = 0xFF;
KSOHGOEN = 0xFF; KSOHGOEN = 0;
} }
void kbscan_event(void) { void kbscan_event(void) {
@ -26,19 +25,17 @@ void kbscan_event(void) {
int i; int i;
for (i = 0; i < KM_OUT; i++) { for (i = 0; i < KM_OUT; i++) {
KSOL = 0xFF; // Set current line as output
KSOH1 = 0xFF;
KSOH2 = 0xFF;
if (i < 8) { if (i < 8) {
KSOL = ~(1 << i); KSOLGOEN = 1 << i;
KSOHGOEN = 0;
} else if (i < 16) { } else if (i < 16) {
KSOH1 = ~(1 << (i - 8)); KSOLGOEN = 0;
} else if (i < 24) { KSOHGOEN = 1 << (i - 8);
KSOH2 = ~(1 << (i - 16));
} }
// TODO: figure out optimal delay // TODO: figure out optimal delay
delay_ticks(1); delay_ticks(10);
uint8_t new = ~KSI; uint8_t new = ~KSI;
uint8_t last = kbscan_last[i]; uint8_t last = kbscan_last[i];
@ -49,8 +46,11 @@ void kbscan_event(void) {
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);
TRACE("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 (kbscan_enabled && key) { if (key == K_FN) {
if (new_b) kbscan_layer = 1;
else kbscan_layer = 0;
} else if (kbscan_enabled && key) {
kbc_scancode(&KBC, key, new_b); kbc_scancode(&KBC, key, new_b);
} }
} }
@ -60,10 +60,10 @@ void kbscan_event(void) {
} }
} }
KSOL = 0; // Reset all lines to inputs
KSOH1 = 0; KSOLGOEN = 0;
KSOH2 = 0; KSOHGOEN = 0;
// TODO: figure out optimal delay // TODO: figure out optimal delay
delay_ticks(1); delay_ticks(10);
} }

2
src/board/system76/galp3-c/keymap.c
View File

@ -63,7 +63,7 @@ uint16_t __code KEYMAP[KM_OUT][KM_IN][KM_LAY] = {
{K_E, 0}, // 7 {K_E, 0}, // 7
}, },
{ // 6 { // 6
{0, 0}, // 0 {K_FN, K_FN}, // 0
{K_B, 0}, // 1 {K_B, 0}, // 1
{K_F, 0}, // 2 {K_F, 0}, // 2
{K_G, 0}, // 3 {K_G, 0}, // 3