diff --git a/keyboards/ai03/polaris/keymaps/briemens/keymap.c b/keyboards/ai03/polaris/keymaps/briemens/keymap.c index 39b5b3c10..7d4bcae25 100644 --- a/keyboards/ai03/polaris/keymaps/briemens/keymap.c +++ b/keyboards/ai03/polaris/keymaps/briemens/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_60_tsangan_hhkb( /* Base */ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(2,KC_ENT), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_60_tsangan_hhkb( /* Empty for dynamic keymaps */ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,\ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS,\ - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, MO(1),\ KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), KC_RALT, KC_LGUI, KC_LCTL), }; diff --git a/keyboards/converter/usb_usb/keymaps/briemens/keymap.c b/keyboards/converter/usb_usb/keymaps/briemens/keymap.c index 18e47e162..a9dc0d807 100644 --- a/keyboards/converter/usb_usb/keymaps/briemens/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/briemens/keymap.c @@ -41,7 +41,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, KC_HELP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_STOP, KC_AGIN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MENU, KC_UNDO, - LT(3, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY, + LT(3, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, LT(3, KC_ENT), KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_EXEC, KC_PSTE, KC_LCTL, KC_LALT, KC_LGUI, KC_MHEN, KC_HANJ, KC_SPC, KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT ), @@ -50,7 +50,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, KC_HELP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_STOP, KC_AGIN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MENU, KC_UNDO, - LT(3, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY, + LT(3, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, LT(3, KC_ENT), KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_EXEC, KC_PSTE, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ, KC_SPC, KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT ), @@ -70,7 +70,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______, KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, DF(0), DF(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_BSLS, KC_TRNS, ______,______,______, ______,______,______,______, ______,______, KC_TRNS, RCTL(KC_Q), RCTL(KC_W), RCTL(KC_E), RCTL(KC_R), RCTL(KC_T), RCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_TRNS, ______,______,______, ______,______,______,______, ______,______, - KC_TRNS, RCTL(KC_A), RCTL(KC_S), RCTL(KC_D), RCTL(KC_F), RCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, RCTL(RALT(KC_SCOLON)), RCTL(RALT(KC_QUOTE)), KC_BSLS, LGUI(KC_TAB), ______,______,______,______, ______,______, + LCTL(LALT(LGUI(KC_SPC))), RCTL(KC_A), RCTL(KC_S), RCTL(KC_D), RCTL(KC_F), RCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, RCTL(RALT(KC_SCOLON)), RCTL(RALT(KC_QUOTE)), KC_BSLS, LGUI(KC_TAB), ______,______,______,______, ______,______, KC_TRNS, KC_NUBS, RCTL(KC_Z), RCTL(KC_X), RCTL(KC_C), RCTL(KC_V), RCTL(KC_B), RALT(KC_BSPACE), KC_BSPACE, KC_DELETE, RALT(KC_DELETE), LGUI(KC_F), KC_TRNS, KC_TRNS, ______, ______,______,______,______, ______,______, ______, ______, ______, ______, ______, RCTL(RALT(KC_ENT)), ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______, ______,______, ______,______ ), diff --git a/keyboards/doro67/multi/keymaps/briemens/keymap.c b/keyboards/doro67/multi/keymaps/briemens/keymap.c index 215be4e36..4e20aeea1 100644 --- a/keyboards/doro67/multi/keymaps/briemens/keymap.c +++ b/keyboards/doro67/multi/keymaps/briemens/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_65_ansi_blocker( \ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, KC_HOME, \ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS, KC_END, \ - LGUI(KC_TAB), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), KC_PGUP, \ + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), KC_PGUP, \ KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, KC_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ ), diff --git a/keyboards/dztech/dz60rgb/keymaps/briemens/config.h b/keyboards/dztech/dz60rgb/keymaps/briemens/config.h deleted file mode 100644 index 4bfad0df0..000000000 --- a/keyboards/dztech/dz60rgb/keymaps/briemens/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#define dzrgb60_ansi diff --git a/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c b/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c index 4d91e812b..d6ceb1ec7 100644 --- a/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c @@ -1,97 +1,26 @@ #include QMK_KEYBOARD_H -//tapdance declarations -enum { - SFT_LCK -}; -#define _LAYER0 0 -#define _LAYER1 1 -#define _LAYER2 2 -#define _LAYER3 3 -#define _LAYER4 4 -#define SftLck TD(SFT_LCK) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_LAYER0] = LAYOUT_60_ansi( /* Base */ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,\ - LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - SftLck, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,\ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), - [_LAYER1] = LAYOUT_60_ansi( /* FN */ - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,\ - KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ - KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_LAYER2] = LAYOUT_60_ansi( /* FN2 */ - KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS,\ - KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS,\ - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ - KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS,\ - KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), KC_RALT, MO(1) , KC_APP, KC_RCTL), -}; - -void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { - for (int i = 0; i < DRIVER_LED_TOTAL; i++) { - if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { - rgb_matrix_set_color( i, red, green, blue ); - } - } -} - -void rgb_matrix_indicators_user(void) { - return; - uint8_t this_led = host_keyboard_leds(); - if (!g_suspend_state) { - switch (biton32(layer_state)) { - case _LAYER1: - rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break; - case _LAYER2: - rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break; - case _LAYER3: - rgb_matrix_layer_helper(0x00, 0x00, 0xFF, false); break; - case _LAYER4: - rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break; - } - } - if ( this_led & (1<count == 1) { - register_code (KC_LSFT); - } else if (state->count == 2) { - unregister_code (KC_LSFT); - register_code (KC_CAPS); - } -} -void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - unregister_code (KC_LSFT); - } else { - unregister_code (KC_CAPS); - } -} - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - //Tap once for Shift, twice for Caps Lock - [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end ) + [0] = LAYOUT( /* Base */ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(2, KC_ENT), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL + ), + [1] = LAYOUT( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, BL_TOGG,BL_STEP, BL_ON, BL_OFF, BL_INC, BL_DEC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, + KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( /* FN2 */ + KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, + KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS, + LALT(LCTL(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), + KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, KC_TRNS, + KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), LCTL(LALT(KC_ENT)), KC_RALT, MO(1) , KC_APP, KC_RCTL + ), }; diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk index 5c1ab7b11..c9163564b 100644 --- a/keyboards/dztech/dz60rgb/v1/rules.mk +++ b/keyboards/dztech/dz60rgb/v1/rules.mk @@ -28,4 +28,4 @@ RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in HD44780_ENABLE = no # Enable support for HD44780 based LCDs -TAP_DANCE_ENABLE = yes +TAP_DANCE_ENABLE = no diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk index 995d87b12..5b17a5a1e 100644 --- a/keyboards/dztech/dz60rgb/v2/rules.mk +++ b/keyboards/dztech/dz60rgb/v2/rules.mk @@ -29,4 +29,4 @@ RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in HD44780_ENABLE = no # Enable support for HD44780 based LCDs RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix -LAYOUTS = 60_ansi +TAP_DANCE_ENABLE = no diff --git a/keyboards/evyd13/wonderland/keymaps/briemens/keymap.c b/keyboards/evyd13/wonderland/keymaps/briemens/keymap.c index 36b8337fa..902b5754b 100755 --- a/keyboards/evyd13/wonderland/keymaps/briemens/keymap.c +++ b/keyboards/evyd13/wonderland/keymaps/briemens/keymap.c @@ -10,13 +10,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, \ LT(2, KC_ESC), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ - LT(2, KC_ESC), LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + LT(2, KC_ESC), LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(2, KC_ENT), \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ - KC_LCTL, KC_LALT, KC_LGUI, LCTL(KC_LALT), KC_SPC, KC_RALT, KC_RCTRL \ + KC_LCTL, KC_LALT, LGUI_T(KC_SPC), MO(1), KC_SPC, KC_RALT, KC_RCTRL \ ), [_FUNC] = LAYOUT( RGB_TOG, VLK_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, RESET, \ - RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, \ RGB_VAD, XXXXXXX, RGB_MOD, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, \ KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, \ KC_LCTL, KC_LALT, KC_LGUI, _______, _______, KC_RALT, _______ \ @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNC2] = LAYOUT( KC_MUTE, KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,\ KC_VOLU, KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS,\ - KC_VOLD, KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ + KC_VOLD, LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, MO(1),\ KC_LCTL, KC_LALT, KC_LGUI, RGUI(KC_SPC), LCTL(LALT(KC_ENT)), KC_RALT, KC_RCTL) diff --git a/keyboards/fc660c/fc660c.h b/keyboards/fc660c/fc660c.h index fca02dc0e..b2bc7aa44 100644 --- a/keyboards/fc660c/fc660c.h +++ b/keyboards/fc660c/fc660c.h @@ -20,6 +20,7 @@ along with this program. If not, see . #include "quantum.h" #define XXX KC_NO +#define TAPPING_TERM 175 #define LAYOUT( \ k13, k10, k11, k12, k14, k16, k17, k15, k1B, k18, k19, k1A, k1C, k1E, k1F, \ diff --git a/keyboards/fc660c/keymaps/briemens/keymap.c b/keyboards/fc660c/keymaps/briemens/keymap.c index b5a98ae64..372a10858 100644 --- a/keyboards/fc660c/keymaps/briemens/keymap.c +++ b/keyboards/fc660c/keymaps/briemens/keymap.c @@ -16,12 +16,20 @@ */ #include QMK_KEYBOARD_H +//tapdance declarations +enum { + SFT_LCK +}; + +//alias for tapdance +#define SftLck TD(SFT_LCK) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, - LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT, KC_UP, + LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, LT(2, KC_ENT), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, SftLck, KC_UP, KC_LCTL,KC_LALT,KC_LGUI, KC_SPC, KC_RALT,KC_RCTL,MO(1), KC_LEFT,KC_DOWN,KC_RGHT ), [1] = LAYOUT( @@ -34,8 +42,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, _______, KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS, _______, - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, _______, KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), KC_RALT,KC_RCTL,MO(1), _______,_______,_______ ) }; + +// Shift vs capslock function. From bbaserdem's Planck keymap. +void caps_tap (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 1) { + register_code (KC_RSFT); + } else if (state->count == 2) { + unregister_code (KC_RSFT); + register_code (KC_CAPSLOCK); + } +} +void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 1) { + unregister_code (KC_RSFT); + } else { + unregister_code (KC_CAPSLOCK); + } +} + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + //Tap once for Shift, twice for Caps Lock + [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED(caps_tap, NULL, caps_tap_end ) +}; diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk index b1b11676b..d2c776f64 100644 --- a/keyboards/fc660c/rules.mk +++ b/keyboards/fc660c/rules.mk @@ -13,6 +13,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover +TAP_DANCE_ENABLE = yes # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/gray_studio/space65/keymaps/briemens/keymap.c b/keyboards/gray_studio/space65/keymaps/briemens/keymap.c index fea249a62..5735e3a5b 100644 --- a/keyboards/gray_studio/space65/keymaps/briemens/keymap.c +++ b/keyboards/gray_studio/space65/keymaps/briemens/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, \ - LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \ + LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(2, KC_ENT), KC_PGUP, \ KC_LSFT,KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,KC_SPC,KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ ), @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( \ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_HOME, \ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS, KC_END, \ - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), KC_PGUP, \ + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB), KC_PGUP, \ KC_TRNS,KC_TRNS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, KC_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)),LCTL(LALT(KC_ENT)),LCTL(LALT(KC_ENT)), KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ ), diff --git a/keyboards/idb_60/keymaps/briemens/keymap.c b/keyboards/idb/idb_60/keymaps/briemens/keymap.c similarity index 88% rename from keyboards/idb_60/keymaps/briemens/keymap.c rename to keyboards/idb/idb_60/keymaps/briemens/keymap.c index 905a92813..402655b06 100644 --- a/keyboards/idb_60/keymaps/briemens/keymap.c +++ b/keyboards/idb/idb_60/keymaps/briemens/keymap.c @@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,\ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,\ - LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,\ - SftLck, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),\ + LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(2, KC_ENT),\ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),\ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), [1] = LAYOUT( /* FN */ @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( /* Empty for dynamic keymaps */ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_BSLS, KC_TRNS,\ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS,\ - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ KC_TRNS, KC_NUBS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, MO(1),\ KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)), KC_RALT, KC_RGUI, KC_RCTL), }; diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk index 6862c48e4..0a2998f16 100644 --- a/keyboards/idb/idb_60/rules.mk +++ b/keyboards/idb/idb_60/rules.mk @@ -14,3 +14,5 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +BLUETOOTH_ENABLE = no # Enable Bluetooth +TAP_DANCE_ENABLE = yes diff --git a/keyboards/percent/canoe/keymaps/briemens/keymap.c b/keyboards/percent/canoe/keymaps/briemens/keymap.c index 2c813ee9e..48b1e9395 100644 --- a/keyboards/percent/canoe/keymaps/briemens/keymap.c +++ b/keyboards/percent/canoe/keymaps/briemens/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PAUS, \ KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, RESET, KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, \ - KC_LSFT, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, BL_TOGG,BL_STEP, BL_ON, BL_OFF, BL_INC,BL_DEC, BL_BRTG, KC_NO, KC_RSFT, KC_PGUP, KC_END, \ + KC_LSFT, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_INC, BL_DEC, BL_BRTG, KC_NO, KC_RSFT, KC_PGUP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_RALT, KC_TRNS, KC_HOME, KC_PGDOWN,KC_END) }; diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/briemens/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/briemens/keymap.c index 341c25646..ee92c95e0 100644 --- a/keyboards/westfoxtrot/cypher/rev5/keymaps/briemens/keymap.c +++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/briemens/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MA] = LAYOUT_all( /* Base */ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, - LT(_F2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,KC_NO, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PEQL, + LT(_F2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,KC_NO, LT(_F2, KC_ENT), KC_P4, KC_P5, KC_P6, KC_PEQL, KC_LSFT,KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,KC_SPC,KC_SPC, KC_RALT,KC_RALT,MO(_F1), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0, KC_COMM, KC_BSPC), @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_F2] = LAYOUT_all( /* Empty for dynamic keymaps */ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_BSLS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,\ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS,\ - KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), KC_BSLS, LGUI(KC_TAB), KC_P4, KC_P5, KC_P6, KC_PEQL,\ + LCTL(LALT(LGUI(KC_SPC))), LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), KC_BSLS, LGUI(KC_TAB), KC_P4, KC_P5, KC_P6, KC_PEQL,\ KC_TRNS, KC_NUBS, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), LALT(KC_BSPACE), KC_BSPACE, KC_DELETE, LALT(KC_DELETE), LGUI(KC_F), KC_TRNS, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,\ KC_LCTL, KC_LALT, KC_LGUI, LCTL(LALT(KC_ENT)),LCTL(LALT(KC_ENT)),LCTL(LALT(KC_ENT)), KC_RALT,KC_RALT,MO(_F1), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0, KC_PDOT, KC_BSPC),