ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:qmk/qmk_firmware into planck_rev6

Browse source
This commit is contained in:
Jack Humbert 2018-04-03 21:00:22 -04:00
commit 03b1904b2e
480 changed files with 22956 additions and 2346 deletions
Download patch file Download diff file Expand all files Collapse all files

5
quantum/process_keycode/process_auto_shift.c
View file

@ -92,7 +92,9 @@ bool autoshift_state(void) {
}
bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
#ifndef AUTO_SHIFT_MODIFIERS
static uint8_t any_mod_pressed;
#endif
if (record->event.pressed) {
switch (keycode) {
@ -170,11 +172,13 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
case KC_COMM:
case KC_DOT:
case KC_SLSH:
case KC_GRAVE:
#endif
autoshift_flush();
if (!autoshift_enabled) return true;
#ifndef AUTO_SHIFT_MODIFIERS
any_mod_pressed = get_mods() & (
MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)|
MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)|
@ -185,6 +189,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
if (any_mod_pressed) {
return true;
}
#endif
autoshift_on(keycode);
return false;

2
quantum/process_keycode/process_combo.c
View file

@ -22,7 +22,7 @@
__attribute__ ((weak))
combo_t key_combos[] = {
combo_t key_combos[COMBO_COUNT] = {
};