di0ib
/
tmk_keyboard_custom
Прати 1
Волим 0
Креирај огранак 0
Код Издања 0 Activity
Преглед изворни кода

Add prototype of Action Function.

core
tmk пре 11 година
родитељ
a2bacd10ef
комит
bab803d80c
4 измењених фајлова са 167 додато и 68 уклоњено
Један поглед Покажи статистику Diff
  1. 127
    63
      common/action.c
  2. 36
    2
      common/action.h
  3. 2
    1
      common/keyboard.c
  4. 2
    2
      common/keyboard.h

+ 127
- 63
common/action.c Прегледај датотеку





static void process(keyevent_t event); static void process(keyevent_t event);
static void register_code(uint8_t code);
static void unregister_code(uint8_t code);
static void add_mods(uint8_t mods);
static void del_mods(uint8_t mods);
static void set_mods(uint8_t mods);
static void clear_keyboard(void);
static void clear_keyboard_but_mods(void);
static bool sending_anykey(void);
static void layer_switch(uint8_t new_layer);


/* tap */
#define TAP_TIME 300
/* This counts up when tap occurs */
static uint8_t tap_count = 0;
static bool is_tap_key(keyevent_t event)

void test_func(keyevent_t event, uint8_t opt)
{ {
action_t action = keymap_get_action(current_layer, event.key.pos.row, event.key.pos.col);
switch (action.kind.id) {
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
return true;
case ACT_LAYER_PRESSED:
case ACT_LAYER_BIT:
switch (action.layer.code) {
case 0x00:
case 0xF1 ... 0xFF:
return false;
case 0xF0:
default:
return true;
}
return false;
if (event.pressed) {
debug("test_func:pressed: "); debug_hex(opt); debug("\n");
} else {
debug("test_func:released: "); debug_hex(opt); debug("\n");
} }
return false;
} }


/* layer */ /* layer */
uint8_t default_layer = 0; uint8_t default_layer = 0;
uint8_t current_layer = 0; uint8_t current_layer = 0;
static keyevent_t tapping_event = {};

/* tap term(ms) */
#define TAP_TIME 200

/* This counts up when tap occurs */
uint8_t tap_count = 0;
keyevent_t tapping_event = {};


/* TAPPING: This indicates that whether tap or not is not decided yet. */ /* TAPPING: This indicates that whether tap or not is not decided yet. */
// NOTE: keyevent_t.time 0 means no event. // NOTE: keyevent_t.time 0 means no event.
#define WAITING_KEYS_BUFFER 8 #define WAITING_KEYS_BUFFER 8
static keyevent_t waiting_events[WAITING_KEYS_BUFFER] = {}; static keyevent_t waiting_events[WAITING_KEYS_BUFFER] = {};
static uint8_t waiting_events_head = 0; static uint8_t waiting_events_head = 0;
static uint8_t waiting_events_tail = 0;

static bool waiting_events_enqueue(keyevent_t event) static bool waiting_events_enqueue(keyevent_t event)
{ {
if (IS_NOEVENT(event)) { return true; } if (IS_NOEVENT(event)) { return true; }


if (waiting_events_head < WAITING_KEYS_BUFFER) {
debug("waiting_events["); debug_dec(waiting_events_head); debug("] = ");
debug_hex16(event.key.raw); debug("\n");
waiting_events[waiting_events_head++] = event;
return true;
if ((waiting_events_head + 1) % WAITING_KEYS_BUFFER == waiting_events_tail) {
debug("waiting_events_enqueue: Over flow.\n");
return false;
} }
debug("waiting_events_enqueue: Over flow.\n");
return false;

debug("waiting_events["); debug_dec(waiting_events_head); debug("] = ");
debug_hex16(event.key.raw); debug("\n");

waiting_events[waiting_events_head] = event;
waiting_events_head = (waiting_events_head + 1)% WAITING_KEYS_BUFFER;
return true;
}
static keyevent_t waiting_events_dequeue(void)
{
if (waiting_events_head == waiting_events_tail) {
return (keyevent_t){};
}
uint8_t tail = waiting_events_tail;
waiting_events_tail = waiting_events_tail + 1 % WAITING_KEYS_BUFFER;
return waiting_events[tail];
} }
static void waiting_events_clear(void) static void waiting_events_clear(void)
{ {
waiting_events_head = 0; waiting_events_head = 0;
waiting_events_tail = 0;
} }
static bool waiting_events_has(key_t key) static bool waiting_events_has(key_t key)
{ {
for (uint8_t i = 0; i < waiting_events_head; i++) {
for (uint8_t i = waiting_events_tail; i != waiting_events_head; i = (i + 1) % WAITING_KEYS_BUFFER) {
if KEYEQ(key, waiting_events[i].key) return true; if KEYEQ(key, waiting_events[i].key) return true;
} }
return false; return false;
static void waiting_events_process_in_current_layer(void) static void waiting_events_process_in_current_layer(void)
{ {
// TODO: in case of including tap key in waiting keys // TODO: in case of including tap key in waiting keys
for (uint8_t i = 0; i < waiting_events_head; i++) {
for (uint8_t i = waiting_events_tail; i != waiting_events_head; i = (i + 1) % WAITING_KEYS_BUFFER) {
debug("waiting_events_process_in_current_layer["); debug_dec(i); debug("]\n"); debug("waiting_events_process_in_current_layer["); debug_dec(i); debug("]\n");
process(waiting_events[i]); process(waiting_events[i]);
} }
} }
static bool waiting_events_has_anykey_pressed(void) static bool waiting_events_has_anykey_pressed(void)
{ {
for (uint8_t i = 0; i < waiting_events_head; i++) {
for (uint8_t i = waiting_events_tail; i != waiting_events_head; i = (i + 1) % WAITING_KEYS_BUFFER) {
if (waiting_events[i].pressed) return true; if (waiting_events[i].pressed) return true;
} }
return false; return false;
tap_count = 0; tap_count = 0;
tapping_event = (keyevent_t){}; tapping_event = (keyevent_t){};
} else { } else {
//debug("Tapping: pressing tap key.\n");
if (!IS_NOEVENT(event)) debug("Tapping: other key while tapping.\n");
if (tap_count == 0) { if (tap_count == 0) {
// store event // store event
waiting_events_enqueue(event); waiting_events_enqueue(event);
process(event); process(event);
} }
} else { } else {
//debug("Tapping after releasing tap.\n");
// Sequential tap
// Waiting for sequential tap
if (tap_count && event.pressed && KEYEQ(tapping_event.key, event.key)) { if (tap_count && event.pressed && KEYEQ(tapping_event.key, event.key)) {
tap_count++; tap_count++;
tapping_event = event; tapping_event = event;
debug("Tapping: Sequential tap("); debug_hex(tap_count); debug(")\n"); debug("Tapping: Sequential tap("); debug_hex(tap_count); debug(")\n");
process(event);
} else if (event.pressed && is_tap_key(event)) {
// Sequential tap can be interfered with other tap key.
debug("Tapping: Start with interfering other tap.\n");
tapping_event = event;
tap_count = 0;
waiting_events_clear();
} else {
if (!IS_NOEVENT(event)) debug("Tapping: other key just after tap.\n");
process(event);
} }
process(event);
} }
} }
// Not in tapping term // Not in tapping term
if (tapping_event.pressed) { if (tapping_event.pressed) {
if (tap_count == 0) { if (tap_count == 0) {
// Not tap, holding down normal key. // Not tap, holding down normal key.
debug("Not tap.\n");
debug("Tapping: End. Not tap(time out).\n");
process(tapping_event); process(tapping_event);
waiting_events_process_in_current_layer(); waiting_events_process_in_current_layer();


tapping_event = (keyevent_t){}; tapping_event = (keyevent_t){};
process(event); process(event);
} else { } else {
// Holding down last tap key.
//debug("Time out with holding last tap.\n");
process(event);
// Holding down last tap key. waiting for releasing last tap key.
if (!event.pressed && KEYEQ(tapping_event.key, event.key)) { if (!event.pressed && KEYEQ(tapping_event.key, event.key)) {
debug("Tapping: End(Release holding last tap).\n");
debug("Tapping: End. Release holding last tap(time out).\n");
process(event);
// clear after release last tap key // clear after release last tap key
tap_count = 0; tap_count = 0;
tapping_event = (keyevent_t){}; tapping_event = (keyevent_t){};
waiting_events_clear(); waiting_events_clear();
} else if (event.pressed && is_tap_key(event)) {
debug("Tapping: Start with forcing to release last tap(time out).\n");
process((keyevent_t){
.key = tapping_event.key,
.time = event.time,
.pressed = false });

tap_count = 0;
tapping_event = event;
waiting_events_clear();
} else {
if (!IS_NOEVENT(event)) debug("Tapping: other key while waiting for release of last tap(time out).\n");
process(event);
} }
} }
} else { } else {
} }
} }



static void process(keyevent_t event) static void process(keyevent_t event)
{ {
if (IS_NOEVENT(event)) { return; } if (IS_NOEVENT(event)) { return; }
default: default:
// with tap key // with tap key
if (event.pressed) { if (event.pressed) {
if (IS_TAPPING(event.key)) {
if (tap_count > 0) {
debug("LAYER_PRESSED: Tap: register_code\n");
register_code(action.layer.code);
} else {
debug("LAYER_PRESSED: No tap: layer_switch\n");
layer_switch(action.layer.opt);
}
} else {
// TODO: while other key tapping
debug("LAYER_PRESSED: No tap: layer_switch\n");
layer_switch(action.layer.opt);
}
/*
if (IS_TAPPING(event.key) && tap_count > 0) { if (IS_TAPPING(event.key) && tap_count > 0) {
debug("LAYER_PRESSED: Tap: register_code\n"); debug("LAYER_PRESSED: Tap: register_code\n");
register_code(action.layer.code); register_code(action.layer.code);
debug("LAYER_PRESSED: No tap: layer_switch\n"); debug("LAYER_PRESSED: No tap: layer_switch\n");
layer_switch(action.layer.opt); layer_switch(action.layer.opt);
} }
*/
} else { } else {
if (IS_TAPPING(event.key) && tap_count > 0) { if (IS_TAPPING(event.key) && tap_count > 0) {
debug("LAYER_PRESSED: Tap: unregister_code\n"); debug("LAYER_PRESSED: Tap: unregister_code\n");


/* Extentions */ /* Extentions */
case ACT_MACRO: case ACT_MACRO:
break;
case ACT_COMMAND: case ACT_COMMAND:
break;
case ACT_FUNCTION: case ACT_FUNCTION:
action_call_function(event, action.func.id);
//test_func(event, action.func.opt);
break;
default: default:
break; break;
} }
} }


static void register_code(uint8_t code)

/*
* Utilities for actions.
*/
void register_code(uint8_t code)
{ {
if (code == KC_NO) { if (code == KC_NO) {
return; return;
} }
} }


static void unregister_code(uint8_t code)
void unregister_code(uint8_t code)
{ {
if IS_KEY(code) { if IS_KEY(code) {
host_del_key(code); host_del_key(code);
} }
} }


static void add_mods(uint8_t mods)
void add_mods(uint8_t mods)
{ {
if (mods) { if (mods) {
host_add_mods(mods); host_add_mods(mods);
} }
} }


static void del_mods(uint8_t mods)
void del_mods(uint8_t mods)
{ {
if (mods) { if (mods) {
host_del_mods(mods); host_del_mods(mods);
} }
} }


static void set_mods(uint8_t mods)
void set_mods(uint8_t mods)
{ {
host_set_mods(mods); host_set_mods(mods);
host_send_keyboard_report(); host_send_keyboard_report();
} }


static void clear_keyboard(void)
void clear_keyboard(void)
{ {
host_clear_mods(); host_clear_mods();
clear_keyboard_but_mods(); clear_keyboard_but_mods();
} }


static void clear_keyboard_but_mods(void)
void clear_keyboard_but_mods(void)
{ {
host_clear_keys(); host_clear_keys();
host_send_keyboard_report(); host_send_keyboard_report();
#endif #endif
} }


static bool sending_anykey(void)
bool sending_anykey(void)
{ {
return (host_has_anykey() || host_mouse_in_use() || return (host_has_anykey() || host_mouse_in_use() ||
host_last_sysytem_report() || host_last_consumer_report()); host_last_sysytem_report() || host_last_consumer_report());
} }


static void layer_switch(uint8_t new_layer)
void layer_switch(uint8_t new_layer)
{ {
if (current_layer != new_layer) { if (current_layer != new_layer) {
debug("Layer Switch: "); debug_hex(current_layer); debug("Layer Switch: "); debug_hex(current_layer);
// TODO: update mods with full scan of matrix? if modifier changes between layers // TODO: update mods with full scan of matrix? if modifier changes between layers
} }
} }

bool is_tap_key(keyevent_t event)
{
action_t action = keymap_get_action(current_layer, event.key.pos.row, event.key.pos.col);
switch (action.kind.id) {
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
return true;
case ACT_LAYER_PRESSED:
case ACT_LAYER_BIT:
switch (action.layer.code) {
case 0x00:
case 0xF1 ... 0xFF:
return false;
case 0xF0:
default:
return true;
}
return false;
case ACT_FUNCTION:
if (action.func.opt & 0x1) {
return true;
}
return false;
}
return false;
}

+ 36
- 2
common/action.h Прегледај датотеку



#include "keyboard.h" #include "keyboard.h"


extern uint8_t tap_count;
extern keyevent_t tapping_event;


/* Key Action(16bit code)

/*
* Utilities for actions.
*/
void register_code(uint8_t code);
void unregister_code(uint8_t code);
void add_mods(uint8_t mods);
void del_mods(uint8_t mods);
void set_mods(uint8_t mods);
void clear_keyboard(void);
void clear_keyboard_but_mods(void);
bool sending_anykey(void);
void layer_switch(uint8_t new_layer);
bool is_tap_key(keyevent_t event);




/*
Action codes
16bit code: action_kind(4bit) + action_parameter(12bit)


Keyboard Keys Keyboard Keys
------------- -------------


ACT_FUNCTION(1111): ACT_FUNCTION(1111):
1111| address(12) Function 1111| address(12) Function
1111|opt | id(8) Function
Macro record(dynamicly) Macro record(dynamicly)
Macro play(dynamicly) Macro play(dynamicly)
TODO: modifier + [tap key /w mod] TODO: modifier + [tap key /w mod]
uint16_t option :4; uint16_t option :4;
uint16_t kind :4; uint16_t kind :4;
} command; } command;
struct action_function {
uint8_t id :8;
uint8_t opt :4;
uint8_t kind :4;
} func;
} action_t; } action_t;




STROKE_ALLUP, /* release all keys in reverse order */ STROKE_ALLUP, /* release all keys in reverse order */
}; };


// TODO: not needed?
typedef struct { typedef struct {
keyevent_t event; keyevent_t event;
action_t action; action_t action;
uint8_t mods; uint8_t mods;
} keyrecord_t; } keyrecord_t;


/* action function */
typedef void (*action_func_t)(keyevent_t event, uint8_t opt);



// TODO: legacy keymap support
void action_exec(keyevent_t event); void action_exec(keyevent_t event);
void action_call_function(keyevent_t event, uint8_t id);




// TODO: proper names // TODO: proper names
/* Command */ /* Command */
#define ACTION_COMMAND(opt, id) ACTION(ACT_COMMAND, (opt)<<8 | (addr)) #define ACTION_COMMAND(opt, id) ACTION(ACT_COMMAND, (opt)<<8 | (addr))
/* Function */ /* Function */
#define ACTION_FUNCTION(addr) ACTION(ACT_FUNCTION, addr)
#define ACTION_FUNCTION(id, opt) ACTION(ACT_FUNCTION, (opt)<<8 | id)




/* helpers for readability */ /* helpers for readability */

+ 2
- 1
common/keyboard.c Прегледај датотеку

} }
} }
} }
// call to update delaying layer when no real event
// call with not real event to update state of aciton
// TODO: use NOEVENT macro
action_exec((keyevent_t) { action_exec((keyevent_t) {
.key.pos = (keypos_t){ .row = 255, .col = 255 }, // assume this key doesn't exist .key.pos = (keypos_t){ .row = 255, .col = 255 }, // assume this key doesn't exist
.pressed = false, .pressed = false,

+ 2
- 2
common/keyboard.h Прегледај датотеку



#define KEYEQ(keya, keyb) (keya.raw == keyb.raw) #define KEYEQ(keya, keyb) (keya.raw == keyb.raw)
#define IS_NOEVENT(event) (event.time == 0) #define IS_NOEVENT(event) (event.time == 0)
#define NOEVENT (keyevent_t) { \
#define NOEVENT (keyevent_t){ \
.key = (keypos_t){ .row = 255, .col = 255 }, \ .key = (keypos_t){ .row = 255, .col = 255 }, \
.pressed = false, \ .pressed = false, \
.time = 0, \
.time = 0 \
} }