diff options
| author | tmk <nobody@nowhere> | 2013-07-21 10:44:21 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-07-21 10:44:21 +0900 |
| commit | 25aec56c082936a463d609357a04332c97c9940b (patch) | |
| tree | 5c3813a5391b9b10f1dc07b259d075729f9c6344 /common/action.c | |
| parent | 86623f57247c92242751ceae4cb291e7f3d19540 (diff) | |
| parent | 3e023e5b0cf15d3008346c6b946ae3adc51f7f18 (diff) | |
| download | qmk_firmware-25aec56c082936a463d609357a04332c97c9940b.tar.gz qmk_firmware-25aec56c082936a463d609357a04332c97c9940b.zip | |
Merge branch 'bob_fix'
Diffstat (limited to 'common/action.c')
| -rw-r--r-- | common/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/action.c b/common/action.c index b1fa0e31c..a42a7a4ae 100644 --- a/common/action.c +++ b/common/action.c | |||
| @@ -237,7 +237,7 @@ void process_action(keyrecord_t *record) | |||
| 237 | break; | 237 | break; |
| 238 | #ifndef NO_ACTION_TAPPING | 238 | #ifndef NO_ACTION_TAPPING |
| 239 | case ACT_LAYER_TAP: | 239 | case ACT_LAYER_TAP: |
| 240 | case ACT_LAYER_TAP1: | 240 | case ACT_LAYER_TAP_EXT: |
| 241 | switch (action.layer_tap.code) { | 241 | switch (action.layer_tap.code) { |
| 242 | case OP_TAP_TOGGLE: | 242 | case OP_TAP_TOGGLE: |
| 243 | /* tap toggle */ | 243 | /* tap toggle */ |
| @@ -458,7 +458,7 @@ bool is_tap_key(key_t key) | |||
| 458 | case ACT_LMODS_TAP: | 458 | case ACT_LMODS_TAP: |
| 459 | case ACT_RMODS_TAP: | 459 | case ACT_RMODS_TAP: |
| 460 | case ACT_LAYER_TAP: | 460 | case ACT_LAYER_TAP: |
| 461 | case ACT_LAYER_TAP1: | 461 | case ACT_LAYER_TAP_EXT: |
| 462 | return true; | 462 | return true; |
| 463 | case ACT_MACRO: | 463 | case ACT_MACRO: |
| 464 | case ACT_FUNCTION: | 464 | case ACT_FUNCTION: |
| @@ -496,7 +496,7 @@ void debug_action(action_t action) | |||
| 496 | case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break; | 496 | case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break; |
| 497 | case ACT_LAYER: dprint("ACT_LAYER"); break; | 497 | case ACT_LAYER: dprint("ACT_LAYER"); break; |
| 498 | case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break; | 498 | case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break; |
| 499 | case ACT_LAYER_TAP1: dprint("ACT_LAYER_TAP1"); break; | 499 | case ACT_LAYER_TAP_EXT: dprint("ACT_LAYER_TAP_EXT"); break; |
| 500 | case ACT_MACRO: dprint("ACT_MACRO"); break; | 500 | case ACT_MACRO: dprint("ACT_MACRO"); break; |
| 501 | case ACT_COMMAND: dprint("ACT_COMMAND"); break; | 501 | case ACT_COMMAND: dprint("ACT_COMMAND"); break; |
| 502 | case ACT_FUNCTION: dprint("ACT_FUNCTION"); break; | 502 | case ACT_FUNCTION: dprint("ACT_FUNCTION"); break; |
