From: tmk <nobody@nowhere>
Date: Thu, 28 Nov 2013 07:31:06 +0000 (+0900)
Subject: Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard into simon... 
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=fd9ee507a557e17b5af9fcd8892868ddf07bbb7a;p=max%2Ftmk_keyboard.git

Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard into simonmelhart-modstaptoggle

Conflicts:
	common/action_code.h
---

fd9ee507a557e17b5af9fcd8892868ddf07bbb7a
diff --cc common/action_code.h
index b08d3612,bd3652e3..8df86b11
--- a/common/action_code.h
+++ b/common/action_code.h
@@@ -205,12 -206,14 +206,14 @@@ enum mods_bit 
  };
  enum mods_codes {
      MODS_ONESHOT = 0x00,
+     MODS_TAP_TOGGLE = 0x01,
  };
  #define ACTION_KEY(key)                 ACTION(ACT_MODS, (key))
 -#define ACTION_MODS(mods)               ACTION(ACT_MODS, (mods&0x1f)<<8 | 0)
 -#define ACTION_MODS_KEY(mods, key)      ACTION(ACT_MODS, (mods&0x1f)<<8 | (key))
 -#define ACTION_MODS_TAP_KEY(mods, key)  ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | (key))
 -#define ACTION_MODS_ONESHOT(mods)       ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_ONESHOT)
 -#define ACTION_MODS_TAP_TOGGLE(mods)    ACTION(ACT_MODS_TAP, (mods&0x1f)<<8 | MODS_TAP_TOGGLE)
 +#define ACTION_MODS(mods)               ACTION(ACT_MODS, ((mods)&0x1f)<<8 | 0)
 +#define ACTION_MODS_KEY(mods, key)      ACTION(ACT_MODS, ((mods)&0x1f)<<8 | (key))
 +#define ACTION_MODS_TAP_KEY(mods, key)  ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | (key))
 +#define ACTION_MODS_ONESHOT(mods)       ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | MODS_ONESHOT)
++#define ACTION_MODS_TAP_TOGGLE(mods)    ACTION(ACT_MODS_TAP, ((mods)&0x1f)<<8 | MODS_TAP_TOGGLE)
  
  
  /*