]> git.donarmstrong.com Git - tmk_firmware.git/commitdiff
Change name ACT_LAYER_TAP1 to ACT_LAYER_TAP_EXT
authortmk <nobody@nowhere>
Fri, 19 Jul 2013 18:27:36 +0000 (03:27 +0900)
committertmk <nobody@nowhere>
Fri, 19 Jul 2013 18:27:36 +0000 (03:27 +0900)
common/action.c
common/action_code.h

index b1fa0e31cf7798c4cdbf49efa83d9a0e97a4575b..a42a7a4aeeee536ce3b31bd66b68b26830bf1b85 100644 (file)
@@ -237,7 +237,7 @@ void process_action(keyrecord_t *record)
             break;
     #ifndef NO_ACTION_TAPPING
         case ACT_LAYER_TAP:
-        case ACT_LAYER_TAP1:
+        case ACT_LAYER_TAP_EXT:
             switch (action.layer_tap.code) {
                 case OP_TAP_TOGGLE:
                     /* tap toggle */
@@ -458,7 +458,7 @@ bool is_tap_key(key_t key)
         case ACT_LMODS_TAP:
         case ACT_RMODS_TAP:
         case ACT_LAYER_TAP:
-        case ACT_LAYER_TAP1:
+        case ACT_LAYER_TAP_EXT:
             return true;
         case ACT_MACRO:
         case ACT_FUNCTION:
@@ -496,7 +496,7 @@ void debug_action(action_t action)
         case ACT_MOUSEKEY:          dprint("ACT_MOUSEKEY");          break;
         case ACT_LAYER:             dprint("ACT_LAYER");             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_COMMAND:           dprint("ACT_COMMAND");           break;
         case ACT_FUNCTION:          dprint("ACT_FUNCTION");          break;
index 2272091cc47fa45afc914be35a6d8826cae948d0..df6ce99986894b440b31dfabef489ed9d63fc38b 100644 (file)
@@ -62,8 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 1000|ooee|pppE BBBB   Layer Bitwise Operation
  *   oo:    operation(00:AND, 01:OR, 10:XOR, 11:SET)
  *   ppp:   4-bit chunk part(0-7)
- *   eBBBB: bits and extra bit
- *   ee:    on event(00:default layer, 01:press, 10:release, 11:both)
+ *   EBBBB: bits and extra bit
+ *   ee:    on event(01:press, 10:release, 11:both)
  *
  * 1001|xxxx|xxxx xxxx   (reserved)
  * 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 0011   Set/Clear
  * 101E|LLLL|1111 xxxx   Reserved(0xF4-FF)
- *   ELLLL: layer(0-31)
+ *   ELLLL: layer 0-31(E: extra bit for layer 16-31)
  *
  *
  * Extensions(11xx)
@@ -108,8 +108,8 @@ enum action_kind_id {
     ACT_MOUSEKEY        = 0b0101,
     /* Layer Actions */
     ACT_LAYER           = 0b1000,
-    ACT_LAYER_TAP       = 0b1010,
-    ACT_LAYER_TAP1      = 0b1011,
+    ACT_LAYER_TAP       = 0b1010, /* Layer  0-15 */
+    ACT_LAYER_TAP_EXT   = 0b1011, /* Layer 16-31 */
     /* Extensions */
     ACT_MACRO           = 0b1100,
     ACT_BACKLIGHT       = 0b1101,