max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into chibios

Browse source
This commit is contained in:
flabbergast 2015-12-18 20:54:41 +00:00
commit 8952d617ea
22 changed files with 350 additions and 2550 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tmk_core/common/action.c
View file

@ -131,10 +131,17 @@ void process_action(keyrecord_t *record)
case MODS_TAP_TOGGLE:
if (event.pressed) {
if (tap_count <= TAPPING_TOGGLE) {
register_mods(mods);
if (mods & get_mods()) {
dprint("MODS_TAP_TOGGLE: toggle mods off\n");
unregister_mods(mods);
} else {
dprint("MODS_TAP_TOGGLE: toggle mods on\n");
register_mods(mods);
}
}
} else {
if (tap_count < TAPPING_TOGGLE) {
dprint("MODS_TAP_TOGGLE: release : unregister_mods\n");
unregister_mods(mods);
}
}

1
tmk_core/common/action_code.h
View file

@ -255,6 +255,7 @@ enum layer_pram_tap_op {
#define ACTION_LAYER_TAP(layer, key) (ACT_LAYER_TAP<<12 | (layer)<<8 | (key))
/* Default Layer */
#define ACTION_DEFAULT_LAYER_SET(layer) ACTION_DEFAULT_LAYER_BIT_SET((layer)/4, 1<<((layer)%4))
#define ACTION_DEFAULT_LAYER_TOGGLE(layer) ACTION_DEFAULT_LAYER_BIT_XOR((layer)/4, 1<<((layer)%4))
/* Layer Operation */
#define ACTION_LAYER_CLEAR(on) ACTION_LAYER_BIT_AND(0, 0, (on))
#define ACTION_LAYER_MOMENTARY(layer) ACTION_LAYER_ON_OFF(layer)

2
tmk_core/common/keycode.h
View file

@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KC_LCAP KC_LOCKING_CAPS
#define KC_LNUM KC_LOCKING_NUM
#define KC_LSCR KC_LOCKING_SCROLL
#define KC_ERAS KC_ALT_ERASE,
#define KC_ERAS KC_ALT_ERASE
#define KC_CLR KC_CLEAR
/* Japanese specific */
#define KC_ZKHK KC_GRAVE