From a063e4544c09c5f2fe4026e3e0047fe149457a8e Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 Mar 2013 14:08:40 +0900 Subject: [PATCH 1/9] Add NO_PRINT and NO_DEBUG config options. - NO_PRINT: disable print.h API(also disable debug.h) - NO_DEBUG: disable debug.h API --- common.mk | 3 +++ common/command.c | 15 ++------------- common/debug.h | 31 +++++++++++++++++++++++++++---- common/keyboard.c | 2 +- common/print.c | 13 ++++++++++--- common/print.h | 40 +++++++++++++++++++++++++++++----------- 6 files changed, 72 insertions(+), 32 deletions(-) diff --git a/common.mk b/common.mk index 4054893b..2ce4e32d 100644 --- a/common.mk +++ b/common.mk @@ -31,6 +31,9 @@ endif ifdef CONSOLE_ENABLE OPT_DEFS += -DCONSOLE_ENABLE +else + OPT_DEFS += -DNO_PRINT + OPT_DEFS += -DNO_DEBUG endif ifdef NKRO_ENABLE diff --git a/common/command.c b/common/command.c index 372ca291..cb98e1d5 100644 --- a/common/command.c +++ b/common/command.c @@ -98,7 +98,6 @@ bool command_extra(uint8_t code) ***********************************************************/ static void command_common_help(void) { - print_enable = true; print("\n\n----- Command Help -----\n"); print("c: enter console mode\n"); print("d: toggle debug enable\n"); @@ -137,7 +136,8 @@ static void print_eeprom_config(void) eebyte = eeconfig_read_keyconf(); print("keyconf: "); print_hex8(eebyte); print("\n"); - keyconf kc = (keyconf){ .raw = eebyte }; + keyconf kc; + kc = (keyconf){ .raw = eebyte }; print("keyconf.swap_control_capslock: "); print_hex8(kc.swap_control_capslock); print("\n"); print("keyconf.capslock_to_control: "); print_hex8(kc.capslock_to_control); print("\n"); print("keyconf.swap_lalt_lgui: "); print_hex8(kc.swap_lalt_lgui); print("\n"); @@ -173,7 +173,6 @@ static bool command_common(uint8_t code) command_common_help(); break; case KC_C: - print_enable = true; debug_matrix = false; debug_keyboard = false; debug_mouse = false; @@ -239,15 +238,6 @@ static bool command_common(uint8_t code) case KC_T: // print timer print_val_hex32(timer_count); break; - case KC_P: // print toggle - if (print_enable) { - print("print disabled.\n"); - print_enable = false; - } else { - print_enable = true; - print("print enabled.\n"); - } - break; case KC_S: print("\n\n----- Status -----\n"); print_val_hex8(host_keyboard_leds()); @@ -320,7 +310,6 @@ static bool command_common(uint8_t code) ***********************************************************/ static void command_console_help(void) { - print_enable = true; print("\n\n----- Console Help -----\n"); print("ESC/q: quit\n"); #ifdef MOUSEKEY_ENABLE diff --git a/common/debug.h b/common/debug.h index e63d46f0..e16ea14a 100644 --- a/common/debug.h +++ b/common/debug.h @@ -22,6 +22,8 @@ along with this program. If not, see . #include "print.h" +#ifndef NO_DEBUG + #define debug(s) do { if (debug_enable) print(s); } while (0) #define debugln(s) do { if (debug_enable) println(s); } while (0) #define debug_S(s) do { if (debug_enable) print_S(s); } while (0) @@ -31,9 +33,6 @@ along with this program. If not, see . print(__FILE__); print(" at "); print_dec(__LINE__); print(" in "); print(": "); print(s); \ } \ } 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_hex4(data) do { if (debug_enable) print_hex4(data); } while (0) @@ -46,11 +45,35 @@ along with this program. If not, see . #define debug_bin_reverse8(data) do { if (debug_enable) print_bin_reverse8(data); } while (0) #define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0) #define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0) - #define debug_hex(data) debug_hex8(data) #define debug_bin(data) debug_bin8(data) #define debug_bin_reverse(data) debug_bin8(data) +#else + +#define debug(s) +#define debugln(s) +#define debug_S(s) +#define debug_P(s) +#define debug_msg(s) +#define debug_dec(data) +#define debug_decs(data) +#define debug_hex4(data) +#define debug_hex8(data) +#define debug_hex16(data) +#define debug_hex32(data) +#define debug_bin8(data) +#define debug_bin16(data) +#define debug_bin32(data) +#define debug_bin_reverse8(data) +#define debug_bin_reverse16(data) +#define debug_bin_reverse32(data) +#define debug_hex(data) +#define debug_bin(data) +#define debug_bin_reverse(data) + +#endif + #ifdef __cplusplus extern "C" { diff --git a/common/keyboard.c b/common/keyboard.c index 42c57ac9..cb0dc06e 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -54,7 +54,7 @@ static bool has_ghost_in_row(uint8_t row) void keyboard_init(void) { // TODO: configuration of sendchar impl - print_sendchar_func = sendchar; + print_set_sendchar(sendchar); timer_init(); matrix_init(); diff --git a/common/print.c b/common/print.c index 08d211f2..329f8351 100644 --- a/common/print.c +++ b/common/print.c @@ -27,12 +27,17 @@ #include "print.h" -#define sendchar(c) do { if (print_enable && print_sendchar_func) (print_sendchar_func)(c); } while (0) +#ifndef NO_PRINT + +#define sendchar(c) do { if (print_sendchar_func) (print_sendchar_func)(c); } while (0) -int8_t (*print_sendchar_func)(uint8_t) = 0; -bool print_enable = true; +static int8_t (*print_sendchar_func)(uint8_t) = 0; +void print_set_sendchar(int8_t (*sendchar_func)(uint8_t)) +{ + print_sendchar_func = sendchar_func; +} /* print string stored in data memory(SRAM) * print_P("hello world"); @@ -184,3 +189,5 @@ void print_bin_reverse32(uint32_t data) print_bin_reverse8(data>>16); print_bin_reverse8(data>>24); } + +#endif diff --git a/common/print.h b/common/print.h index b2250947..80858b3b 100644 --- a/common/print.h +++ b/common/print.h @@ -30,13 +30,12 @@ #include -// avoid collision with arduino/Print.h -#ifndef __cplusplus // this macro allows you to write print("some text") and // the string is automatically placed into flash memory :) +// TODO: avoid collision with arduino/Print.h +#ifndef __cplusplus #define print(s) print_P(PSTR(s)) #endif - #define println(s) print_P(PSTR(s "\n")) /* for old name */ @@ -49,15 +48,12 @@ #define pbin_reverse(data) print_bin_reverse8(data) #define pbin_reverse16(data) print_bin_reverse16(data) - /* print value utility */ -#define print_val_dec(v) do { print_P(PSTR(#v ": ")); print_dec(v); print_P(PSTR("\n")); } while (0) +#define print_val_dec(v) do { print_P(PSTR(#v ": ")); print_dec(v); print_P(PSTR("\n")); } while (0) #define print_val_decs(v) do { print_P(PSTR(#v ": ")); print_decs(v); print_P(PSTR("\n")); } while (0) - #define print_val_hex8(v) do { print_P(PSTR(#v ": ")); print_hex8(v); print_P(PSTR("\n")); } while (0) #define print_val_hex16(v) do { print_P(PSTR(#v ": ")); print_hex16(v); print_P(PSTR("\n")); } while (0) #define print_val_hex32(v) do { print_P(PSTR(#v ": ")); print_hex32(v); print_P(PSTR("\n")); } while (0) - #define print_val_bin8(v) do { print_P(PSTR(#v ": ")); print_bin8(v); print_P(PSTR("\n")); } while (0) #define print_val_bin16(v) do { print_P(PSTR(#v ": ")); print_bin16(v); print_P(PSTR("\n")); } while (0) #define print_val_bin32(v) do { print_P(PSTR(#v ": ")); print_bin32(v); print_P(PSTR("\n")); } while (0) @@ -67,13 +63,13 @@ +#ifndef NO_PRINT + #ifdef __cplusplus extern "C" { #endif - /* function pointer of sendchar to be used by print utility */ -extern int8_t (*print_sendchar_func)(uint8_t); -extern bool print_enable; +void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t)); /* print string stored in data memory(SRAM) */ void print_S(const char *s); @@ -100,9 +96,31 @@ void print_bin32(uint32_t data); void print_bin_reverse8(uint8_t data); void print_bin_reverse16(uint16_t data); void print_bin_reverse32(uint32_t data); - #ifdef __cplusplus } #endif +#else + +#define print_set_sendchar(func) +#define print_S(s) +#define print_P(s) +#define print_CRLF() +#define print_dec(data) +#define print_decs(data) +#define print_hex4(data) +#define print_hex8(data) +#define print_hex16(data) +#define print_hex32(data) +#define print_bin4(data) +#define print_bin8(data) +#define print_bin16(data) +#define print_bin32(data) +#define print_bin_reverse8(data) +#define print_bin_reverse16(data) +#define print_bin_reverse32(data) + +#endif + + #endif From 27cb3f4fab679a94c959220601c6903464460962 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 Mar 2013 16:05:53 +0900 Subject: [PATCH 2/9] Add COMMAND_ENABLE build option --- common.mk | 6 +++++- common/command.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 2ce4e32d..e4c9fb26 100644 --- a/common.mk +++ b/common.mk @@ -5,7 +5,6 @@ SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/layer_switch.c \ $(COMMON_DIR)/keymap.c \ - $(COMMON_DIR)/command.c \ $(COMMON_DIR)/timer.c \ $(COMMON_DIR)/print.c \ $(COMMON_DIR)/debug.c \ @@ -36,6 +35,11 @@ else OPT_DEFS += -DNO_DEBUG endif +ifdef COMMAND_ENABLE + SRC += $(COMMON_DIR)/command.c + OPT_DEFS += -DCOMMAND_ENABLE +endif + ifdef NKRO_ENABLE OPT_DEFS += -DNKRO_ENABLE endif diff --git a/common/command.h b/common/command.h index dafd4d0f..be739faf 100644 --- a/common/command.h +++ b/common/command.h @@ -18,8 +18,12 @@ along with this program. If not, see . #ifndef COMMAND_H #define COMMAND +#ifdef COMMAND_ENABLE bool command_proc(uint8_t code); /* This allows to extend commands. Return 0 when command is not processed. */ bool command_extra(uint8_t code); +#else +#define command_proc(code) false +#endif #endif From 2b449b5d6d1dba68754142ec90be38f608a945a5 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:26:01 +0900 Subject: [PATCH 3/9] Add NO_ACTION_OVERLAY config option --- common/action.c | 2 ++ common/layer_switch.c | 4 ++++ common/layer_switch.h | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/common/action.c b/common/action.c index 4fafbfa7..1b84d1e8 100644 --- a/common/action.c +++ b/common/action.c @@ -517,6 +517,7 @@ static void process_action(keyrecord_t *record) } break; +#ifndef NO_ACTION_OVERLAY case ACT_OVERLAY: switch (action.layer.code) { // Overlay Invert bit4 @@ -670,6 +671,7 @@ static void process_action(keyrecord_t *record) break; } break; +#endif /* Extentions */ case ACT_MACRO: diff --git a/common/layer_switch.c b/common/layer_switch.c index 19e286f8..815d1e5f 100644 --- a/common/layer_switch.c +++ b/common/layer_switch.c @@ -98,6 +98,7 @@ void keymap_debug(void) +#ifndef NO_ACTION_OVERLAY /* * Overlay Layer (16-31 = 0-15|0x10) */ @@ -169,12 +170,14 @@ void overlay_debug(void) { debug_hex16(overlay_stat); debug("("); debug_dec(overlay_get_layer()); debug(")"); } +#endif action_t layer_switch_get_action(key_t key) { action_t action; action.code = ACTION_TRANSPARENT; +#ifndef NO_ACTION_OVERLAY /* overlay: top layer first */ for (int8_t i = 15; i >= 0; i--) { if (overlay_stat & (1<= 0; i--) { diff --git a/common/layer_switch.h b/common/layer_switch.h index a566ab12..5de6cb01 100644 --- a/common/layer_switch.h +++ b/common/layer_switch.h @@ -57,6 +57,7 @@ void keymap_debug(void); /* * Overlay Layer */ +#ifndef NO_ACTION_OVERLAY extern uint16_t overlay_stat; /* return current active layer */ uint8_t overlay_get_layer(void); @@ -71,6 +72,20 @@ void overlay_or(uint16_t stat); void overlay_and(uint16_t stat); void overlay_xor(uint16_t stat); void overlay_debug(void); +#else +#define overlay_stat 0 +#define overlay_get_layer() +#define overlay_clear() +#define overlay_set(stat) +#define overlay_move(layer) +#define overlay_on(layer) +#define overlay_off(layer) +#define overlay_invert(layer) +#define overlay_or(stat) +#define overlay_and(stat) +#define overlay_xor(stat) +#define overlay_debug() +#endif From 25f4821ba819d3cd314d0602e829447853a0a5c1 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:28:13 +0900 Subject: [PATCH 4/9] Add NO_ACTION_TAPPING and NO_ACTION_MACRO config options --- common/action.c | 33 +++++++++++++++++++++++++++------ common/action_macro.c | 3 +++ common/action_macro.h | 4 ++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/common/action.c b/common/action.c index 1b84d1e8..eda3a6d3 100644 --- a/common/action.c +++ b/common/action.c @@ -30,14 +30,18 @@ along with this program. If not, see . static void process_action(keyrecord_t *record); +#ifndef NO_ACTION_TAPPING static bool process_tapping(keyrecord_t *record); static void waiting_buffer_scan_tap(void); +#endif static void debug_event(keyevent_t event); static void debug_record(keyrecord_t record); static void debug_action(action_t action); +#ifndef NO_ACTION_TAPPING static void debug_tapping_key(void); static void debug_waiting_buffer(void); +#endif /* @@ -53,6 +57,7 @@ static void debug_waiting_buffer(void); #define TAPPING_TOGGLE 5 #endif +#ifndef NO_ACTION_TAPPING /* stores a key event of current tap. */ static keyrecord_t tapping_key = {}; @@ -158,7 +163,7 @@ static void oneshot_toggle(void) { oneshot_state.disabled = !oneshot_state.disabled; } - +#endif void action_exec(keyevent_t event) @@ -170,6 +175,7 @@ void action_exec(keyevent_t event) keyrecord_t record = { .event = event }; +#ifndef NO_ACTION_TAPPING // pre-process on tapping if (process_tapping(&record)) { if (!IS_NOEVENT(record.event)) { @@ -202,6 +208,12 @@ void action_exec(keyevent_t event) if (!IS_NOEVENT(event)) { debug("\n"); } +#else + process_action(&record); + if (!IS_NOEVENT(record.event)) { + debug("processed: "); debug_record(record); debug("\n"); + } +#endif } static void process_action(keyrecord_t *record) @@ -244,6 +256,7 @@ static void process_action(keyrecord_t *record) } } break; +#ifndef NO_ACTION_TAPPING case ACT_LMODS_TAP: case ACT_RMODS_TAP: { @@ -319,10 +332,11 @@ static void process_action(keyrecord_t *record) } } break; +#endif +#ifdef EXTRAKEY_ENABLE /* other HID usage */ case ACT_USAGE: -#ifdef EXTRAKEY_ENABLE switch (action.usage.page) { case PAGE_SYSTEM: if (event.pressed) { @@ -339,12 +353,12 @@ static void process_action(keyrecord_t *record) } break; } -#endif break; +#endif +#ifdef MOUSEKEY_ENABLE /* Mouse key */ case ACT_MOUSEKEY: -#ifdef MOUSEKEY_ENABLE if (event.pressed) { mousekey_on(action.key.code); mousekey_send(); @@ -352,8 +366,8 @@ static void process_action(keyrecord_t *record) mousekey_off(action.key.code); mousekey_send(); } -#endif break; +#endif case ACT_KEYMAP: switch (action.layer.code) { @@ -687,6 +701,7 @@ static void process_action(keyrecord_t *record) } } +#ifndef NO_ACTION_TAPPING /* Tapping * * Rule: Tap key is typed(pressed and released) within TAPPING_TERM. @@ -881,6 +896,7 @@ static void waiting_buffer_scan_tap(void) } } } +#endif @@ -908,6 +924,7 @@ void register_code(uint8_t code) // TODO: should push command_proc out of this block? if (command_proc(code)) return; +#ifndef NO_ACTION_TAPPING if (oneshot_state.mods && oneshot_state.ready && !oneshot_state.disabled) { uint8_t tmp_mods = host_get_mods(); host_add_mods(oneshot_state.mods); @@ -916,7 +933,9 @@ void register_code(uint8_t code) host_set_mods(tmp_mods); oneshot_state.ready = false; - } else { + } else +#endif + { host_add_key(code); host_send_keyboard_report(); } @@ -1064,6 +1083,7 @@ static void debug_action(action_t action) debug_hex8(action.kind.param & 0xff); debug("]"); } +#ifndef NO_ACTION_TAPPING static void debug_tapping_key(void) { debug("TAPPING_KEY="); debug_record(tapping_key); debug("\n"); @@ -1076,3 +1096,4 @@ static void debug_waiting_buffer(void) } debug("}\n"); } +#endif diff --git a/common/action_macro.c b/common/action_macro.c index ca7ffa82..6d81a1ef 100644 --- a/common/action_macro.c +++ b/common/action_macro.c @@ -20,6 +20,8 @@ along with this program. If not, see . #include "action_macro.h" +#ifndef NO_ACTION_MACRO + #define MACRO_READ() (macro = pgm_read_byte(macro_p++)) void action_macro_play(const prog_macro_t *macro_p) { @@ -64,3 +66,4 @@ void action_macro_play(const prog_macro_t *macro_p) { uint8_t ms = interval; while (ms--) _delay_ms(1); } } } +#endif diff --git a/common/action_macro.h b/common/action_macro.h index db657795..ee5c7c42 100644 --- a/common/action_macro.h +++ b/common/action_macro.h @@ -28,7 +28,11 @@ typedef uint8_t macro_t; typedef macro_t prog_macro_t PROGMEM; +#ifndef NO_ACTION_MACRO void action_macro_play(const prog_macro_t *macro); +#else +#define action_macro_play(macro) +#endif From da659f0b466bf65c12f9a5b7f001f13ade3de61f Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:37:32 +0900 Subject: [PATCH 5/9] Add NO_ACTION_FUNCTION config option --- common/action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/action.c b/common/action.c index eda3a6d3..51b11d1b 100644 --- a/common/action.c +++ b/common/action.c @@ -688,14 +688,18 @@ static void process_action(keyrecord_t *record) #endif /* Extentions */ +#ifndef NO_ACTION_MACRO case ACT_MACRO: action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); break; +#endif case ACT_COMMAND: break; +#ifndef NO_ACTION_FUNCTION case ACT_FUNCTION: action_function(record, action.func.id, action.func.opt); break; +#endif default: break; } From afaaa83fae7f10ce53a8a04e3048ffdc1d3f4439 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:56:54 +0900 Subject: [PATCH 6/9] Add NO_ACTION_KEYMAP config option --- common/action.c | 2 ++ common/layer_switch.c | 4 ++++ common/layer_switch.h | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/common/action.c b/common/action.c index 51b11d1b..3d81318a 100644 --- a/common/action.c +++ b/common/action.c @@ -369,6 +369,7 @@ static void process_action(keyrecord_t *record) break; #endif +#ifndef NO_ACTION_KEYMAP case ACT_KEYMAP: switch (action.layer.code) { /* Keymap clear */ @@ -530,6 +531,7 @@ static void process_action(keyrecord_t *record) break; } break; +#endif #ifndef NO_ACTION_OVERLAY case ACT_OVERLAY: diff --git a/common/layer_switch.c b/common/layer_switch.c index 815d1e5f..a5d426a8 100644 --- a/common/layer_switch.c +++ b/common/layer_switch.c @@ -24,6 +24,7 @@ void default_layer_set(uint8_t layer) } +#ifndef NO_ACTION_KEYMAP /* * Keymap Layer (0-15) */ @@ -95,6 +96,7 @@ void keymap_debug(void) { debug_hex16(keymap_stat); debug("("); debug_dec(keymap_get_layer()); debug(")"); } +#endif @@ -189,6 +191,7 @@ action_t layer_switch_get_action(key_t key) } #endif +#ifndef NO_ACTION_KEYMAP /* keymap: top layer first */ for (int8_t i = 15; i >= 0; i--) { if (keymap_stat & (1< Date: Thu, 21 Mar 2013 01:36:59 +0900 Subject: [PATCH 7/9] Fix Makefile and config.h of gh60 for new options --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e0b837df..3b700970 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ Note that ***comment out*** to disable them. MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) + COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support From 6fe6a03c2f3f11ff2349bb477d14132aa6175175 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 Mar 2013 14:42:40 +0900 Subject: [PATCH 8/9] Add NO_ACTION_ONESHOT config option --- common.mk | 1 + common/action.c | 50 +++++++-------------------------------- common/action_oneshot.c | 21 +++++++++++++++++ common/action_oneshot.h | 52 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 42 deletions(-) create mode 100644 common/action_oneshot.c create mode 100644 common/action_oneshot.h diff --git a/common.mk b/common.mk index e4c9fb26..de1c6c36 100644 --- a/common.mk +++ b/common.mk @@ -2,6 +2,7 @@ COMMON_DIR = common SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/keyboard.c \ $(COMMON_DIR)/action.c \ + $(COMMON_DIR)/action_oneshot.c \ $(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/layer_switch.c \ $(COMMON_DIR)/keymap.c \ diff --git a/common/action.c b/common/action.c index 3d81318a..49bfc54e 100644 --- a/common/action.c +++ b/common/action.c @@ -25,6 +25,7 @@ along with this program. If not, see . #include "debug.h" #include "led.h" #include "layer_switch.h" +#include "action_oneshot.h" #include "action_macro.h" #include "action.h" @@ -125,44 +126,6 @@ bool waiting_buffer_has_anykey_pressed(void) } return false; } - - -/* Oneshot modifier - * - * Problem: Want to capitalize like 'The' but the result tends to be 'THe'. - * Solution: Oneshot modifier have its effect on only one key coming next. - * Tap Shift, then type 't', 'h' and 'e'. Not need to hold Shift key. - * - * Hold: works as normal modifier. - * Tap: one shot modifier. - * 2 Tap: cancel one shot modifier. - * 5-Tap: toggles enable/disable oneshot feature. - */ -static struct { - uint8_t mods; - uint8_t time; - bool ready; - bool disabled; -} oneshot_state; - -static void oneshot_start(uint8_t mods, uint16_t time) -{ - oneshot_state.mods = mods; - oneshot_state.time = time; - oneshot_state.ready = true; -} - -static void oneshot_cancel(void) -{ - oneshot_state.mods = 0; - oneshot_state.time = 0; - oneshot_state.ready = false; -} - -static void oneshot_toggle(void) -{ - oneshot_state.disabled = !oneshot_state.disabled; -} #endif @@ -263,6 +226,7 @@ static void process_action(keyrecord_t *record) uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ? action.key.mods : action.key.mods<<4; switch (action.layer.code) { + #ifndef NO_ACTION_ONESHOT case 0x00: // Oneshot modifier if (event.pressed) { @@ -272,7 +236,7 @@ static void process_action(keyrecord_t *record) } else if (tap_count == 1) { debug("MODS_TAP: Oneshot: start\n"); - oneshot_start(mods, event.time); + oneshot_start(mods); } else if (tap_count == TAPPING_TOGGLE) { debug("MODS_TAP: Oneshot: toggle\n"); @@ -303,6 +267,7 @@ static void process_action(keyrecord_t *record) } } break; + #endif default: if (event.pressed) { if (tap_count > 0) { @@ -930,15 +895,16 @@ void register_code(uint8_t code) // TODO: should push command_proc out of this block? if (command_proc(code)) return; -#ifndef NO_ACTION_TAPPING - if (oneshot_state.mods && oneshot_state.ready && !oneshot_state.disabled) { +#ifndef NO_ACTION_ONESHOT + if (oneshot_state.mods && !oneshot_state.disabled) { uint8_t tmp_mods = host_get_mods(); host_add_mods(oneshot_state.mods); + host_add_key(code); host_send_keyboard_report(); host_set_mods(tmp_mods); - oneshot_state.ready = false; + oneshot_cancel(); } else #endif { diff --git a/common/action_oneshot.c b/common/action_oneshot.c new file mode 100644 index 00000000..d34f44b5 --- /dev/null +++ b/common/action_oneshot.c @@ -0,0 +1,21 @@ +#include "action_oneshot.h" + + +#ifndef NO_ACTION_ONESHOT +oneshot_state_t oneshot_state; + +void oneshot_start(uint8_t mods) +{ + oneshot_state.mods = mods; +} + +void oneshot_cancel(void) +{ + oneshot_state.mods = 0; +} + +void oneshot_toggle(void) +{ + oneshot_state.disabled = !oneshot_state.disabled; +} +#endif diff --git a/common/action_oneshot.h b/common/action_oneshot.h new file mode 100644 index 00000000..36ef9e9b --- /dev/null +++ b/common/action_oneshot.h @@ -0,0 +1,52 @@ +/* +Copyright 2013 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#ifndef ACTION_ONESHOT_H +#define ACTION_ONESHOT_H + +#include +#include + +#ifdef NO_ACTION_TAPPING + #define NO_ACTION_ONESHOT +#endif + +#ifndef NO_ACTION_ONESHOT +/* Oneshot modifier + * + * Problem: Want to capitalize like 'The' but the result tends to be 'THe'. + * Solution: Oneshot modifier have its effect on only one key coming next. + * Tap Shift, then type 't', 'h' and 'e'. Not need to hold Shift key. + * + * Hold: works as normal modifier. + * Tap: one shot modifier. + * 2 Tap: cancel one shot modifier. + * 5-Tap: toggles enable/disable oneshot feature. + */ +typedef struct { + uint8_t mods; + bool disabled; +} oneshot_state_t; + + +oneshot_state_t oneshot_state; + +void oneshot_start(uint8_t mods); +void oneshot_cancel(void); +void oneshot_toggle(void); +#endif + +#endif From c4ecc6fc7d32d295b9af81b9d9f7c075a744e5bd Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 Mar 2013 15:24:48 +0900 Subject: [PATCH 9/9] Clean action.c --- common/action.c | 494 ++++++++++++++++++++++++------------------------ 1 file changed, 249 insertions(+), 245 deletions(-) diff --git a/common/action.c b/common/action.c index 49bfc54e..c218808a 100644 --- a/common/action.c +++ b/common/action.c @@ -31,20 +31,11 @@ along with this program. If not, see . static void process_action(keyrecord_t *record); -#ifndef NO_ACTION_TAPPING -static bool process_tapping(keyrecord_t *record); -static void waiting_buffer_scan_tap(void); -#endif - static void debug_event(keyevent_t event); static void debug_record(keyrecord_t record); static void debug_action(action_t action); + #ifndef NO_ACTION_TAPPING -static void debug_tapping_key(void); -static void debug_waiting_buffer(void); -#endif - - /* * Tapping */ @@ -58,7 +49,6 @@ static void debug_waiting_buffer(void); #define TAPPING_TOGGLE 5 #endif -#ifndef NO_ACTION_TAPPING /* stores a key event of current tap. */ static keyrecord_t tapping_key = {}; @@ -76,57 +66,23 @@ static keyrecord_t tapping_key = {}; */ #define WAITING_BUFFER_SIZE 8 static keyrecord_t waiting_buffer[WAITING_BUFFER_SIZE] = {}; - /* point to empty cell to enq */ static uint8_t waiting_buffer_head = 0; - /* point to the oldest data cell to deq */ static uint8_t waiting_buffer_tail = 0; -static bool waiting_buffer_enq(keyrecord_t record) -{ - if (IS_NOEVENT(record.event)) { - return true; - } - - if ((waiting_buffer_head + 1) % WAITING_BUFFER_SIZE == waiting_buffer_tail) { - debug("waiting_buffer_enq: Over flow.\n"); - return false; - } - - waiting_buffer[waiting_buffer_head] = record; - waiting_buffer_head = (waiting_buffer_head + 1) % WAITING_BUFFER_SIZE; - - debug("waiting_buffer_enq: "); debug_waiting_buffer(); - return true; -} - -static void waiting_buffer_clear(void) -{ - waiting_buffer_head = 0; - waiting_buffer_tail = 0; -} +static bool process_tapping(keyrecord_t *record); +static bool waiting_buffer_enq(keyrecord_t record); +static void waiting_buffer_clear(void); #if TAPPING_TERM >= 500 -static bool waiting_buffer_typed(keyevent_t event) -{ - for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { - if (KEYEQ(event.key, waiting_buffer[i].event.key) && event.pressed != waiting_buffer[i].event.pressed) { - return true; - } - } - return false; -} +static bool waiting_buffer_typed(keyevent_t event); +#endif +static void waiting_buffer_scan_tap(void); +static void debug_tapping_key(void); +static void debug_waiting_buffer(void); #endif -bool waiting_buffer_has_anykey_pressed(void) -{ - for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { - if (waiting_buffer[i].event.pressed) return true; - } - return false; -} -#endif void action_exec(keyevent_t event) @@ -139,13 +95,11 @@ void action_exec(keyevent_t event) keyrecord_t record = { .event = event }; #ifndef NO_ACTION_TAPPING - // pre-process on tapping if (process_tapping(&record)) { if (!IS_NOEVENT(record.event)) { debug("processed: "); debug_record(record); debug("\n"); } } else { - // enqueue if (!waiting_buffer_enq(record)) { // clear all in case of overflow. debug("OVERFLOW: CLEAR ALL STATES\n"); @@ -159,7 +113,6 @@ void action_exec(keyevent_t event) 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) { if (process_tapping(&waiting_buffer[waiting_buffer_tail])) { debug("processed: waiting_buffer["); debug_dec(waiting_buffer_tail); debug("] = "); @@ -298,7 +251,6 @@ static void process_action(keyrecord_t *record) } break; #endif - #ifdef EXTRAKEY_ENABLE /* other HID usage */ case ACT_USAGE: @@ -320,7 +272,6 @@ static void process_action(keyrecord_t *record) } break; #endif - #ifdef MOUSEKEY_ENABLE /* Mouse key */ case ACT_MOUSEKEY: @@ -333,7 +284,6 @@ static void process_action(keyrecord_t *record) } break; #endif - #ifndef NO_ACTION_KEYMAP case ACT_KEYMAP: switch (action.layer.code) { @@ -497,7 +447,6 @@ static void process_action(keyrecord_t *record) } break; #endif - #ifndef NO_ACTION_OVERLAY case ACT_OVERLAY: switch (action.layer.code) { @@ -653,7 +602,6 @@ static void process_action(keyrecord_t *record) } break; #endif - /* Extentions */ #ifndef NO_ACTION_MACRO case ACT_MACRO: @@ -672,6 +620,198 @@ static void process_action(keyrecord_t *record) } } + + + +/* + * Utilities for actions. + */ +void register_code(uint8_t code) +{ + if (code == KC_NO) { + return; + } +#ifdef CAPSLOCK_LOCKING_ENABLE + else if (KC_LOCKING_CAPS == code) { +#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE + // Resync: ignore if caps lock already is on + if (host_keyboard_leds() & (1<>8); + debug(":"); + debug_hex8(action.kind.param & 0xff); + debug("]"); +} + + + #ifndef NO_ACTION_TAPPING /* Tapping * @@ -845,6 +985,53 @@ static bool process_tapping(keyrecord_t *keyp) } } + +/* + * Waiting buffer + */ +static bool waiting_buffer_enq(keyrecord_t record) +{ + if (IS_NOEVENT(record.event)) { + return true; + } + + if ((waiting_buffer_head + 1) % WAITING_BUFFER_SIZE == waiting_buffer_tail) { + debug("waiting_buffer_enq: Over flow.\n"); + return false; + } + + waiting_buffer[waiting_buffer_head] = record; + waiting_buffer_head = (waiting_buffer_head + 1) % WAITING_BUFFER_SIZE; + + debug("waiting_buffer_enq: "); debug_waiting_buffer(); + return true; +} + +static void waiting_buffer_clear(void) +{ + waiting_buffer_head = 0; + waiting_buffer_tail = 0; +} + +#if TAPPING_TERM >= 500 +static bool waiting_buffer_typed(keyevent_t event) +{ + for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { + if (KEYEQ(event.key, waiting_buffer[i].event.key) && event.pressed != waiting_buffer[i].event.pressed) { + return true; + } + } + return false; +} +#endif + +bool waiting_buffer_has_anykey_pressed(void) +{ + for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { + if (waiting_buffer[i].event.pressed) return true; + } + return false; +} /* scan buffer for tapping */ static void waiting_buffer_scan_tap(void) { @@ -867,199 +1054,16 @@ static void waiting_buffer_scan_tap(void) } } } -#endif - - - -/* - * Utilities for actions. - */ -void register_code(uint8_t code) -{ - if (code == KC_NO) { - return; - } -#ifdef CAPSLOCK_LOCKING_ENABLE - else if (KC_LOCKING_CAPS == code) { -#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE - // Resync: ignore if caps lock already is on - if (host_keyboard_leds() & (1<>8); - debug(":"); - debug_hex8(action.kind.param & 0xff); - debug("]"); -} -#ifndef NO_ACTION_TAPPING static void debug_tapping_key(void) { debug("TAPPING_KEY="); debug_record(tapping_key); debug("\n"); } + static void debug_waiting_buffer(void) { debug("{ ");