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

[Keymap] Update personal userspace and keymaps (#6654)

Browse source 
* Enable Fn layer tap dances only if LAYER_FN is defined

* Update KBD6X keymap spacing to match LAYOUT spacing

* Add regular FNLK to userspace, update keymap comment labels

* Rename KC_BRK → BREAK, KC_SYSR → SYSRQ in userspace

* Change mousekey positions in KBD6X

* Disable Console in KBD6X to reduce firmware size

* Return false in process_record_* only when overriding existing keys

* Fix Caps light not working after LSFT_FN

* Refactor Fn/Caps light, fix sequencing issues
This commit is contained in:
Konstantin Đorđević 2019-09-03 17:42:05 +02:00 • committed by Drashna Jaelre
parent 55bae0a5b4
commit d633cf3ccb
9 changed files with 77 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

15
users/konstantin/konstantin.c
View file

@ -40,7 +40,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
fn_lock = !IS_LAYER_ON(L_FN); // Fn layer will be toggled after this
}
return true;
break;
#endif
case KC_ESC:
@ -58,7 +58,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
#endif
}
return true;
break;
case CLEAR:
if (record->event.pressed) {
@ -66,25 +66,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
)
}
return false;
break;
case DST_P_R:
kc = (get_mods() & DST_MOD_MASK) ? DST_REM : DST_PRV;
CLEAN_MODS(
(record->event.pressed ? register_code16 : unregister_code16)(kc);
)
return false;
break;
case DST_N_A:
kc = (get_mods() & DST_MOD_MASK) ? DST_ADD : DST_NXT;
CLEAN_MODS(
(record->event.pressed ? register_code16 : unregister_code16)(kc);
)
return false;
default:
return true;
break;
}
return true;
}
__attribute__((weak))

6
users/konstantin/konstantin.h
View file

@ -13,6 +13,7 @@
#ifdef LAYER_FN
#define FN MO(L_FN)
#define FNLK TG(L_FN)
#define FN_CAPS LT(L_FN, KC_CAPS)
#define FN_ESC LT(L_FN, KC_ESC)
#define FN_FNLK TT(L_FN)
@ -22,9 +23,8 @@
#define NUMPAD TG(L_NUMPAD)
#endif
#define KC_SYSR LALT(KC_PSCR)
#undef KC_BRK
#define KC_BRK LCTL(KC_PAUS)
#define BREAK LCTL(KC_PAUS)
#define SYSRQ LALT(KC_PSCR)
#define MV_UP LCTL(KC_UP)
#define MV_DOWN LCTL(KC_DOWN)

3
users/konstantin/tap_dance.c
View file

@ -111,8 +111,9 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RCTL, KC_RSFT),
[TD_RSF_RCT] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RSFT, KC_RCTL),
#ifdef LAYER_FN
[TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
[TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
[TD_FN_RCTL] = ACTION_TAP_DANCE_LAYER_MOD(L_FN, KC_RCTL),
#endif
};

12
users/konstantin/tap_dance.h
View file

@ -8,10 +8,11 @@
#define RCT_RSF TD(TD_RCT_RSF)
#define RSF_RCT TD(TD_RSF_RCT)
#define LSFT_FN TD(TD_LSFT_FN)
#define RCTL_FN TD(TD_RCTL_FN)
#define FN_RCTL TD(TD_FN_RCTL)
#ifdef LAYER_FN
#define LSFT_FN TD(TD_LSFT_FN)
#define RCTL_FN TD(TD_RCTL_FN)
#define FN_RCTL TD(TD_FN_RCTL)
#endif
enum tap_dance {
TD_DST_A_R,
@ -20,8 +21,9 @@ enum tap_dance {
TD_RCT_RSF,
TD_RSF_RCT,
#ifdef LAYER_FN
TD_LSFT_FN,
TD_RCTL_FN,
TD_FN_RCTL,
#endif
};