From a336c2c5005251e4cb0f3a62ccabdb4cfccad915 Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 6 Dec 2022 17:10:48 +0800 Subject: Merge upstream master to 2022 Q4 breaking change --- keyboards/planck/keymaps/matrixman/keymap.c | 54 --------------- keyboards/planck/keymaps/matrixman/readme.md | 100 --------------------------- 2 files changed, 154 deletions(-) delete mode 100644 keyboards/planck/keymaps/matrixman/keymap.c delete mode 100644 keyboards/planck/keymaps/matrixman/readme.md (limited to 'keyboards/planck/keymaps/matrixman') diff --git a/keyboards/planck/keymaps/matrixman/keymap.c b/keyboards/planck/keymaps/matrixman/keymap.c deleted file mode 100644 index ad4844116e..0000000000 --- a/keyboards/planck/keymaps/matrixman/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ -#include QMK_KEYBOARD_H - -// http://www.keyboard-layout-editor.com/#/gists/eb0696806831fc0d93c9 - -#define _PROSE 0 -#define _SYMB_L 1 -#define _SYMB_R 2 -#define _NAV_L 3 -#define _NAV_R 4 -#define _NAV_ALT 5 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_PROSE] = LAYOUT_planck_grid( - LT(_NAV_L,KC_Q), KC_W, KC_E, KC_R, KC_T, KC_DELETE, KC_BSPC, KC_Y, KC_U, KC_I, KC_O, LT(_NAV_R,KC_P) - ,KC_A, KC_S, KC_D, KC_F, KC_G, CTL_T(KC_ESC), CTL_T(KC_SCLN), KC_H, KC_J, KC_K, KC_L, KC_QUOT - ,SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALT_T(KC_TAB), ALT_T(KC_INS), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) - ,KC_LCTL, KC_LGUI, LM(_NAV_ALT, MOD_LALT), KC_TAB, LT(_SYMB_L, KC_ESC), KC_LSFT, KC_LSFT, LT(_SYMB_R,KC_SPC), KC_BSPC, LM(_NAV_ALT, MOD_LALT), KC_RCTL, KC_ENT -), - // accessed via the left symb-layer key, includes a semicolon where the right symb-layer key was -[_SYMB_L] = LAYOUT_planck_grid( - KC_GRV, KC_TILD, KC_ASTR, KC_AMPR, KC_SLSH, LSFT(KC_COMM), LSFT(KC_DOT), KC_BSLS, KC_7, KC_8, KC_9, KC_PIPE - ,KC_UNDS, KC_CIRC, KC_PERC, KC_DLR, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_4, KC_5, KC_6, KC_MINS - ,KC_EQL , KC_HASH, KC_AT, KC_EXLM, KC_LCBR, KC_TRNS, KC_TRNS, KC_RCBR, KC_1, KC_2, KC_3, KC_PLUS - ,LSFT(KC_QUOT), KC_TRNS, KC_COMM, LSFT(KC_SLSH), KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_0, KC_DOT, KC_DOT, KC_TRNS -), - // accessed via the right symb-layer key, includes a colon where the left symb-layer key was -[_SYMB_R] = LAYOUT_planck_grid( - KC_GRV, KC_TILD, KC_ASTR, KC_AMPR, KC_SLSH, LSFT(KC_COMM), LSFT(KC_DOT), KC_BSLS, KC_7, KC_8, KC_9, KC_PIPE - ,KC_UNDS, KC_CIRC, KC_PERC, KC_DLR, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_4, KC_5, KC_6, KC_MINS - ,KC_EQL , KC_HASH, KC_AT, KC_EXLM, KC_LCBR, KC_TRNS, KC_TRNS, KC_RCBR, KC_1, KC_2, KC_3, KC_PLUS - ,LSFT(KC_QUOT), KC_TRNS, KC_COMM, LSFT(KC_SLSH), KC_COLN, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_TRNS, KC_TRNS -), - // accessed via the left nav-layer key, includes a F10 where the right nav-layer key was -[_NAV_L] = LAYOUT_planck_grid( - KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, QK_BOOT, BL_STEP, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 - ,KC_BTN1, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_PSCR, KC_PAUSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F11 - ,KC_BTN2, KC_BTN4, KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_F12 - ,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - // accessed via the right nav-layer key, includes a F1 where the left nav-layer key was -[_NAV_R] = LAYOUT_planck_grid( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, QK_BOOT, BL_STEP, KC_F6, KC_F7, KC_F8, KC_F9, KC_TRNS - ,KC_BTN1, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_PSCR, KC_PAUSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F11 - ,KC_BTN2, KC_BTN4, KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_F12 - ,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - // accessed via the lower alt keys, moves tab and delete to make alt+tab and ctrl+alt+del feel more standard -[_NAV_ALT] = LAYOUT_planck_grid( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, QK_BOOT, BL_STEP, KC_F6, KC_F7, KC_F8, KC_F9, KC_DELETE - ,KC_TAB, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_PSCR, KC_PAUSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F11 - ,KC_BTN2, KC_BTN4, KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_F12 - ,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -) -}; diff --git a/keyboards/planck/keymaps/matrixman/readme.md b/keyboards/planck/keymaps/matrixman/readme.md deleted file mode 100644 index 1f72d73221..0000000000 --- a/keyboards/planck/keymaps/matrixman/readme.md +++ /dev/null @@ -1,100 +0,0 @@ -The Matrixman Ergodox / Split-Planck Keyboard Layout -==================================================== - -### The problem - -These layouts were designed to give my aching pinkeys a break - -### The Design - - - Pinkeys do less: - - Left q, a, z, `, _, =, [Shift], [F1] [Click], [Right Click] - - Right p, ', /, |, -, +, [Shift], [F10], [F11], [F12] - - Index fingers do more: - - Left: r, f, v, t, g, b, &, $, !, /, (, {, <, [, [Ctrl], [Tab], [Alt], [PrintScr] - - Right: u, j, m, y, h, n, 7, 4, 1, \, ), }, >, ], ;, [Ctrl], [Insert], [Alt], [Pause] - - Thumbs do more: - - Left: [Esc], :, [Shift], [Tab] - - Right: [Space], ;, [Shift], [Backspace] - - Palm Presses too: - - Left: [Ctrl], " - - Right: [Ctrl, [Enter] - -### The Plan - -I keep an Ergodox at home and at work, and when I'm mobile, I carry a planck. -These keymaps are designed to minimize the difficulty of switching between the two. - -### Other features - -- 10-key at home row for right hand -- "Matching" symbols use same finger on opposite hand: <> [] {} /\ () 1! 2@ 3# 4$ 5% 6^ 7& 8* -_ += -- Supports vim-like (hjkl) movements: - - mouse movement and scrolling - - arrow keys and nav keys (home, end, pg up, pg down) -- All non-modal keys mapped (all keys from a typical 105 key keyboard except caps, num, and scroll lock) - -The Planck Layout ------------------ - -For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/eb0696806831fc0d93c9 - -### Prose Layer - - qwert▓▓yuiop - asdfg▓;hjkl' - zxcvb▓▓nm,./ - ▓▓▓▓▓▓▓ ▓▓▓▓ - -### Symbol Layer - - `~*&/<>\789| - _^%$([])456- - =#@!{▓▓}123+ - "▓,?:▓▓;0▓.▓ - -### Nav Layer - - FKEYF▓▓KEYFK - mouse▓▓arowE - scrol▓▓seekY - ▓▓▓▓▓▓▓▓▓▓▓▓ - - -The Ergodox Layout ------------------- - -For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/9be130e4c9b503317619 - -Wherever the Ergodox has keys that the Planck doesn't, whichever key would be expected on a typical 105 key is in that place - -### Prose Layer - -▓▓▓▓▓▓▓ ▓▓▓▓▓▓ -▓qwert▓ ▓yuiop\ -▓asdfg▓ ;hjkl;' -▓zxcvb nm,./▓ -▓▓▓▓▓▓ ▓▓▓▓▓▓ - ▓▓ ▓▓ - ▓▓▓ ▓ ▓ - -### Symbol Layer - -▓▓▓▓▓▓ ▓▓▓▓▓▓ -▓`~*&/< >\789|\ -▓_^%$([ ])456-▓ -▓=#@!{ }123+▓ -"▓▓▓▓▓▓ 0▓.▓▓ - ▓▓ ▓▓ - ?:▓ ▓;. - - -### Nav Layer - -▓▓▓▓▓▓▓ ▓▓▓▓▓▓ -▓FKEYF▓ ▓KEYFK▓ -▓mouse▓ arowE▓ -▓scrol seekY▓ -▓▓▓▓▓▓ ▓▓▓▓▓▓ - ▓▓ ▓▓ - ▓▓▓ ▓▓▓ -- cgit v1.2.3