di0ib
/
tmk_keyboard_custom
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Fix tap key using delaying_layer and waiting_key.

core
tmk 11 years ago
parent
93078aad21
commit
1f26a639d4
4 changed files with 146 additions and 31 deletions
Unified View Show Diff Stats
  1. 137
    30
      common/action.c
  2. 5
    0
      common/host.c
  3. 3
    0
      common/host.h
  4. 1
    1
      common/keyboard.c

+ 137
- 30
common/action.c View File

uint8_t current_layer = 0; uint8_t current_layer = 0;
keyrecord_t delaying_layer = {}; keyrecord_t delaying_layer = {};


keyrecord_t waiting_key = {};


void action_exec(keyevent_t event)
// TODO: ring buffer: waiting_keys[]
/*
#define WAITING_KEYS_BUFFER 3
static keyrecord_t waiting_keys[WAITING_KEYS_BUFFER] = {};
static uint8_t waiting_keys_head = 0;
static uint8_t waiting_keys_tail = 0;
static void waiting_key_queue(keyevent_t event)
{ {
/* count tap when key is up */
if (KEYEQ(event.key, last_event.key) && timer_elapsed(last_event_time) < TAP_TIME) {
if (!event.pressed) tap_count++;
} else {
tap_count = 0;
}
}
static void waiting_key_dequeue(keyevent_t event)
{
}
*/


/* layer switch after LAYER_DELAY */
if (delaying_layer.action.code && timer_elapsed(delaying_layer.event.time) > LAYER_DELAY) {
switch (delaying_layer.action.kind.id) {
case ACT_LAYER_PRESSED:
layer_switch(delaying_layer.action.layer.opt);
break;
case ACT_LAYER_BIT:
layer_switch(current_layer | delaying_layer.action.layer.opt);
break;
}
delaying_layer = (keyrecord_t){};
}
action_t action = keymap_get_action(current_layer, event.key.row, event.key.col);
static void process(keyevent_t event, action_t action)
{
//action_t action = keymap_get_action(current_layer, event.key.row, event.key.col);


debug("action: "); debug_hex16(action.code); debug("\n"); debug("action: "); debug_hex16(action.code); debug("\n");
debug("kind.id: "); debug_hex(action.kind.id); debug("\n"); debug("kind.id: "); debug_hex(action.kind.id); debug("\n");
debug("key.mods: "); debug_hex(action.key.mods); debug("\n"); debug("key.mods: "); debug_hex(action.key.mods); debug("\n");


switch (action.kind.id) { switch (action.kind.id) {
/* Key and Mods */
case ACT_LMODS: case ACT_LMODS:
// normal key or key plus mods // normal key or key plus mods
if (event.pressed) { if (event.pressed) {
register_mods(action.key.mods);
uint8_t tmp_mods = host_get_mods();
if (action.key.mods) {
host_add_mods(action.key.mods);
host_send_keyboard_report();
}
register_code(action.key.code); register_code(action.key.code);
if (action.key.mods && action.key.code) {
host_set_mods(tmp_mods);
host_send_keyboard_report();
}
} else { } else {
if (action.key.mods && !action.key.code) {
host_del_mods(action.key.mods);
host_send_keyboard_report();
}
unregister_code(action.key.code); unregister_code(action.key.code);
unregister_mods(action.key.mods);
} }
break; break;
case ACT_RMODS: case ACT_RMODS:
if (event.pressed) { if (event.pressed) {
register_mods(action.key.mods<<4);
uint8_t tmp_mods = host_get_mods();
if (action.key.mods) {
host_add_mods(action.key.mods<<4);
host_send_keyboard_report();
}
register_code(action.key.code); register_code(action.key.code);
if (action.key.mods && action.key.code) {
host_set_mods(tmp_mods);
host_send_keyboard_report();
}
} else { } else {
if (action.key.mods && !action.key.code) {
host_del_mods(action.key.mods<<4);
host_send_keyboard_report();
}
unregister_code(action.key.code); unregister_code(action.key.code);
unregister_mods(action.key.mods<<4);
} }
break; break;
case ACT_LMOD_TAP: case ACT_LMOD_TAP:
break; break;
case ACT_RMOD_TAP: case ACT_RMOD_TAP:
break; break;

/* other HID usage */
case ACT_USAGE: case ACT_USAGE:
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
switch (action.usage.page) { switch (action.usage.page) {
} }
#endif #endif
break; break;

/* Mouse key */
case ACT_MOUSEKEY: case ACT_MOUSEKEY:
#ifdef MOUSEKEY_ENABLE #ifdef MOUSEKEY_ENABLE
if (event.pressed) { if (event.pressed) {
} }
#endif #endif
break; break;

/* Layer key */
case ACT_LAYER_PRESSED: case ACT_LAYER_PRESSED:
// layer action when pressed // layer action when pressed
switch (action.layer.code) { switch (action.layer.code) {
delaying_layer = (keyrecord_t){ delaying_layer = (keyrecord_t){
.event = event, .event = event,
.action = action, .action = action,
.mods = keyboard_report->mods
.mods = host_get_mods()
}; };
} }
} else if (tap_count > 0) { } else if (tap_count > 0) {
register_code(action.layer.code); register_code(action.layer.code);
} }
} else { } else {
// type key after tap
if (tap_count == 1) {
delaying_layer = (keyrecord_t){};
register_code(action.layer.code);
// tap key
if (KEYEQ(event.key, delaying_layer.event.key) &&
timer_elapsed(delaying_layer.event.time) < TAP_TIME) {
uint8_t tmp_mods = host_get_mods();
host_set_mods(delaying_layer.mods);
register_code(delaying_layer.action.layer.code);
host_set_mods(tmp_mods);
unregister_code(delaying_layer.action.layer.code);
} else {
unregister_code(action.layer.code);
} }
unregister_code(action.layer.code);
delaying_layer = (keyrecord_t){};
} }
break; break;
} }
break; break;
} }
break; break;

/* Extentions */
case ACT_MACRO: case ACT_MACRO:
case ACT_COMMAND: case ACT_COMMAND:
case ACT_FUNCTION: case ACT_FUNCTION:
default: default:
break; break;
} }
}

void action_exec(keyevent_t event)
{
/* count tap when key is up */
if (KEYEQ(event.key, last_event.key) && timer_elapsed(last_event_time) < TAP_TIME) {
if (!event.pressed) tap_count++;
} else {
tap_count = 0;
}

/* When delaying layer switch */
if (delaying_layer.action.code) {
/* Layer switch when delay time elapses or waiting key is released */
if ((timer_elapsed(delaying_layer.event.time) > LAYER_DELAY) ||
(!event.pressed && KEYEQ(event.key, waiting_key.event.key))) {
/* layer switch */
switch (delaying_layer.action.kind.id) {
case ACT_LAYER_PRESSED:
layer_switch(delaying_layer.action.layer.opt);
break;
case ACT_LAYER_BIT:
layer_switch(current_layer | delaying_layer.action.layer.opt);
break;
}
delaying_layer = (keyrecord_t){};

/* Process waiting keys in new layer */
if (waiting_key.event.time) {
uint8_t tmp_mods = host_get_mods();
host_set_mods(waiting_key.mods);
process(waiting_key.event, keymap_get_action(current_layer,
waiting_key.event.key.row,
waiting_key.event.key.col));
host_set_mods(tmp_mods);
waiting_key = (keyrecord_t){};
}
}
/* when delaying layer key is released within delay term */
else if (!event.pressed && KEYEQ(event.key, delaying_layer.event.key)) {
/* tap key down */
uint8_t tmp_mods = host_get_mods();
host_set_mods(delaying_layer.mods);
register_code(delaying_layer.action.layer.code);
delaying_layer = (keyrecord_t){};

/* process waiting keys */
if (waiting_key.event.time) {
host_set_mods(waiting_key.mods);
process(waiting_key.event, waiting_key.action);
waiting_key = (keyrecord_t){};
}
host_set_mods(tmp_mods);
}
}

action_t action = keymap_get_action(current_layer, event.key.row, event.key.col);

/* postpone key-down events while delaying layer */
if (delaying_layer.action.code) {
if (event.pressed) {
// TODO: waiting_keys[]
waiting_key = (keyrecord_t){
.event = event,
.action = action,
.mods = host_get_mods()
};
} else {
process(event, action);
}
} else {
process(event, action);
}


/* last event */ /* last event */
last_event = event; last_event = event;


current_layer = new_layer; current_layer = new_layer;
clear_keyboard_but_mods(); // To avoid stuck keys clear_keyboard_but_mods(); // To avoid stuck keys
// TODO: update mods with full scan of matrix? if modifier changes between layers
} }
} }

+ 5
- 0
common/host.c View File

} }
} }


uint8_t host_get_mods(void)
{
return keyboard_report->mods;
}

void host_add_mods(uint8_t mods) void host_add_mods(uint8_t mods)
{ {
keyboard_report->mods |= mods; keyboard_report->mods |= mods;

+ 3
- 0
common/host.h View File

void host_add_key(uint8_t key); void host_add_key(uint8_t key);
void host_del_key(uint8_t key); void host_del_key(uint8_t key);
void host_clear_keys(void); void host_clear_keys(void);

uint8_t host_get_mods(void);
void host_add_mods(uint8_t mods); void host_add_mods(uint8_t mods);
void host_del_mods(uint8_t mods); void host_del_mods(uint8_t mods);
void host_set_mods(uint8_t mods); void host_set_mods(uint8_t mods);
void host_clear_mods(void); void host_clear_mods(void);

uint8_t host_has_anykey(void); uint8_t host_has_anykey(void);
uint8_t host_has_anymod(void); uint8_t host_has_anymod(void);
uint8_t host_get_first_key(void); uint8_t host_get_first_key(void);

+ 1
- 1
common/keyboard.c View File

action_exec((keyevent_t){ action_exec((keyevent_t){
.key = (keypos_t){ .row = r, .col = c }, .key = (keypos_t){ .row = r, .col = c },
.pressed = (matrix_row & (1<<c)), .pressed = (matrix_row & (1<<c)),
.time = timer_read()
.time = (timer_read() | 1) /* NOTE: 0 means no event */
}); });
// record a processed key // record a processed key
matrix_prev[r] ^= (1<<c); matrix_prev[r] ^= (1<<c);