mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-06 15:44:17 -04:00
Keymap tweaks
- Brought back Mouse Z for temporary mouse usage - Combined Mouse and Function Keys into one Layer - Cleaned up unused code (e.g. combos, key overrides) - Updated all keyboards with new layer - Updated documentation - I think this will be it for now. Making a list somewhere else for future enhancements
This commit is contained in:
Victor
parent
2f6929eae1
commit
82832d4fc7
17 changed files with 127 additions and 172 deletions
|
|
@ -2,47 +2,35 @@
|
|||
|
||||
|
||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
||||
|
||||
switch (index) {
|
||||
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
// case MOUSE_DRGTOG:
|
||||
|
||||
case KEY_ENT:
|
||||
case KEY_TAB:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
// disable all combos on config layer
|
||||
if ( get_highest_layer(layer_state | default_layer_state) == _CONFIG ) return false;
|
||||
|
||||
switch (combo_index) {
|
||||
|
||||
|
||||
// case MOUSE_BUTTON1:
|
||||
// case MOUSE_BUTTON2:
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
case MOUSE_BUTTON1:
|
||||
if ( get_highest_layer(layer_state | default_layer_state) > FIRST_DEFAULT_LAYER ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
case MOUSE_DRGTOG:
|
||||
if (( get_highest_layer(layer_state | default_layer_state) != FIRST_DEFAULT_LAYER )
|
||||
&& ( get_highest_layer(layer_state | default_layer_state) != _MOUSE )) {
|
||||
&& ( get_highest_layer(layer_state | default_layer_state) != _MOUSE_FUNC )) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,25 +2,16 @@
|
|||
#include "t4corun.h"
|
||||
|
||||
|
||||
//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_C, KC_V, COMBO_END };
|
||||
const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_V, COMBO_END };
|
||||
|
||||
|
||||
const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END };
|
||||
const uint16_t PROGMEM key_ent_combo[] = { KC_D, KC_F, COMBO_END };
|
||||
const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
|
||||
const uint16_t PROGMEM key_tab_combo[] = { KC_J, KC_K, COMBO_END };
|
||||
|
||||
|
||||
enum combos {
|
||||
// MOUSE_BUTTON1,
|
||||
// MOUSE_BUTTON2,
|
||||
// MOUSE_BUTTON3,
|
||||
// MOUSE_BUTTON4,
|
||||
// MOUSE_BUTTON5,
|
||||
MOUSE_BUTTON1,
|
||||
MOUSE_DRGTOG,
|
||||
KEY_ENT,
|
||||
KEY_BSPC,
|
||||
|
|
@ -28,17 +19,11 @@ enum combos {
|
|||
COMBO_LENGTH
|
||||
};
|
||||
|
||||
|
||||
//their documentation is so confusing because you don't use COMBO_LEN defining the actions
|
||||
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_BUTTON1] = COMBO(mou_btn1_combo, KC_BTN1),
|
||||
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS),
|
||||
[KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||
[KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC),
|
||||
|
|
|
|||
|
|
@ -14,21 +14,6 @@ Intentionally did not convert all the override/autoshit tap holds to this format
|
|||
|
||||
const key_override_t delete_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL);
|
||||
|
||||
const key_override_t media_next_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_MNXT, KC_MPRV, 1<<_NAVIGATION);
|
||||
|
||||
const key_override_t f1_override = ko_make_with_layers(MOD_MASK_CSA, KC_1, KC_F1, 1<<_NUMBER);
|
||||
const key_override_t f2_override = ko_make_with_layers(MOD_MASK_CSA, KC_2, KC_F2, 1<<_NUMBER);
|
||||
const key_override_t f3_override = ko_make_with_layers(MOD_MASK_CSA, KC_3, KC_F3, 1<<_NUMBER);
|
||||
const key_override_t f4_override = ko_make_with_layers(MOD_MASK_CSA, KC_4, KC_F4, 1<<_NUMBER);
|
||||
const key_override_t f5_override = ko_make_with_layers(MOD_MASK_CSA, KC_5, KC_F5, 1<<_NUMBER);
|
||||
const key_override_t f6_override = ko_make_with_layers(MOD_MASK_CSA, KC_6, KC_F6, 1<<_NUMBER);
|
||||
const key_override_t f7_override = ko_make_with_layers(MOD_MASK_CSA, KC_7, KC_F7, 1<<_NUMBER);
|
||||
const key_override_t f8_override = ko_make_with_layers(MOD_MASK_CSA, KC_8, KC_F8, 1<<_NUMBER);
|
||||
const key_override_t f9_override = ko_make_with_layers(MOD_MASK_CSA, KC_9, KC_F9, 1<<_NUMBER);
|
||||
const key_override_t f10_override = ko_make_with_layers(MOD_MASK_CSA, KC_COMM, KC_F10, 1<<_NUMBER);
|
||||
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);
|
||||
|
||||
#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);
|
||||
|
|
@ -41,19 +26,6 @@ const key_override_t ckup_override = ko_make_with_layers(MOD_MASK_SHIFT, C
|
|||
const key_override_t **key_overrides = (const key_override_t *[]) {
|
||||
|
||||
&delete_override,
|
||||
&media_next_override,
|
||||
&f1_override,
|
||||
&f2_override,
|
||||
&f3_override,
|
||||
&f4_override,
|
||||
&f5_override,
|
||||
&f6_override,
|
||||
&f7_override,
|
||||
&f8_override,
|
||||
&f9_override,
|
||||
&f10_override,
|
||||
&f11_override,
|
||||
&f12_override,
|
||||
|
||||
#if defined(HAPTIC_ENABLE)
|
||||
&hfnext_override,
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ void render_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
|||
case _SYMBOL:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), false);
|
||||
break;
|
||||
case _MOUSE:
|
||||
case _MOUSE_FUNC:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), false);
|
||||
break;
|
||||
case _CONFIG:
|
||||
|
|
@ -65,7 +65,7 @@ void render_layer_state_list(uint8_t col, uint8_t line, bool moveCursor) {
|
|||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), get_highest_layer(layer_state) == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), get_highest_layer(layer_state) == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), get_highest_layer(layer_state) == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), get_highest_layer(layer_state) == _MOUSE);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), get_highest_layer(layer_state) == _MOUSE_FUNC);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_6), get_highest_layer(layer_state) == _CONFIG);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# define OLED_RENDER_LAYER_2 "Navigation"
|
||||
# define OLED_RENDER_LAYER_3 "Number "
|
||||
# define OLED_RENDER_LAYER_4 "Symbol "
|
||||
# define OLED_RENDER_LAYER_5 "Mouse "
|
||||
# define OLED_RENDER_LAYER_5 "Mouse+Func"
|
||||
# define OLED_RENDER_LAYER_6 "Config "
|
||||
#else
|
||||
//128x32 are ? x 5 char wide
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
# define OLED_RENDER_LAYER_2 " Nav "
|
||||
# define OLED_RENDER_LAYER_3 " Num "
|
||||
# define OLED_RENDER_LAYER_4 " Sym "
|
||||
# define OLED_RENDER_LAYER_5 " Mou "
|
||||
# define OLED_RENDER_LAYER_5 " MFn "
|
||||
# define OLED_RENDER_LAYER_6 " Cfg "
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue