diff options
| author | Drashna Jael're <drashna@live.com> | 2022-11-20 09:20:46 -0800 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-11-20 09:20:46 -0800 |
| commit | 4597e01061f0fe160ddcf67103f427dd4bc5fee3 (patch) | |
| tree | 73bba3cc4bcd0f737ffb39e41d93deefa9e8c864 /users | |
| parent | 6c40a4605793d29d1bae07401006287300c8349d (diff) | |
| parent | 6f8bbb16329d87eacb5bc4091b11a127630bdb06 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
| -rw-r--r-- | users/dshields/config.h | 4 | ||||
| -rw-r--r-- | users/dshields/dshields.h | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/users/dshields/config.h b/users/dshields/config.h index 21a5c3500d..1420a9178f 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -13,9 +13,13 @@ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 +#ifndef MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_TIME_TO_MAX 40 +#endif #define MOUSEKEY_MAX_SPEED 7 +#ifndef MOUSEKEY_WHEEL_DELAY #define MOUSEKEY_WHEEL_DELAY 0 +#endif #undef ENABLE_RGB_MATRIX_ALPHAS_MODS #undef ENABLE_RGB_MATRIX_BREATHING diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h index ca1dc8352e..9ed0310645 100644 --- a/users/dshields/dshields.h +++ b/users/dshields/dshields.h @@ -26,22 +26,35 @@ #define MT_L RALT_T(KC_L) #define MT_SCLN RGUI_T(KC_SCLN) +// layer-tap keys +#if defined KEYBOARD_planck_light \ + || defined KEYBOARD_planck_rev3 \ + || defined KEYBOARD_planck_rev6 \ + || defined KEYBOARD_keyboardio_atreus + #define LT_G LT(LWR, KC_G) + #define LT_H LT(RSE, KC_H) +#elif defined KEYBOARD_keyboardio_model01 + #define LT_G LT(FUN, KC_G) + #define LT_H LT(FUN, KC_H) +#else + #define LT_G KC_G + #define LT_H KC_H +#endif + // LED/RGB controls -#ifdef KEYBOARD_planck_light +#if defined KEYBOARD_planck_light #define LGT_TOG RGB_TOG #define LGT_MOD RGB_MOD #define LGT_BRT _______ #define LGT_INC RGB_HUI #define LGT_DEC RGB_HUD -#endif -#ifdef KEYBOARD_planck_rev3 +#elif defined KEYBOARD_planck_rev3 #define LGT_TOG BL_TOGG #define LGT_MOD BL_STEP #define LGT_BRT BL_BRTG - #define LGT_INC BL_UP - #define LGT_DEC BL_DOWN -#endif -#ifdef KEYBOARD_planck_rev6 + #define LGT_INC BL_INC + #define LGT_DEC BL_DEC +#else #define LGT_TOG _______ #define LGT_MOD _______ #define LGT_BRT _______ |