andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change name ACT_LAYER_TAP1 to ACT_LAYER_TAP_EXT

master
tmk 2013-07-20 03:27:36 +09:00
parent f4c69652c1
commit f8fbecff4d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/action.c
View File

@ -237,7 +237,7 @@ void process_action(keyrecord_t *record)
break; break;
#ifndef NO_ACTION_TAPPING #ifndef NO_ACTION_TAPPING
case ACT_LAYER_TAP: case ACT_LAYER_TAP:
case ACT_LAYER_TAP1: case ACT_LAYER_TAP_EXT:
switch (action.layer_tap.code) { switch (action.layer_tap.code) {
case OP_TAP_TOGGLE: case OP_TAP_TOGGLE:
/* tap toggle */ /* tap toggle */
@ -458,7 +458,7 @@ bool is_tap_key(key_t key)
case ACT_LMODS_TAP: case ACT_LMODS_TAP:
case ACT_RMODS_TAP: case ACT_RMODS_TAP:
case ACT_LAYER_TAP: case ACT_LAYER_TAP:
case ACT_LAYER_TAP1: case ACT_LAYER_TAP_EXT:
return true; return true;
case ACT_MACRO: case ACT_MACRO:
case ACT_FUNCTION: case ACT_FUNCTION:
@ -496,7 +496,7 @@ void debug_action(action_t action)
case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break; case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break;
case ACT_LAYER: dprint("ACT_LAYER"); break; case ACT_LAYER: dprint("ACT_LAYER"); break;
case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break; case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break;
case ACT_LAYER_TAP1: dprint("ACT_LAYER_TAP1"); break; case ACT_LAYER_TAP_EXT: dprint("ACT_LAYER_TAP_EXT"); break;
case ACT_MACRO: dprint("ACT_MACRO"); break; case ACT_MACRO: dprint("ACT_MACRO"); break;
case ACT_COMMAND: dprint("ACT_COMMAND"); break; case ACT_COMMAND: dprint("ACT_COMMAND"); break;
case ACT_FUNCTION: dprint("ACT_FUNCTION"); break; case ACT_FUNCTION: dprint("ACT_FUNCTION"); break;

10
common/action_code.h
View File

@ -62,8 +62,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* 1000|ooee|pppE BBBB Layer Bitwise Operation * 1000|ooee|pppE BBBB Layer Bitwise Operation
* oo: operation(00:AND, 01:OR, 10:XOR, 11:SET) * oo: operation(00:AND, 01:OR, 10:XOR, 11:SET)
* ppp: 4-bit chunk part(0-7) * ppp: 4-bit chunk part(0-7)
* eBBBB: bits and extra bit * EBBBB: bits and extra bit
* ee: on event(00:default layer, 01:press, 10:release, 11:both) * ee: on event(01:press, 10:release, 11:both)
* *
* 1001|xxxx|xxxx xxxx (reserved) * 1001|xxxx|xxxx xxxx (reserved)
* 1001|oopp|BBBB BBBB 8-bit Bitwise Operation??? * 1001|oopp|BBBB BBBB 8-bit Bitwise Operation???
@ -76,7 +76,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* 101E|LLLL|1111 0010 Off/On * 101E|LLLL|1111 0010 Off/On
* 101E|LLLL|1111 0011 Set/Clear * 101E|LLLL|1111 0011 Set/Clear
* 101E|LLLL|1111 xxxx Reserved(0xF4-FF) * 101E|LLLL|1111 xxxx Reserved(0xF4-FF)
* ELLLL: layer(0-31) * ELLLL: layer 0-31(E: extra bit for layer 16-31)
* *
* *
* Extensions(11xx) * Extensions(11xx)
@ -108,8 +108,8 @@ enum action_kind_id {
ACT_MOUSEKEY = 0b0101, ACT_MOUSEKEY = 0b0101,
/* Layer Actions */ /* Layer Actions */
ACT_LAYER = 0b1000, ACT_LAYER = 0b1000,
ACT_LAYER_TAP = 0b1010, ACT_LAYER_TAP = 0b1010, /* Layer 0-15 */
ACT_LAYER_TAP1 = 0b1011, ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */
/* Extensions */ /* Extensions */
ACT_MACRO = 0b1100, ACT_MACRO = 0b1100,
ACT_BACKLIGHT = 0b1101, ACT_BACKLIGHT = 0b1101,