forked from mirrors/qmk_userspace
Cleaned uppersonal userspace and keymaps (#1998)
* Cleanup of keymaps * Remove Tap Dance from Orthodox keymap * Cleaned up userspace and keymaps * Added sample (template)userspace files to my folder
This commit is contained in:
parent
4df4fa7c26
commit
0533362e82
14 changed files with 219 additions and 147 deletions
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGB_DI_PIN D3
|
||||
#define RGBLED_NUM 7 // Number of LEDs
|
||||
#define RGBLED_NUM 14 // Number of LEDs
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_HUE_STEP 12
|
||||
#define RGBLIGHT_SAT_STEP 12
|
||||
#define RGBLIGHT_VAL_STEP 12
|
||||
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
|
||||
#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
|
||||
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 4
|
||||
#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
|
||||
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
|
||||
|
|
|
|||
|
|
@ -47,10 +47,10 @@ bool check_dtimer(uint8_t dtimer) {
|
|||
|
||||
#ifdef TAP_DANCE_ENABLE
|
||||
enum {
|
||||
TD_DIABLO_1 = 0,
|
||||
TD_DIABLO_2,
|
||||
TD_DIABLO_3,
|
||||
TD_DIABLO_4
|
||||
TD_D3_1 = 0,
|
||||
TD_D3_2,
|
||||
TD_D3_3,
|
||||
TD_D3_4
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -89,10 +89,10 @@ void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
|
|||
//Tap Dance Definitions
|
||||
qk_tap_dance_action_t tap_dance_actions[] = {
|
||||
// tap once to disable, and more to enable timed micros
|
||||
[TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
|
||||
[TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
|
||||
[TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
|
||||
[TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
|
||||
[TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
|
||||
[TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
|
||||
[TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
|
||||
[TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
|
||||
|
||||
};
|
||||
#endif
|
||||
|
|
@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_ESC, _______, _______, _______,\
|
||||
KC_S, KC_F, KC_I, KC_M, \
|
||||
KC_1, KC_2, KC_3, KC_4, \
|
||||
TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), \
|
||||
TD(TD_D3_1), TD(TD_D3_2), TD(TD_D3_3), TD(TD_D3_4), \
|
||||
_______, KC_DIABLO_CLEAR, KC_Q, SFT_T(KC_SPACE) \
|
||||
),
|
||||
#else
|
||||
|
|
@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_OVERWATCH, _______, _______, XXXXXXX,\
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, KC_JUSTGAME, \
|
||||
KC_SYMM, KC_DOOMFIST, KC_TORB, KC_GOODGAME, \
|
||||
KC_SYMM, KC_TORB, XXXXXXX, KC_GOODGAME, \
|
||||
KC_SALT, KC_MORESALT, KC_SALTHARD, KC_GLHF \
|
||||
),
|
||||
[_MEDIA] = KEYMAP( /* Base */
|
||||
|
|
@ -226,7 +226,7 @@ void matrix_init_keymap(void) {
|
|||
|
||||
void matrix_scan_keymap(void) {
|
||||
numlock_led_off();
|
||||
if (is_overwatch && biton32(layer_state) == _MACROS) {
|
||||
if ((is_overwatch && biton32(layer_state) == _MACROS) || (biton32(layer_state) == _NAV)) {
|
||||
numlock_led_on();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
|
|||
RGBLIGHT_ENABLE = yes
|
||||
MIDI_ENABLE = no
|
||||
CONSOLE_ENABLE = no
|
||||
NKRO_ENABLE = yes
|
||||
|
||||
EXTRAFLAGS = -flto
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue