mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-07 08:04:16 -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:
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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue