diff options
Diffstat (limited to 'keyboards/thevankeyboards/minivan')
17 files changed, 22 insertions, 835 deletions
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c index bc820230e3..fb86bda7a9 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c @@ -214,9 +214,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SWTCH: SEND_STRING(SS_DOWN(X_LGUI)); - SEND_STRING(SS_DOWN(X_LSHIFT)); + SEND_STRING(SS_DOWN(X_LSFT)); SEND_STRING(SS_TAP(X_ENTER)); - SEND_STRING(SS_UP(X_LSHIFT)); + SEND_STRING(SS_UP(X_LSFT)); SEND_STRING(SS_UP(X_LGUI)); return false; } diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c index 780694f335..0600856660 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QW] = LAYOUT_arrow( /* Qwerty */ LT4_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT3_ESC, KC_A, KC_S, KC_D, LT(3,KC_F), LT(4,KC_G), KC_H, KC_J, KC_K, KC_L, TD(TD1), TD(TD2), - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), KC_SFTENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), SC_SENT, KC_LCTL, KC_LGUI, KC_LALT, LT(_L2,KC_ENT), LT(_L1,KC_SPC), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [_L1] = LAYOUT_arrow( /* LAYER 1 */ diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c deleted file mode 100644 index acf01cd9a4..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c +++ /dev/null @@ -1,419 +0,0 @@ -#include QMK_KEYBOARD_H - -extern keymap_config_t keymap_config; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -#define _QWERTY 0 -#define _COLEMAK 1 -#define _DVORAK 2 -#define _LOWER 3 -#define _RAISE 4 -#define _PLOVER 5 -#define _TOUCHCURSOR 6 -#define _MOUSECURSOR 7 -#define _ADJUST 16 - -// Keycodes -enum planck_keycodes { - QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, - PLOVER, - LOWER, - RAISE, - BACKLIT, - EXT_PLV -}; - -enum macro_keycodes { - KC_ALT_TAB, - KC_CMD_TAB, - KC_CTL_TAB, - KC_CMD_SLSH, - KC_AG_FIND, - KC_AG_AGAIN, - KC_AG_UNDO, - KC_AG_CUT, - KC_AG_COPY, - KC_AG_PASTE, - KC_AG_DESK_L, - KC_AG_DESK_R, - KC_AG_TAB_C, - KC_AG_TAB_N, - KC_AG_TAB_R, -}; - -// Custom macros -#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl -#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift -#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper -#define GUI_SEM GUI_T(KC_SCLN) // Tap for Semicolon, hold for GUI -#define ALT_QUO ALT_T(KC_QUOT) // Tap for Quote, hold for Alt -// Requires KC_TRNS/_______ for the trigger key in the destination layer -#define LT_TC LT(_TOUCHCURSOR, KC_SPC) // L-ayer T-ap T-ouch C-ursor -#define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor -#define ALT_TAB M(KC_ALT_TAB) // Macro for Alt-Tab -#define CMD_TAB M(KC_CMD_TAB) // Macro for Cmd-Tab -#define CTL_TAB M(KC_CTL_TAB) // Macro for Ctl-Tab -#define CMD_SLSH M(KC_CMD_SLSH) // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility) -#define AG_FIND M(KC_AG_FIND) // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings -#define AG_AGAIN M(KC_AG_AGAIN) -#define AG_UNDO M(KC_AG_UNDO) -#define AG_CUT M(KC_AG_CUT) -#define AG_COPY M(KC_AG_COPY) -#define AG_PASTE M(KC_AG_PASTE) -#define AG_D_L M(KC_AG_DESK_L) // For Virtual Desktop Switching: Left, and -#define AG_D_R M(KC_AG_DESK_R) // Right -#define AG_T_C M(KC_AG_TAB_C) // For Chrome, etc. Tab Close, -#define AG_T_N M(KC_AG_TAB_N) // Tab New, and -#define AG_T_R M(KC_AG_TAB_R) // Tab Reopen Closed - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Qwerty - * - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_QWERTY] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - CTL_ESC , KC_A, KC_S,LT_MC(KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, GUI_SEM, ALT_QUO , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Colemak - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * |Hyper/Tab| Q | W | F | P | G | J | L | U | Y | ; | Bksp | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | Ctrl/Esc | A | R | MC/S | T | D | H | N | E | I | O | " | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | Shift | Z | X | C | V | B | K | M | , | . | / | Sft/Ent | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_COLEMAK] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - CTL_ESC , KC_A, KC_R,LT_MC(KC_S), KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Dvorak - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * |Hyper/Tab| " | , | . | P | Y | F | G | C | R | L | Bksp | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | Ctrl/Esc | A | O | MC/E | U | I | D | H | T | N | S | / | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | Shift | ; | Q | J | K | X | B | M | W | V | Z | Sft/Ent | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_DVORAK] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - CTL_ESC , KC_A, KC_O,LT_MC(KC_E), KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - KC_LSFT , KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Lower - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Brite | | | | | | Vol- | Mute | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_LOWER] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - KC_LBRC , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - KC_RBRC , KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - BACKLIT , _______ , _______ , _______ , _______ , _______ , KC_VOLD , KC_MUTE ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Raise - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Brite | | | | | | Vol- | Mute | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_RAISE] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - KC_DLR , KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - KC_EQL , KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_BSLS , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - BACKLIT , _______ , _______ , _______ , _______ , _______ , KC_VOLD , KC_MUTE ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | | | | | | | | | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - * - * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't - * seem to work on Mac. Presumably they'll work under Windows. - */ - -[_TOUCHCURSOR] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______ , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - _______ ,KC_LALT, KC_SPC, AG_T_C, AG_FIND,AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, AG_D_L, AG_D_R , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - _______ ,AG_UNDO, AG_CUT, AG_COPY,AG_PASTE, KC_GRV, KC_PGDN, KC_DEL, AG_T_N, AG_T_R,CMD_SLSH, _______ , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Mouse Layer - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | | | | | | | | | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ - -[_MOUSECURSOR] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______ , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - _______ ,KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_BTN5 , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - _______ ,_______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3, _______ , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Plover layer (http://opensteno.org) - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | # | # | # | # | # | # | # | # | # | # | # | # | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | | S | T | P | H | * | * | F | P | L | T | D | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | TogOut | S | K | W | R | * | * | R | B | G | S | Z | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | Exit | A | O | | | E | U | | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ - -[_PLOVER] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - KC_1 , KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - XXXXXXX , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - XXXXXXX , KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - EXT_PLV , KC_C , KC_V , XXXXXXX , XXXXXXX , KC_N , KC_M , XXXXXXX ), -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ - -/* Adjust (Lower + Raise) - * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - * | | | | | | | | | | | | Del | - * |---------`------`------`------`------`------`------`------`------`------`------`-------------| - * | | | | | |AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | - * |----------`------`------`------`------`------`------`------`------`------`------`------------| - * | | | | | | | | | | | | | - * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - * | | | | | | | | Reset | - * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' - */ -[_ADJUST] = LAYOUT( -/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ - _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , -/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ - _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______ , -/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ - _______ ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , -/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ - _______ , _______ , _______ , _______ , _______ , _______ , _______ , QK_BOOT ) -/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ -}; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - default_layer_set(1UL<<_QWERTY); - } - return false; - break; - case COLEMAK: - if (record->event.pressed) { - default_layer_set(1UL<<_COLEMAK); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - default_layer_set(1UL<<_DVORAK); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case BACKLIT: - if (record->event.pressed) { - register_code(KC_RSFT); - #ifdef BACKLIGHT_ENABLE - backlight_step(); - #endif - } else { - unregister_code(KC_RSFT); - } - return false; - break; - case PLOVER: - if (record->event.pressed) { - layer_off(_RAISE); - layer_off(_LOWER); - layer_off(_ADJUST); - layer_on(_PLOVER); - if (!eeconfig_is_enabled()) { - eeconfig_init(); - } - keymap_config.raw = eeconfig_read_keymap(); - keymap_config.nkro = 1; - eeconfig_update_keymap(keymap_config.raw); - } - return false; - break; - case EXT_PLV: - if (record->event.pressed) { - layer_off(_PLOVER); - } - return false; - break; - } - return true; -} - -/* - * Macro definition - */ -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - if (!eeconfig_is_enabled()) { - eeconfig_init(); - } - - bool use_cmd = true; // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc. - // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in: - // quantum/quantum.c - if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) { - use_cmd = false; // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc. - } - - switch (id) { - case KC_ALT_TAB: - if(use_cmd) { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } - else { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } - case KC_CMD_TAB: - if(use_cmd) { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } - else { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } - - case KC_CTL_TAB: - return (record->event.pressed ? MACRO( D(LCTRL), D(TAB), END ) : MACRO( U(TAB), END )); - case KC_CMD_SLSH: - return (record->event.pressed ? MACRO( D(LGUI), D(SLSH),END ) : MACRO( U(SLSH),END )); - - case KC_AG_FIND: - return use_cmd ? MACRODOWN( D(LGUI), T(F), END ) : MACRODOWN( D(LCTRL), T(F), END ); - case KC_AG_AGAIN: - return use_cmd ? MACRODOWN( D(LGUI), T(G), END ) : MACRODOWN( D(LCTRL), T(G), END ); - case KC_AG_UNDO: - return use_cmd ? MACRODOWN( D(LGUI), T(Z), END ) : MACRODOWN( D(LCTRL), T(Z), END ); - case KC_AG_CUT: - return use_cmd ? MACRODOWN( D(LGUI), T(X), END ) : MACRODOWN( D(LCTRL), T(X), END ); - case KC_AG_COPY: - return use_cmd ? MACRODOWN( D(LGUI), T(C), END ) : MACRODOWN( D(LCTRL), T(C), END ); - case KC_AG_PASTE: - return use_cmd ? MACRODOWN( D(LGUI), T(V), END ) : MACRODOWN( D(LCTRL), T(V), END ); - - case KC_AG_DESK_L: - return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(SCLN), END ) : MACRODOWN( D(LALT), D(LCTRL), T(SCLN), END ); - case KC_AG_DESK_R: - return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(QUOT), END ) : MACRODOWN( D(LALT), D(LCTRL), T(QUOT), END ); - - case KC_AG_TAB_C: - return use_cmd ? MACRODOWN( D(LGUI), T(W), END ) : MACRODOWN( D(LCTRL), T(W), END ); - case KC_AG_TAB_N: - return use_cmd ? MACRODOWN( D(LGUI), T(T), END ) : MACRODOWN( D(LCTRL), T(T), END ); - case KC_AG_TAB_R: - return use_cmd ? MACRODOWN( D(LGUI), D(LSHIFT), T(T), END ) : MACRODOWN( D(LCTRL), D(LSHIFT), T(T), END ); - } - - return MACRO_NONE; -} diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md deleted file mode 100644 index f781d55558..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md +++ /dev/null @@ -1,129 +0,0 @@ -jeebak's TV44 layout -======================= -NOTE: This is a port of jeebak's planck layout, for tv44. - -This WIP keymap attempts to minimize fingers straying away from the home row. -To aid in this endeavor, when additional modifyer keys to switch layers are -needed, they will be mapped to home row keys. The `keymap.c` file will contain -the exact changes. The diagrams in this README shows the highlights of the -changes from the default mappings. - -I also decided to change all calls to `persistent_default_layer_set()` to -`default_layer_set()` since this is my personal perference. - -## Macros -``` -#define ALT_TAB M(KC_ALT_TAB) -``` - -## Base Layers (Qwerty/Colemak/Dvorak) -These base layers are mostly the same as the default mappings. The interesting -changes are shown below. - -- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held, -- `GUI/;` as `;` and `GUI`, -- `Alt/"` as `"` and `Alt`, -- `Sft/Ent` as `Enter` and `Shift`, and -- `Hyper/Tab` as `Tab` and `Hyper` - -A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped. -The arrow keys, which have been moved to the -[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been -replaced with the Media keys as shown. The `MC/kc` key activates the -`MouseCursor` layer when held, and emits the corresponding `kc` for its layer, -when tapped. -``` - ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | Bksp | - |---------`------`------`------`------`------`------`------`------`------`------`-------------| - | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | - |----------`------`------`------`------`------`------`------`------`------`------`------------| - | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | - |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | - `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' -``` - -## Lower Layer (Symbols and Function Keys) -The symbols and functions keys are essentially the same as the default mapping. -The most notable changes are that the symbol keys from the `RAISE` layer have -been moved here. The remaining Media keys replace those that are now on the -base layers. The `BACKLIT` key has also been moved here. -``` - ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - |---------`------`------`------`------`------`------`------`------`------`------`-------------| - | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | - |----------`------`------`------`------`------`------`------`------`------`------`------------| - | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | - |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - | Brite | | | | | | Vol- | Mute | - `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' -``` - -## Raise Layer (Numbers and Arithmetic Operators) -All of the numbers and arithmetic operators are available on this layer. Some -keys are duplicated for the convenience of their positions. The `0` and `$` -keys at the far left are for quick access to beginning and end of line in vim. -``` - ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - |---------`------`------`------`------`------`------`------`------`------`------`-------------| - | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | - |----------`------`------`------`------`------`------`------`------`------`------`------------| - | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | - |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - | Brite | | | | | | Vol- | Mute | - `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' -``` - -## TouchCursor layer plus personal customizations -[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key -as the modifier, with the `IJKL` home row keys representing the inverted-T of -the arrow keys. All of the default TouchCursor keymappings for the right hand -are represented below. My personalizations include all of the keys shown for -the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key -from the base layers) readily accessible from the home row allows quick word -jumps and highlighting when used in conjunction with the arrow keys. The -`Alt-Tab` macro is not only useful under Windows, but also under Mac when used -with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch). -The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in -this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN` -keycodes do not seem to work. There are macros in place that'll "automatically" -choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`, -etc.) depending on which layout you've currently selected (`AG_NORM` or -`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I -use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and -`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as -Google Chrome. -``` - ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | - |---------`------`------`------`------`------`------`------`------`------`------`-------------| - | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | - |----------`------`------`------`------`------`------`------`------`------`------`------------| - | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | - |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - | | | | | | | | | - `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' -``` - -## Mouse Layer -The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer. -The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the -mouse from the `doc/keycode.txt` file are represented, and logically located, -IMHO. The left and right click buttons are duplicated; on the right hand side, -for a quick click here and there, and again on the left hand side for when the -buttons need to be held for dragging things or highlighting text, thus allowing -the right hand to be free to use the up/down/left/right actions. -``` - ,---------+------+------+------+------+------+------+------+------+------+------+-------------. - | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | - |---------`------`------`------`------`------`------`------`------`------`------`-------------| - | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | - |----------`------`------`------`------`------`------`------`------`------`------`------------| - | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | - |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| - | | | | | | | | | - `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' -``` diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk deleted file mode 100644 index 93e7cd8bb7..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c index 7674038a46..ae3619859a 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c @@ -4,7 +4,7 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_arrow_command( /* Qwerty */ - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT(2, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_UP, MT(MOD_RSFT, KC_SLSH), KC_LCTL, KC_LGUI, KC_LALT, MO(3), LT(1, KC_SPC), LT(1, KC_SPC), MO(4), KC_LEFT, KC_DOWN, KC_RIGHT diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c index b4dd5f3ee3..b54af62011 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c +++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c @@ -121,7 +121,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. , TRANS_MIDLEFT # endif - , KC_NUMLOCK , KC_KP_0 + , KC_NUM , KC_KP_0 // ---⬇ // Note anomaly: the additional 'arrow' hardware key is shifted one to the // left, compared to other Base layouts, and so is TRANS_RIGHT This is to @@ -306,7 +306,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. , TRANS_MIDLEFT # endif - , KC_NUMLOCK , KC_KP_0 + , KC_NUM , KC_KP_0 // See comment on the first layout in this file (double handed Base layer), about the next few keys: // ---⬇ diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c index 057561a473..92356446fd 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c @@ -1191,8 +1191,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // <pink2 , <pinky , <ring , <middl , <index , <indx2 |, indx2> , index> , middl> , ring> , pinky> , pink2> , // , , , , -*- , <|,> , , , , , , CTO_BASE , COUNT_TOG , COUNT_NULL , COUNT_WORDMIN , COUNT_REPORT , SPEED_TOG , SPEED_REPORT , KC_MPLY , KC_MNXT , KC_MPRV , KC_MSTP , KC_RSFT , - KC_CAPS , C_KC_PWR , C_KC_WAKE , C_KC_SLEP , C_KC_PAUS , KC_SLCK , KC_PSCR , XXXXXXX , KC_VOLU , KC_VOLD , KC_MUTE , KC_INS , - XP_DRA_CG , UNICODE_MODE_LNX , UNICODE_MODE_BSD , UNICODE_MODE_OSX , UNICODE_MODE_WIN , UNICODE_MODE_WINC , XXXXXXX , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP , + KC_CAPS , C_KC_PWR , C_KC_WAKE , C_KC_SLEP , C_KC_PAUS , KC_SCRL , KC_PSCR , XXXXXXX , KC_VOLU , KC_VOLD , KC_MUTE , KC_INS , + XP_DRA_CG , UC_LINX , UC_BSD , UC_MAC , UC_WIN , UC_WINC , XXXXXXX , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP , // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- LEDS_ON # ifdef TRANSMINIVAN_LEFTSIDE @@ -1289,7 +1289,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { , TRANS_MIDLEFT # endif - , KC_NUMLOCK , XXXXXXX , KC__YGUI + , KC_NUM , XXXXXXX , KC__YGUI # ifdef TRANSMINIVAN_RIGHTSIDE , TRANS_RIGHT @@ -1381,7 +1381,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { , TRANS_MIDLEFT # endif - , KC_NUMLOCK , KC_KP_0 + , KC_NUM , KC_KP_0 // See comment in ./base_numpad.c on the first layout (double handed Base layer), about the next few keys: // This layer follows that layout Base Numpad. diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c index cfcf765a08..8372ae4cd1 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c +++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c @@ -90,7 +90,7 @@ void unicode_hex2output (long unsigned int unshifted, long unsigned int shifted) bitmove *= 0x10; // next digit } - SEND_STRING ( SS_DOWN(X_LCTRL) SS_DOWN(X_LSHIFT) "f" SS_UP(X_LSHIFT) SS_UP(X_LCTRL) ); // lead-in for Unicode on Linux, 'descramble' mode + SEND_STRING ( SS_DOWN(X_LCTL) SS_DOWN(X_LSFT) "f" SS_UP(X_LSFT) SS_UP(X_LCTL) ); // lead-in for Unicode on Linux, 'descramble' mode send_string (output + index); // pointer to argument with formatted string SEND_STRING ( " " ); // Ends the Unicode numerical input mode } @@ -652,7 +652,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // Shift detection system. // Disused because it turned out 'one shot' like Unicode input. Shift detection copied from. // https://github.com/kyleterry/qmk_firmware/blob/master/quantum/quantum.c - //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)); + //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)); // Crude but self contained in this source file shift detection. // ... right shift diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c index 98d0f63858..2bdf303e9f 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c @@ -4,15 +4,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT - (KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + (QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LT(1,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(1,KC_QUOT), - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_ENT, KC_SPC, TG(2), LT(3,KC_APP), KC_DEL), [1] = LAYOUT (KC_CAPS, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, KC_UNDS, KC_P7, KC_P8, KC_P9, KC_EQL, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, - KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NLCK, + KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NUM, KC_TRNS, KC_TRNS, KC_MSTP, KC_PENT, KC_P0, KC_PDOT, KC_APP, KC_TRNS), [2] = LAYOUT @@ -25,5 +25,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { (KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, - BL_TOGG, BL_DEC, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT) + BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT) }; diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c index 4403dd662a..3b146b8e37 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c @@ -35,7 +35,7 @@ enum tapdances{ // Layer Mode aliases #define KC_TBSF LSFT_T(KC_TAB) -#define KC_ROSF RSFT_T(KC_RO) +#define KC_ROSF RSFT_T(JP_BSLS) #define KC_ALAP LALT_T(KC_APP) // Layer tap @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //,-----------------------------------------------------------------------------------------------------------. // F1 F2 F3 F4 F5 - ^ \ @ [ Delete - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC, KC_DEL, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, JP_YEN, KC_LBRC, KC_RBRC, KC_DEL, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| // F6 F7 F8 F9 F10 ; : ] _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS, _______, @@ -133,12 +133,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KANJI: if (record->event.pressed) { if (keymap_config.swap_lalt_lgui == false) { - register_code(KC_LANG2); + register_code(KC_LNG2); } else { SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG2); + unregister_code(KC_LNG2); } break; #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk index 14e9b00763..ee773b7e0a 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk @@ -20,6 +20,5 @@ TAP_DANCE_ENABLE = yes LED_ANIMATIONS = yes # LED animations ifeq ($(strip $(LED_ANIMATIONS)), yes) - # OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h b/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h deleted file mode 100644 index e89a3ea125..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -// place overrides here -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B2 - #define BACKLIGHT_LEVELS 7 -#endif - -#define USB_MAX_POWER_CONSUMPTION 50 - -#endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c deleted file mode 100644 index 2414faf62d..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c +++ /dev/null @@ -1,188 +0,0 @@ -//Author: mike terhar -#include QMK_KEYBOARD_H - -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif - -enum minivan_layers { - _QWERTY, - _NUMSYM, - _FKEYS, - _FKEYGRV, - _PLOVER, - _ADJUST -}; - -enum planck_keycodes { - QWERTY = SAFE_RANGE, - DYNKEY, - DYNAMIC_MACRO_RANGE, -}; - -#define FKEYS LT(_FKEYS, KC_TAB) -#define NUMSYM TT(_NUMSYM) -#define FKEYGRV LT(_FKEYS, KC_GRV) -#define MACSLEEP M(5) -#define PLOVER M(6) -#define LAYERRESET M(7) -#define BACKLIT M(8) -#define ADJUST M(9) - -#include "dynamic_macro.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_QWERTY] = { - {FKEYS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {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_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,SFT_T(KC_ENT) }, - {KC_LCTL,KC_LALT,KC_LGUI, KC_SPC,XXXXXXX,XXXXXXX,XXXXXXX,NUMSYM,KC_LEFT,KC_DOWN,KC_UP ,KC_RIGHT} -}, -[_NUMSYM] = { - {FKEYGRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, - {KC_DEL,KC_EXLM, KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, ADJUST }, - { _______, KC_UNDS,KC_PLUS, KC_LCBR,KC_RCBR,KC_PIPE , KC_MINS,KC_EQL,KC_LBRC, KC_RBRC, KC_BSLS, _______}, - {_______,_______,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END} -}, -[_FKEYS] ={ - {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______}, - {KC_DEL, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, _______, _______, MACSLEEP, DYN_REC_START1, DYN_REC_START2 }, - {KC_CAPS, _______, _______, _______, _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,_______,DYN_REC_STOP}, - {_______,_______,_______,LAYERRESET,XXXXXXX,XXXXXXX,XXXXXXX,LAYERQK_BOOT, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} -}, -[_PLOVER] = { - {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, - {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, - {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {LAYERRESET, XXXXXXX, KC_C, KC_V, XXXXXXX , XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} -}, -[_ADJUST] = { - {_______ , QK_BOOT, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_PSCR, KC_DEL }, - {_______ , _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, _______, MACSLEEP, PLOVER, _______}, - {_______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {BACKLIT, _______, _______, LAYERRESET, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______} -} -}; - -#ifdef AUDIO_ENABLE - -float tone_startup[][2] = SONG(STARTUP_SOUND); -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -float tone_dyn_macro_rec[][2] = SONG(DVORAK_SOUND); -float tone_dyn_macro_play[][2] = SONG(COLEMAK_SOUND); -float tone_plover[][2] = SONG(PLOVER_SOUND); -float tone_adjust[][2] = SONG(PLOVER_GOODBYE_SOUND); -float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); - -float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case 5: // MACSLEEP - if (record->event.pressed) { - register_code(KC_RSFT); - register_code(KC_RCTL); - register_code(KC_POWER); - unregister_code(KC_POWER); - unregister_code(KC_RCTL); - unregister_code(KC_RSFT); - } - break; - case 6: // PLOVER - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - stop_all_notes(); - PLAY_SONG(tone_plover); - #endif - layer_off(_NUMSYM); - layer_off(_FKEYS); - layer_off(_ADJUST); - layer_on(_PLOVER); - } - break; - case 7: // LAYERRESET - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - layer_off(_NUMSYM); - layer_off(_FKEYS); - layer_off(_PLOVER); - layer_off(_ADJUST); - } - break; - case 8: // BACKLIT - if (record->event.pressed) { - register_code(KC_RSFT); - #ifdef BACKLIGHT_ENABLE - backlight_step(); - #endif - } else { - unregister_code(KC_RSFT); - } - break; - case 9: // ADJUST - if(record->event.pressed) { - #ifdef AUDIO_ENABLE - stop_all_notes(); - PLAY_SONG(tone_adjust); - #endif - layer_off(_NUMSYM); - layer_off(_FKEYS); - layer_off(_PLOVER); - layer_on(_ADJUST); - } - } - return MACRO_NONE; -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - uint16_t macro_kc = keycode; - if (keycode == FKEYS || keycode == ADJUST || keycode == FKEYGRV ){ - macro_kc = DYN_REC_STOP; - } - if (!process_record_dynamic_macro(macro_kc, record)) { - return false; - } - - return true; -} - -void matrix_init_user(void) { - #ifdef AUDIO_ENABLE - startup_user(); - #endif -} - -#ifdef AUDIO_ENABLE - -void startup_user() -{ - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); -} - -void shutdown_user() -{ - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); -} - -void music_on_user(void) -{ - music_scale_user(); -} - -void music_scale_user(void) -{ - PLAY_SONG(music_scale); -} -#endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md deleted file mode 100644 index c86985f6cb..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md +++ /dev/null @@ -1,26 +0,0 @@ -# Mike's Minivan - -- Arrow Layout (45key) -- Dynamic Macros -- Media Keys -- Works with iPhone Camera Adapter - -## Layers - -Qwerty for letters and mods. - -Numsym for all numbers and symbols used in typing. Follows a similar approach to -planck but puts both on the same layer eschewing the F-keys. - -Fkeys layer is for the seldom used stuff like F-keys and some additional features -such as dynamic macros, media keys, and a sleep shortcut for OS X. - -Adjust layer is tough to get to so it is only for keyboard configuration stuff. - -## Dynamic Macros - -Hold TAB key, then press ";" to record macro 1 and "'" to record macro 2. - -When you are done recording, press TAB again. - -For playback of macros, TAB+"," plays macro 1 and TAB+","plays macro 2. diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk deleted file mode 100644 index 0a249a3352..0000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c index efba49e1ea..dc15779a17 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c @@ -64,7 +64,7 @@ WINDOW_SHORTCUT, KC_LGUI,KC_LALT, LOWER, RAISE, KC_QUOT, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LGUI,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,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, -MAC_SHORTCUT, KC_LALT, KC_LCTRL, LOWER, RAISE, KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT +MAC_SHORTCUT, KC_LALT, KC_LCTL, LOWER, RAISE, KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT ), /* LOWER * ,--------------------------------------------------------------------------. @@ -114,7 +114,7 @@ XXXXXXX,_______,_______, _______,_______, KC_END, KC_LEFT, [_WINDOW_SHORTCUT] = LAYOUT_arrow( KC_ESC ,LALT(KC_F4) ,LGUI(KC_UP) ,XXXXXXX ,XXXXXXX,S(KC_CAPS) ,XXXXXXX ,KC_PGUP,KC_UP ,KC_PGDN ,KC_PSCR,KC_DEL, _______,LGUI(KC_LEFT) ,LGUI(KC_DOWN) ,LGUI(KC_RIGHT),XXXXXXX,LALT(KC_CAPS) ,KC_CAPS ,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX, -_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX ,XXXXXXX,LCTL(KC_CAPS) ,KC_SLCK ,KC_HOME,XXXXXXX,KC_END ,XXXXXXX,KC_RCTL, +_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX ,XXXXXXX,LCTL(KC_CAPS) ,KC_SCRL ,KC_HOME,XXXXXXX,KC_END ,XXXXXXX,KC_RCTL, _______,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)), LCTL(LALT(KC_DEL)) ,LGUI(LCTL(KC_F4)), MOUSE ,XXXXXXX ,XXXXXXX,BACKLIT ), /* Mac Shortcut |