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_code.h | |
| 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_code.h')
| -rw-r--r-- | common/action_code.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/action_code.h b/common/action_code.h index 2272091cc..df6ce9998 100644 --- a/common/action_code.h +++ b/common/action_code.h | |||
| @@ -62,8 +62,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 62 | * 1000|ooee|pppE BBBB Layer Bitwise Operation | 62 | * 1000|ooee|pppE BBBB Layer Bitwise Operation |
| 63 | * oo: operation(00:AND, 01:OR, 10:XOR, 11:SET) | 63 | * oo: operation(00:AND, 01:OR, 10:XOR, 11:SET) |
| 64 | * ppp: 4-bit chunk part(0-7) | 64 | * ppp: 4-bit chunk part(0-7) |
| 65 | * eBBBB: bits and extra bit | 65 | * EBBBB: bits and extra bit |
| 66 | * ee: on event(00:default layer, 01:press, 10:release, 11:both) | 66 | * ee: on event(01:press, 10:release, 11:both) |
| 67 | * | 67 | * |
| 68 | * 1001|xxxx|xxxx xxxx (reserved) | 68 | * 1001|xxxx|xxxx xxxx (reserved) |
| 69 | * 1001|oopp|BBBB BBBB 8-bit Bitwise Operation??? | 69 | * 1001|oopp|BBBB BBBB 8-bit Bitwise Operation??? |
| @@ -76,7 +76,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 76 | * 101E|LLLL|1111 0010 Off/On | 76 | * 101E|LLLL|1111 0010 Off/On |
| 77 | * 101E|LLLL|1111 0011 Set/Clear | 77 | * 101E|LLLL|1111 0011 Set/Clear |
| 78 | * 101E|LLLL|1111 xxxx Reserved(0xF4-FF) | 78 | * 101E|LLLL|1111 xxxx Reserved(0xF4-FF) |
| 79 | * ELLLL: layer(0-31) | 79 | * ELLLL: layer 0-31(E: extra bit for layer 16-31) |
| 80 | * | 80 | * |
| 81 | * | 81 | * |
| 82 | * Extensions(11xx) | 82 | * Extensions(11xx) |
| @@ -108,8 +108,8 @@ enum action_kind_id { | |||
| 108 | ACT_MOUSEKEY = 0b0101, | 108 | ACT_MOUSEKEY = 0b0101, |
| 109 | /* Layer Actions */ | 109 | /* Layer Actions */ |
| 110 | ACT_LAYER = 0b1000, | 110 | ACT_LAYER = 0b1000, |
| 111 | ACT_LAYER_TAP = 0b1010, | 111 | ACT_LAYER_TAP = 0b1010, /* Layer 0-15 */ |
| 112 | ACT_LAYER_TAP1 = 0b1011, | 112 | ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */ |
| 113 | /* Extensions */ | 113 | /* Extensions */ |
| 114 | ACT_MACRO = 0b1100, | 114 | ACT_MACRO = 0b1100, |
| 115 | ACT_BACKLIGHT = 0b1101, | 115 | ACT_BACKLIGHT = 0b1101, |
