di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Clean debug print in action.c.

Browse Source
This commit is contained in:
tmk 2013-01-29 10:40:43 +09:00
parent 1e3e41a2c9
commit ddb560052a
4 changed files with 84 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
common/action.c
View File

@ -29,6 +29,41 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static bool process_tapping(keyrecord_t *record); static bool process_tapping(keyrecord_t *record);
static void process_action(keyrecord_t *record); static void process_action(keyrecord_t *record);
static void debug_event(keyevent_t event)
{
debug_hex16(event.key.raw);
if (event.pressed) debug("d("); else debug("u(");
debug_dec(event.time); debug(")");
}
static void debug_record(keyrecord_t record)
{
debug_event(record.event); debug(":"); debug_dec(record.tap_count);
}
static void debug_action(action_t action)
{
switch (action.kind.id) {
case ACT_LMODS: debug("ACT_LMODS"); break;
case ACT_RMODS: debug("ACT_RMODS"); break;
case ACT_LMODS_TAP: debug("ACT_LMODS_TAP"); break;
case ACT_RMODS_TAP: debug("ACT_RMODS_TAP"); break;
case ACT_USAGE: debug("ACT_USAGE"); break;
case ACT_MOUSEKEY: debug("ACT_MOUSEKEY"); break;
case ACT_LAYER_PRESSED: debug("ACT_LAYER_PRESSED"); break;
case ACT_LAYER_RELEASED: debug("ACT_LAYER_RELEASED"); break;
case ACT_LAYER_BIT: debug("ACT_LAYER_BIT"); break;
case ACT_LAYER_EXT: debug("ACT_LAYER_EXT"); break;
case ACT_MACRO: debug("ACT_MACRO"); break;
case ACT_COMMAND: debug("ACT_COMMAND"); break;
case ACT_FUNCTION: debug("ACT_FUNCTION"); break;
default: debug("UNKNOWN"); break;
}
debug("[");
debug_hex4(action.kind.param>>8);
debug(":");
debug_hex8(action.kind.param & 0xff);
debug("]");
}
/* /*
* Tapping * Tapping
@ -67,6 +102,14 @@ static uint8_t waiting_buffer_head = 0;
/* point to the oldest data cell to deq */ /* point to the oldest data cell to deq */
static uint8_t waiting_buffer_tail = 0; static uint8_t waiting_buffer_tail = 0;
static void debug_waiting_buffer(void)
{
debug("{ ");
for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
debug("["); debug_dec(i); debug("]="); debug_record(waiting_buffer[i]); debug(" ");
}
debug("}\n");
}
static bool waiting_buffer_enq(keyrecord_t record) static bool waiting_buffer_enq(keyrecord_t record)
{ {
if (IS_NOEVENT(record.event)) { if (IS_NOEVENT(record.event)) {
@ -78,11 +121,10 @@ static bool waiting_buffer_enq(keyrecord_t record)
return false; return false;
} }
debug("waiting_buffer_enq["); debug_dec(waiting_buffer_head); debug("] = ");
debug_hex16(record.event.key.raw); debug("\n");
waiting_buffer[waiting_buffer_head] = record; waiting_buffer[waiting_buffer_head] = record;
waiting_buffer_head = (waiting_buffer_head + 1) % WAITING_BUFFER_SIZE; waiting_buffer_head = (waiting_buffer_head + 1) % WAITING_BUFFER_SIZE;
debug("waiting_buffer_enq: "); debug_waiting_buffer();
return true; return true;
} }
/* /*
@ -162,21 +204,18 @@ static void oneshot_toggle(void)
void action_exec(keyevent_t event) void action_exec(keyevent_t event)
{ {
if (!IS_NOEVENT(event)) { if (!IS_NOEVENT(event)) {
debug("event: "); debug("\n---- action_exec: start -----\n");
debug_hex16(event.time); debug(": "); debug("EVENT: "); debug_event(event); debug("\n");
debug_hex16(event.key.raw);
debug("[");
if (event.pressed) debug("down"); else debug("up");
debug("]\n");
} }
keyrecord_t record = { .event = event }; keyrecord_t record = { .event = event };
// pre-process on tapping // pre-process on tapping
if (process_tapping(&record)) { if (process_tapping(&record)) {
if (!IS_NOEVENT(record.event)) debug("processed.\n"); if (!IS_NOEVENT(record.event)) {
debug("processed: "); debug_record(record); debug("\n");
}
} else { } else {
if (!IS_NOEVENT(record.event)) debug("enqueued.\n");
// enqueue // enqueue
if (!waiting_buffer_enq(record)) { if (!waiting_buffer_enq(record)) {
// clear all in case of overflow. // clear all in case of overflow.
@ -187,14 +226,20 @@ void action_exec(keyevent_t event)
} }
// process waiting_buffer // process waiting_buffer
if (!IS_NOEVENT(event) && waiting_buffer_head != waiting_buffer_tail) {
debug("---- action_exec: process waiting_buffer -----\n");
}
for (; waiting_buffer_tail != waiting_buffer_head; waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE) { for (; waiting_buffer_tail != waiting_buffer_head; waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE) {
if (process_tapping(&waiting_buffer[waiting_buffer_tail])) { if (process_tapping(&waiting_buffer[waiting_buffer_tail])) {
debug("processed: waiting_buffer["); debug_dec(waiting_buffer_tail); debug("] = "); debug("processed: waiting_buffer["); debug_dec(waiting_buffer_tail); debug("] = ");
debug_hex16(waiting_buffer[waiting_buffer_tail].event.key.raw); debug("\n"); debug_record(waiting_buffer[waiting_buffer_tail]); debug("\n\n");
} else { } else {
break; break;
} }
} }
if (!IS_NOEVENT(event)) {
debug("\n");
}
} }
static void process_action(keyrecord_t *record) static void process_action(keyrecord_t *record)
@ -205,8 +250,8 @@ static void process_action(keyrecord_t *record)
if (IS_NOEVENT(event)) { return; } if (IS_NOEVENT(event)) { return; }
action_t action = keymap_get_action(current_layer, event.key.pos.row, event.key.pos.col); action_t action = keymap_get_action(current_layer, event.key.pos.row, event.key.pos.col);
debug("action: "); debug_hex16(action.code); //debug("action: "); debug_hex16(action.code); if (event.pressed) debug("d\n"); else debug("u\n");
if (event.pressed) debug("[down]\n"); else debug("[up]\n"); debug("ACTION: "); debug_action(action); debug("\n");
switch (action.kind.id) { switch (action.kind.id) {
/* Key and Mods */ /* Key and Mods */
@ -635,8 +680,8 @@ static bool process_tapping(keyrecord_t *keyp)
if (tapping_key.tap_count == 0) { if (tapping_key.tap_count == 0) {
if (IS_TAPPING_KEY(event.key) && !event.pressed) { if (IS_TAPPING_KEY(event.key) && !event.pressed) {
// first tap! // first tap!
debug("Tapping: First tap.\n");
tapping_key.tap_count = 1; tapping_key.tap_count = 1;
debug("Tapping: First tap: tapping_key="); debug_record(tapping_key); debug("\n");
process_action(&tapping_key); process_action(&tapping_key);
// enqueue // enqueue
@ -644,7 +689,7 @@ static bool process_tapping(keyrecord_t *keyp)
return false; return false;
} else if (!event.pressed && waiting_buffer_typed(event)) { } else if (!event.pressed && waiting_buffer_typed(event)) {
// other key typed. not tap. // other key typed. not tap.
debug("Tapping: End(No tap. Interfered by typing key).\n"); debug("Tapping: End. No tap. Interfered by typing key: tapping_key={}\n");
process_action(&tapping_key); process_action(&tapping_key);
tapping_key = (keyrecord_t){}; tapping_key = (keyrecord_t){};
@ -654,15 +699,19 @@ static bool process_tapping(keyrecord_t *keyp)
// other key events shall be stored till tapping state settles. // other key events shall be stored till tapping state settles.
return false; return false;
} }
} else { }
// tap_count > 0
else {
if (IS_TAPPING_KEY(event.key) && !event.pressed) { if (IS_TAPPING_KEY(event.key) && !event.pressed) {
keyp->tap_count = tapping_key.tap_count; keyp->tap_count = tapping_key.tap_count;
debug("Tapping: tap release("); debug_dec(keyp->tap_count); debug(")\n"); debug("Tapping: Tap release: tapping_key="); debug_record(*keyp); debug("\n");
tapping_key = *keyp; tapping_key = *keyp;
return false; return false;
} }
else if (is_tap_key(keyp->event.key) && event.pressed) { else if (is_tap_key(keyp->event.key) && event.pressed) {
debug("Tapping: Start with forcing to release last tap.\n"); debug("Tapping: Start with forcing to release last tap: tapping_key=");
debug_record(*keyp); debug("\n");
// TODO: need only when tap > 1?
process_action(&(keyrecord_t){ process_action(&(keyrecord_t){
.tap_count = tapping_key.tap_count, .tap_count = tapping_key.tap_count,
.event.key = tapping_key.event.key, .event.key = tapping_key.event.key,
@ -673,7 +722,10 @@ static bool process_tapping(keyrecord_t *keyp)
return false; return false;
} }
else { else {
if (!IS_NOEVENT(keyp->event)) debug("Tapping: key event while tap.\n"); if (!IS_NOEVENT(keyp->event)) {
debug("Tapping: key event while tap: tapping_key=");
debug_record(tapping_key); debug("\n");
}
process_action(keyp); process_action(keyp);
return true; return true;
} }
@ -683,7 +735,7 @@ static bool process_tapping(keyrecord_t *keyp)
else { else {
if (tapping_key.tap_count == 0) { if (tapping_key.tap_count == 0) {
// timeout. not tap. // timeout. not tap.
debug("Tapping: End. Not tap(time out).\n"); debug("Tapping: End. Not tap(time out): tapping_key={}: "); debug_record(*keyp); debug("\n");
process_action(&tapping_key); process_action(&tapping_key);
tapping_key = (keyrecord_t){}; tapping_key = (keyrecord_t){};
return false; return false;
@ -731,6 +783,7 @@ static bool process_tapping(keyrecord_t *keyp)
if (event.pressed && is_tap_key(event.key)) { if (event.pressed && is_tap_key(event.key)) {
debug("Tapping: Start(Press tap key).\n"); debug("Tapping: Start(Press tap key).\n");
tapping_key = *keyp; tapping_key = *keyp;
debug("tapping_key="); debug_record(*keyp); debug("\n");
return true; return true;
} else { } else {
process_action(keyp); process_action(keyp);

1
common/debug.h
View File

@ -36,6 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define debug_dec(data) do { if (debug_enable) print_dec(data); } while (0) #define debug_dec(data) do { if (debug_enable) print_dec(data); } while (0)
#define debug_decs(data) do { if (debug_enable) print_decs(data); } while (0) #define debug_decs(data) do { if (debug_enable) print_decs(data); } while (0)
#define debug_hex4(data) do { if (debug_enable) print_hex4(data); } while (0)
#define debug_hex8(data) do { if (debug_enable) print_hex8(data); } while (0) #define debug_hex8(data) do { if (debug_enable) print_hex8(data); } while (0)
#define debug_hex16(data) do { if (debug_enable) print_hex16(data); } while (0) #define debug_hex16(data) do { if (debug_enable) print_hex16(data); } while (0)
#define debug_hex32(data) do { if (debug_enable) print_hex32(data); } while (0) #define debug_hex32(data) do { if (debug_enable) print_hex32(data); } while (0)

9
common/print.c
View File

@ -113,7 +113,6 @@ void print_decs(int16_t data)
} }
static inline
void print_hex4(uint8_t data) void print_hex4(uint8_t data)
{ {
sendchar(data + ((data < 10) ? '0' : 'A' - 10)); sendchar(data + ((data < 10) ? '0' : 'A' - 10));
@ -137,8 +136,14 @@ void print_hex32(uint32_t data)
print_hex16(data); print_hex16(data);
} }
void print_bin4(uint8_t data)
{
for (int i = 4; i >= 0; i--) {
sendchar((data & (1<<i)) ? '1' : '0');
}
}
void print_bin(uint8_t data) void print_bin8(uint8_t data)
{ {
for (int i = 7; i >= 0; i--) { for (int i = 7; i >= 0; i--) {
sendchar((data & (1<<i)) ? '1' : '0'); sendchar((data & (1<<i)) ? '1' : '0');

2
common/print.h
View File

@ -87,11 +87,13 @@ void print_dec(uint16_t data);
void print_decs(int16_t data); void print_decs(int16_t data);
/* hex */ /* hex */
void print_hex4(uint8_t data);
void print_hex8(uint8_t data); void print_hex8(uint8_t data);
void print_hex16(uint16_t data); void print_hex16(uint16_t data);
void print_hex32(uint32_t data); void print_hex32(uint32_t data);
/* binary */ /* binary */
void print_bin4(uint8_t data);
void print_bin8(uint8_t data); void print_bin8(uint8_t data);
void print_bin16(uint16_t data); void print_bin16(uint16_t data);
void print_bin32(uint32_t data); void print_bin32(uint32_t data);