mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-07-06 03:40:35 -04:00
Klor Fix, Userspace Adds, Keymap tweaks
- Updated Klor config for updated haptic defines - Music mode is now off for good - Added userspace config for haptics and audio - Went back to numpad 0 on the thumbs - Added haptic and audio keys on the config layer - removed all combos except drag scroll - Updated and added overrides for haptics/audio/Mousekeys
This commit is contained in:
Victor
parent
f07b0203d0
commit
a1764f59ac
15 changed files with 188 additions and 75 deletions
|
|
@ -1,18 +1,18 @@
|
|||
#include "combo.h"
|
||||
|
||||
/*
|
||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
||||
|
||||
switch (index) {
|
||||
|
||||
#if defined(MOUSEKEY_ENABLE)
|
||||
case MOUSE_BUTTON3:
|
||||
case MOUSE_BUTTON4:
|
||||
case MOUSE_BUTTON5:
|
||||
case MOUSE_DRGTOG:
|
||||
#endif //MOUSEKEY_ENABLEdf
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
// case MOUSE_DRGTOG:
|
||||
|
||||
|
||||
case KEY_ENT:
|
||||
case KEY_TAB:
|
||||
// case KEY_TAB:
|
||||
return true;
|
||||
|
||||
default:
|
||||
|
|
@ -20,7 +20,7 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
|||
|
||||
}
|
||||
|
||||
}
|
||||
} */
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
|
|
@ -29,11 +29,13 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
|
|||
|
||||
switch (combo_index) {
|
||||
|
||||
case MOUSE_BUTTON1:
|
||||
case MOUSE_BUTTON2:
|
||||
case MOUSE_BUTTON3:
|
||||
case MOUSE_BUTTON4:
|
||||
case MOUSE_BUTTON5:
|
||||
|
||||
// case MOUSE_BUTTON1:
|
||||
// case MOUSE_BUTTON2:
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
|
||||
case MOUSE_DRGTOG:
|
||||
if ( get_highest_layer(layer_state | default_layer_state) > _DEFAULT_LAYER_1 ) return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,39 +2,32 @@
|
|||
#include "t4corun.h"
|
||||
|
||||
|
||||
|
||||
#if defined(MOUSEKEY_ENABLE)
|
||||
const uint16_t PROGMEM mou_btn1_combo[] = { KC_D, KC_F, COMBO_END };
|
||||
const uint16_t PROGMEM mou_btn2_combo[] = { KC_S, KC_D, COMBO_END };
|
||||
const uint16_t PROGMEM mou_btn3_combo[] = { KC_F, KC_G, COMBO_END };
|
||||
const uint16_t PROGMEM mou_btn4_combo[] = { KC_F, KC_R, COMBO_END };
|
||||
const uint16_t PROGMEM mou_btn5_combo[] = { KC_T, KC_G, COMBO_END };
|
||||
//const uint16_t PROGMEM mou_btn1_combo[] = { KC_D, KC_F, COMBO_END };
|
||||
//const uint16_t PROGMEM mou_btn2_combo[] = { KC_S, KC_D, COMBO_END };
|
||||
//const uint16_t PROGMEM mou_btn3_combo[] = { KC_F, KC_G, COMBO_END };
|
||||
//const uint16_t PROGMEM mou_btn4_combo[] = { KC_F, KC_R, COMBO_END };
|
||||
//const uint16_t PROGMEM mou_btn5_combo[] = { KC_T, KC_G, COMBO_END };
|
||||
const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END };
|
||||
#endif //MOUSEKEY_ENABLE
|
||||
|
||||
const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END };
|
||||
const uint16_t PROGMEM key_tab_combo[] = { KC_U, KC_I, COMBO_END };
|
||||
const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
|
||||
|
||||
//const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END };
|
||||
//const uint16_t PROGMEM key_tab_combo[] = { KC_U, KC_I, COMBO_END };
|
||||
//const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
|
||||
|
||||
|
||||
|
||||
enum combos {
|
||||
|
||||
#if defined(MOUSEKEY_ENABLE)
|
||||
MOUSE_BUTTON1,
|
||||
MOUSE_BUTTON2,
|
||||
MOUSE_BUTTON3,
|
||||
MOUSE_BUTTON4,
|
||||
MOUSE_BUTTON5,
|
||||
// MOUSE_BUTTON1,
|
||||
// MOUSE_BUTTON2,
|
||||
// MOUSE_BUTTON3,
|
||||
// MOUSE_BUTTON4,
|
||||
// MOUSE_BUTTON5,
|
||||
MOUSE_DRGTOG,
|
||||
#endif //MOUSEKEY_ENABLE
|
||||
|
||||
KEY_ENT,
|
||||
KEY_TAB,
|
||||
KEY_BSPC,
|
||||
|
||||
// KEY_ENT,
|
||||
// KEY_TAB,
|
||||
// KEY_BSPC,
|
||||
COMBO_LENGTH
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -43,18 +36,15 @@ uint16_t COMBO_LEN = COMBO_LENGTH;
|
|||
|
||||
|
||||
combo_t key_combos[COMBO_LENGTH] = {
|
||||
// [MOUSE_BUTTON1] = COMBO(mou_btn1_combo, KC_BTN1),
|
||||
// [MOUSE_BUTTON2] = COMBO(mou_btn2_combo, KC_BTN2),
|
||||
// [MOUSE_BUTTON3] = COMBO(mou_btn3_combo, KC_BTN3),
|
||||
// [MOUSE_BUTTON4] = COMBO(mou_btn4_combo, KC_BTN4),
|
||||
// [MOUSE_BUTTON5] = COMBO(mou_btn5_combo, KC_BTN5),
|
||||
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS)
|
||||
|
||||
#if defined(MOUSEKEY_ENABLE)
|
||||
[MOUSE_BUTTON1] = COMBO(mou_btn1_combo, KC_BTN1),
|
||||
[MOUSE_BUTTON2] = COMBO(mou_btn2_combo, KC_BTN2),
|
||||
[MOUSE_BUTTON3] = COMBO(mou_btn3_combo, KC_BTN3),
|
||||
[MOUSE_BUTTON4] = COMBO(mou_btn4_combo, KC_BTN4),
|
||||
[MOUSE_BUTTON5] = COMBO(mou_btn5_combo, KC_BTN5),
|
||||
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS),
|
||||
#endif //MOUSEKEY_ENABLE
|
||||
|
||||
[KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||
[KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
||||
[KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC)
|
||||
// [KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||
// [KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
||||
// [KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC)
|
||||
|
||||
};
|
||||
|
|
@ -29,10 +29,17 @@ const key_override_t f10_override = ko_make_with_layers(MOD_MASK_CSA, K
|
|||
const key_override_t f11_override = ko_make_with_layers(MOD_MASK_CSA, KC_DOT, KC_F11, 1<<_NUMBER);
|
||||
const key_override_t f12_override = ko_make_with_layers(MOD_MASK_CSA, KC_MINS, KC_F12, 1<<_NUMBER);
|
||||
|
||||
const key_override_t mb1_override = ko_make_with_layers(MOD_MASK_CTRL, KC_BTN1, KC_PSCR, 1<<_NUMBER);
|
||||
const key_override_t mb2_override = ko_make_with_layers(MOD_MASK_ALT, KC_BTN2, SC_FILE, 1<<_NUMBER);
|
||||
const key_override_t mb2_override = ko_make_with_layers(MOD_MASK_CTRL, KC_BTN2, KC_BTN4, 1<<_NUMBER);
|
||||
const key_override_t mb3_override = ko_make_with_layers(MOD_MASK_ALT, KC_BTN3, KC_BTN5, 1<<_NUMBER);
|
||||
|
||||
#if defined(HAPTIC_ENABLE)
|
||||
const key_override_t hfnext_override = ko_make_with_layers(MOD_MASK_SHIFT, TR_HNXT, HF_PREV, 1<<_CONFIG);
|
||||
const key_override_t hfconu_override = ko_make_with_layers(MOD_MASK_SHIFT, TR_HCNU, HF_COND, 1<<_CONFIG);
|
||||
#endif //HAPTIC_ENABLE
|
||||
|
||||
#if defined(AUDIO_ENABLE)
|
||||
const key_override_t ckup_override = ko_make_with_layers(MOD_MASK_SHIFT, CK_UP, CK_DOWN, 1<<_CONFIG);
|
||||
#endif //AUDIO_ENABLE
|
||||
|
||||
const key_override_t **key_overrides = (const key_override_t *[]) {
|
||||
|
||||
|
|
@ -50,8 +57,18 @@ const key_override_t **key_overrides = (const key_override_t *[]) {
|
|||
&f10_override,
|
||||
&f11_override,
|
||||
&f12_override,
|
||||
&mb1_override,
|
||||
&mb2_override,
|
||||
&mb3_override,
|
||||
|
||||
#if defined(HAPTIC_ENABLE)
|
||||
&hfnext_override,
|
||||
&hfconu_override,
|
||||
#endif //HAPTIC_ENABLE
|
||||
|
||||
#if defined(AUDIO_ENABLE)
|
||||
&ckup_override,
|
||||
#endif //AUDIO_ENABLE
|
||||
|
||||
NULL // Null terminate the array of overrides!
|
||||
|
||||
};
|
||||
11
users/t4corun/features/tapping.c
Normal file
11
users/t4corun/features/tapping.c
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#include tapping.h
|
||||
|
||||
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case NAV:
|
||||
return TAPPING_TERM - 40;
|
||||
|
||||
default:
|
||||
return TAPPING_TERM;
|
||||
}
|
||||
}
|
||||
2
users/t4corun/features/tapping.h
Normal file
2
users/t4corun/features/tapping.h
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#pragma once
|
||||
#include "t4corun.h"
|
||||
Loading…
Add table
Add a link
Reference in a new issue