diff --git a/keyboards/smarwei/wdactyl_combined/keymaps/common_layout.c b/keyboards/smarwei/wdactyl_combined/keymaps/common_layout.c new file mode 100644 index 0000000000..14949e30d2 --- /dev/null +++ b/keyboards/smarwei/wdactyl_combined/keymaps/common_layout.c @@ -0,0 +1,53 @@ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_std( + 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_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, SH_TG, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, TD(TD_UE),KC_Y, TT(3), KC_F24, + KC_ESC, TD(TD_AE),KC_R, TD(TD_SS),KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, TD(TD_OE),KC_CAPS, + CAPSWRD, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH, TT(3), + KC_LGUI, KC_LALT, KC_MINS, KC_EQL, + + MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(2), + KC_LSFT, KC_LSFT, KC_RALT, KC_ENT + + ), + + [1] = LAYOUT_std( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_ESC, KC_WH_U, KC_WBAK, KC_WFWD, KC_MS_U, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, KC_ESC, + _______, KC_TAB, KC_WH_D, KC_LSFT, KC_LCTL, KC_MS_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU, + _______, KC_WH_L, KC_UNDO, KC_CUT, KC_COPY, C(S(KC_V)), KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_R, KC_WH_R, + _______, _______, KC_0, KC_INS, + + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + + ), + + [2] = LAYOUT_std( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, S(KC_2), S(KC_MINS), S(KC_LBRC), S(KC_RBRC),S(KC_6), S(KC_1), S(KC_COMM), S(KC_DOT), KC_EQL, S(KC_7), _______, + _______, KC_NUBS, KC_SLSH, KC_LBRC, KC_RBRC, S(KC_8), S(KC_SLSH), S(KC_9), S(KC_0), KC_MINS, S(KC_SCLN),S(KC_2), + _______, S(KC_3), S(KC_4), S(KC_NUBS), S(KC_GRV), KC_GRV, S(KC_EQL), S(KC_5), S(KC_QUOT), KC_QUOT, KC_SCLN, _______, + _______, _______, _______, _______, + + _______, _______, _______, _______, TO(0), _______, + _______, _______, _______, _______ + ), + + [3] = LAYOUT_std( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, KC_PSCR, KC_7, KC_8, KC_9, TO(0), _______, + _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, KC_0, KC_4, KC_5, KC_6, KC_0, _______, + QK_BOOT, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_0, KC_1, KC_2, KC_3, _______, _______, + _______, _______, _______, _______, + + _______, _______, _______, _______, _______, TO(0), + _______, _______, _______, _______ + ) +}; diff --git a/keyboards/smarwei/wdactyl_combined/keymaps/default/keymap.c b/keyboards/smarwei/wdactyl_combined/keymaps/default/keymap.c index ab8506b447..1180a986a6 100755 --- a/keyboards/smarwei/wdactyl_combined/keymaps/default/keymap.c +++ b/keyboards/smarwei/wdactyl_combined/keymaps/default/keymap.c @@ -2,82 +2,18 @@ // Tap Dance declarations enum { - LAYR, + TD_AE, + TD_OE, + TD_UE, + TD_SS, }; // Tap Dance definitions qk_tap_dance_action_t tap_dance_actions[] = { - // TD(0) = On Tap -> MO(2); On hold -> MO(2); On double tap -> TO(3) - [LAYR] = ACTION_TAP_DANCE_DOUBLE(MO(2), TO(0)), + [TD_AE] = ACTION_TAP_DANCE_DOUBLE(KC_A, RALT(KC_Q)), + [TD_OE] = ACTION_TAP_DANCE_DOUBLE(KC_O, RALT(KC_P)), + [TD_UE] = ACTION_TAP_DANCE_DOUBLE(KC_U, RALT(KC_Y)), + [TD_SS] = ACTION_TAP_DANCE_DOUBLE(KC_S, RALT(KC_S)), }; -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┬───┬───┐ - * │F7 │F8 │F9 │F10│F11|F12| - * ├───┼───┼───┼───┼───┼───┤ - * │ 6 │ 7 │ 8 │ 9 │ 0 |TG | - * ├───┼───┼───┼───┼───┼───| - * │ J │ L │ U │ Y │ ; |F24| - * ├───┼───┼───┼───┼───┼───| - * │ M │ N │ E │ I │ O |CPS| - * ├───┼───┼───┼───┼───┼───| - * │ K │ H │ , │ . │ / |PRT| - * └───┴───┼───┼───┼───┴───┘ - * │ - │ = | - * ┌───┬───┼───┼───┘ - * │RET│SPC│MO1│ - * ├───┼───┼───┘ - * │LUP│LDN│ - * └───┴───┘ - */ - [0] = LAYOUT_std( - 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_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, SH_TG, - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_F24, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_CAPS, - CAPSWRD, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT, - KC_LGUI, KC_LALT, KC_MINS, KC_EQL, - - KC_LCTL, MO(1), KC_LSFT, KC_ENT, TD(0), KC_SPC, - KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT - - ), - - [1] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_ESC, KC_WH_U, KC_WBAK, KC_WFWD, KC_MS_U, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, KC_ESC, - _______, KC_LALT, KC_WH_D, KC_LSFT, KC_LCTL, KC_MS_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU, - _______, KC_WH_L, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_R, KC_WH_R, - _______, _______, KC_0, KC_INS, - - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ - - ), - - [2] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, S(KC_1), S(KC_COMM), S(KC_DOT), KC_EQL, S(KC_7), _______, - _______, _______, _______, _______, _______, _______, S(KC_SLSH), S(KC_9), S(KC_0), KC_MINS, S(KC_SCLN),S(KC_2), - _______, _______, _______, _______, _______, _______, S(KC_EQL), S(KC_5), S(KC_COMM), KC_DOT, KC_SCLN, _______, - _______, _______, _______, _______, - - _______, _______, _______, _______, TO(0), _______, - _______, _______, _______, _______ - ), - - [3] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, _______, _______, _______, _______, _______, KC_PSCR, KC_7, KC_8, KC_9, KC_PPLS, KC_F12, - _______, _______, _______, _______, _______, _______, KC_0, KC_4, KC_5, KC_6, KC_0, _______, - _______, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_COMM, - _______, _______, _______, _______, - - _______, _______, _______, _______, TO(0), _______, - _______, _______, _______, _______ - ) -}; \ No newline at end of file +#include "../common_layout.c" diff --git a/keyboards/smarwei/wdactyl_combined/keymaps/vial/keymap.c b/keyboards/smarwei/wdactyl_combined/keymaps/vial/keymap.c index ef9a865c49..527613d7d8 100755 --- a/keyboards/smarwei/wdactyl_combined/keymaps/vial/keymap.c +++ b/keyboards/smarwei/wdactyl_combined/keymaps/vial/keymap.c @@ -28,56 +28,4 @@ bool caps_word_press_user(uint16_t keycode) { } } - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_std( - 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_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, SH_TG, - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_F24, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_CAPS, - CAPSWRD, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH, TT(3), - KC_LGUI, KC_LALT, KC_MINS, KC_EQL, - - MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_ENT, MO(2), - KC_LSFT, KC_LSHFT, KC_RALT, KC_SPACE - - ), - - [1] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_ESC, KC_WH_U, KC_WBAK, KC_WFWD, KC_MS_U, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, KC_ESC, - _______, KC_LALT, KC_WH_D, KC_LSFT, KC_LCTL, KC_MS_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU, - _______, KC_WH_L, KC_UNDO, KC_CUT, KC_COPY, C(S(KC_V)), KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_R, KC_WH_R, - _______, _______, KC_0, KC_INS, - - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ - - ), - - [2] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, S(KC_MINS), S(KC_LBRC), S(KC_RBRC),S(KC_6), S(KC_1), S(KC_COMM), S(KC_DOT), KC_EQL, S(KC_7), _______, - _______, KC_NUBS, KC_SLSH, KC_LBRC, KC_RBRC, S(8), S(KC_SLSH), S(KC_9), S(KC_0), KC_MINS, S(KC_SCLN),S(KC_2), - _______, S(3), S(4), S(KC_NUBS), S(KC_GRV), KC_GRV, S(KC_EQL), S(KC_5), S(KC_COMM), KC_DOT, KC_SCLN, _______, - _______, _______, _______, _______, - - _______, _______, _______, _______, TO(0), _______, - _______, _______, _______, _______ - ), - - [3] = LAYOUT_std( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, _______, _______, _______, _______, _______, KC_PSCR, KC_7, KC_8, KC_9, KC_PPLS, KC_F12, - _______, _______, _______, _______, _______, _______, KC_0, KC_4, KC_5, KC_6, KC_0, _______, - QK_BOOT, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_COMM, - _______, _______, _______, _______, - - _______, _______, _______, _______, TO(0), _______, - _______, _______, _______, TO(0) - ) -}; \ No newline at end of file +#include "../common_layout.c" \ No newline at end of file