diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-06-27 19:24:08 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-06-27 19:24:08 -0700 |
| commit | f1344d1f1e8738f2bbb447a7609f9c82035467cc (patch) | |
| tree | bb903c8b689b2ecc2a0572e85553bcdf90ebf136 | |
| parent | 3d831f3550c301d9e84099768135a4347c14b44d (diff) | |
| download | qmk_firmware-f1344d1f1e8738f2bbb447a7609f9c82035467cc.tar.gz qmk_firmware-f1344d1f1e8738f2bbb447a7609f9c82035467cc.zip | |
Kinesis refactor and Configurator update (#3245)
* Matrix refactor
* Keymap refactor
* Configurator support
* Stapelberg readme formatting fix (missing grave accent)
| -rw-r--r-- | keyboards/kinesis/alvicstep/alvicstep.h | 138 | ||||
| -rw-r--r-- | keyboards/kinesis/info.json | 18 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/carpalx/keymap.c | 10 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/config.h | 8 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/keymap.c | 83 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/readme.md | 5 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/rules.mk | 21 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/dvorak/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/insertsnideremarks/keymap.c | 70 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/milestogo/keymap.c | 53 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/xyverz/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/kinesis/stapelberg/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/kinesis/stapelberg/stapelberg.h | 102 |
14 files changed, 359 insertions, 165 deletions
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h index f91a52314..169012faf 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.h +++ b/keyboards/kinesis/alvicstep/alvicstep.h | |||
| @@ -3,65 +3,99 @@ | |||
| 3 | 3 | ||
| 4 | #include "../kinesis.h" | 4 | #include "../kinesis.h" |
| 5 | 5 | ||
| 6 | #define ___ KC_NO | ||
| 6 | 7 | ||
| 7 | #define KEYMAP( \ | 8 | #define LAYOUT( \ |
| 8 | k02,k22,k12,k01,k21,k11,k00,k20,k10, \ | 9 | k02, k22, k12, k01, k21, k11, k00, k20, k10, \ |
| 9 | k80,k70,k60,k50,k40,k30, \ | 10 | k80, k70, k60, k50, k40, k30, \ |
| 10 | k81,k71,k61,k51,k41,k31, \ | 11 | k81, k71, k61, k51, k41, k31, \ |
| 11 | k82,k72,k62,k52,k42,k32, \ | 12 | k82, k72, k62, k52, k42, k32, \ |
| 12 | k83,k73,k63,k53,k43,k33, \ | 13 | k83, k73, k63, k53, k43, k33, \ |
| 13 | k74,k64,k54,k34, \ | 14 | k74, k64, k54, k34, \ |
| 14 | k36,k35, \ | 15 | k36, k35, \ |
| 15 | k55, \ | 16 | k55, \ |
| 16 | k56,k46,k75, \ | 17 | k56, k46, k75, \ |
| 17 | k03,k23,k13,k04,k24,k14,k05,k85,k84, \ | 18 | \ |
| 18 | k94,kA4,kB4,kD4,kE4,kF4, \ | 19 | k03, k23, k13, k04, k24, k14, k05, k85, k84, \ |
| 19 | k95,kA5,kB5,kD5,kE5,kF5, \ | 20 | k94, kA4, kB4, kD4, kE4, kF4, \ |
| 20 | k96,kA6,kB6,kD6,kE6,kF6, \ | 21 | k95, kA5, kB5, kD5, kE5, kF5, \ |
| 21 | k97,kA7,kB7,kD7,kE7,kF7, \ | 22 | k96, kA6, kB6, kD6, kE6, kF6, \ |
| 22 | k93,kB3,kD3,kE3, \ | 23 | k97, kA7, kB7, kD7, kE7, kF7, \ |
| 23 | k47,k66, \ | 24 | k93, kB3, kD3, kE3, \ |
| 24 | k67, \ | 25 | k47, k66, \ |
| 25 | k87,k76,k86 \ | 26 | k67, \ |
| 26 | ) { \ | 27 | k87, k76, k86 \ |
| 27 | { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO }, \ | 28 | ) { \ |
| 28 | { k10, k11, k12, k13, k14, KC_NO, KC_NO, KC_NO }, \ | 29 | { k00, k01, k02, k03, k04, k05, ___, ___ }, \ |
| 29 | { k20, k21, k22, k23, k24, KC_NO, KC_NO, KC_NO }, \ | 30 | { k10, k11, k12, k13, k14, ___, ___, ___ }, \ |
| 30 | { k30, k31, k32, k33, k34, k35, k36, KC_NO }, \ | 31 | { k20, k21, k22, k23, k24, ___, ___, ___ }, \ |
| 31 | { k40, k41, k42, k43, KC_NO, KC_NO, k46, k47 }, \ | 32 | { k30, k31, k32, k33, k34, k35, k36, ___ }, \ |
| 32 | { k50, k51, k52, k53, k54, k55, k56, KC_NO }, \ | 33 | { k40, k41, k42, k43, ___, ___, k46, k47 }, \ |
| 33 | { k60, k61, k62, k63, k64, KC_NO, k66, k67 }, \ | 34 | { k50, k51, k52, k53, k54, k55, k56, ___ }, \ |
| 34 | { k70, k71, k72, k73, k74, k75, k76, KC_NO }, \ | 35 | { k60, k61, k62, k63, k64, ___, k66, k67 }, \ |
| 35 | { k80, k81, k82, k83, k84, k85, k86, k87}, \ | 36 | { k70, k71, k72, k73, k74, k75, k76, ___ }, \ |
| 36 | { KC_NO, KC_NO ,KC_NO ,k93, k94, k95, k96, k97}, \ | 37 | { k80, k81, k82, k83, k84, k85, k86, k87 }, \ |
| 37 | { KC_NO, KC_NO ,KC_NO ,KC_NO, kA4, kA5, kA6, kA7}, \ | 38 | { ___, ___, ___, k93, k94, k95, k96, k97 }, \ |
| 38 | { KC_NO, KC_NO ,KC_NO ,kB3, kB4, kB5, kB6, kB7}, \ | 39 | { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \ |
| 39 | { KC_NO, KC_NO ,KC_NO ,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \ | 40 | { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \ |
| 40 | { KC_NO, KC_NO ,KC_NO ,kD3, kD4, kD5, kD6, kD7}, \ | 41 | { ___, ___, ___, ___, ___, ___, ___, ___ }, \ |
| 41 | { KC_NO, KC_NO ,KC_NO ,kE3, kE4, kE5, kE6, kE7}, \ | 42 | { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \ |
| 42 | { KC_NO, KC_NO ,KC_NO ,KC_NO, kF4, kF5, kF6, kF7} \ | 43 | { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \ |
| 44 | { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \ | ||
| 45 | } | ||
| 46 | |||
| 47 | /* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */ | ||
| 48 | #define LAYOUT_pretty( \ | ||
| 49 | k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, k85, k84, \ | ||
| 50 | k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \ | ||
| 51 | k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \ | ||
| 52 | k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \ | ||
| 53 | k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \ | ||
| 54 | k74, k64, k54, k34, k93, kB3, kD3, kE3, \ | ||
| 55 | k36, k35, k47, k66, \ | ||
| 56 | k55, k67, \ | ||
| 57 | k56, k46, k75, k87, k76, k86 \ | ||
| 58 | ) { \ | ||
| 59 | { k00, k01, k02, k03, k04, k05, ___, ___ }, \ | ||
| 60 | { k10, k11, k12, k13, k14, ___, ___, ___ }, \ | ||
| 61 | { k20, k21, k22, k23, k24, ___, ___, ___ }, \ | ||
| 62 | { k30, k31, k32, k33, k34, k35, k36, ___ }, \ | ||
| 63 | { k40, k41, k42, k43, ___, ___, k46, k47 }, \ | ||
| 64 | { k50, k51, k52, k53, k54, k55, k56, ___ }, \ | ||
| 65 | { k60, k61, k62, k63, k64, ___, k66, k67 }, \ | ||
| 66 | { k70, k71, k72, k73, k74, k75, k76, ___ }, \ | ||
| 67 | { k80, k81, k82, k83, k84, k85, k86, k87 }, \ | ||
| 68 | { ___, ___, ___, k93, k94, k95, k96, k97 }, \ | ||
| 69 | { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \ | ||
| 70 | { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \ | ||
| 71 | { ___, ___, ___, ___, ___, ___, ___, ___ }, \ | ||
| 72 | { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \ | ||
| 73 | { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \ | ||
| 74 | { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \ | ||
| 43 | } | 75 | } |
| 44 | 76 | ||
| 45 | 77 | ||
| 46 | /* Row pin configuration | 78 | /* |
| 47 | PF0 A | 79 | Row pin configuration |
| 48 | PF1 B | ||
| 49 | PF2 C | ||
| 50 | PF3 G 0 = U4, 1 = U5 | ||
| 51 | 80 | ||
| 52 | 81 | PF0 A | |
| 53 | r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 rA rB rC rD rE rF | 82 | PF1 B |
| 54 | PB0 c0| f6 f8 f7 5 4 3 2 1 =+ | 83 | PF2 C |
| 55 | PB1 c1| f3 f5 f4 t r e w q TAB | 84 | PF3 G 0 = U4, 1 = U5 |
| 56 | PB2 c2| ESC f2 f1 g f d s a CL | ||
| 57 | PB3 c3| f9 f11 f10 b v c x z LS UP DN [{ ]} | ||
| 58 | PB4 c4| f12 SL PS RT LT §± `~ 6 7 8 9 0 -_ | ||
| 59 | PB5 c5| PB PGM KPD y u i o p \ | ||
| 60 | PB6 c6| LC DL BS RC EN SP h j k l ;: '" | ||
| 61 | PB7 c7| RA PU PD n m ,< .> /? RS | ||
| 62 | */ | ||
| 63 | 85 | ||
| 64 | 86 | ||
| 87 | Matrix Map (US QWERTY keyboard layout shown) | ||
| 65 | 88 | ||
| 89 | | row 0 | row 1 | row 2 | row 3 | row 4 | row 5 | row 6 | row 7 | row 8 | row 9 | row A | row B | row C | row D | row E | row F | ||
| 90 | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ||
| 91 | PB0 col0 | F6 | F8 | F7 | 5% | 4$ | 3# | 2@ | 1! | =+ | | | | | | | | ||
| 92 | PB1 col1 | F3 | F5 | F4 | T | R | E | W | Q | Tab | | | | | | | | ||
| 93 | PB2 col2 | Esc | F2 | F1 | G | F | D | S | A | CapsLk | | | | | | | | ||
| 94 | PB3 col3 | F9 | F11 | F10 | B | V | C | X | Z | LShift | Up | | Down | | [{ | ]} | | ||
| 95 | PB4 col4 | F12 | ScrLk | PrtSc | Right | | Left | Insert | `~ | 1! | 6^ | 7& | 8* | | 9( | 0) | -_ | ||
| 96 | PB5 col5 | Pause | | | LAlt | | Home | | End | Fn | Y | U | I | | O | P | \| | ||
| 97 | PB6 col6 | | | | LCtrl | Delete | Bksp | RCtrl | Enter | Space | H | J | K | | L | ;: | '" | ||
| 98 | PB7 col7 | | | | | RGUI | | PageUp | | PageDn | N | M | ,< | | .> | /? | RShift | ||
| 99 | */ | ||
| 66 | 100 | ||
| 67 | #endif | 101 | #endif |
diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json new file mode 100644 index 000000000..c90d3b625 --- /dev/null +++ b/keyboards/kinesis/info.json | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Kinesis", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 15.5, | ||
| 6 | "height": 9, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "key_count": 86, | ||
| 10 | "layout": [{"label":"Esc", "x":0, "y":0, "w":0.69, "h":0.85}, {"label":"F1", "x":0.7, "y":0, "w":0.69, "h":0.85}, {"label":"F2", "x":1.39, "y":0, "w":0.69, "h":0.85}, {"label":"F3", "x":2.09, "y":0, "w":0.69, "h":0.85}, {"label":"F4", "x":2.78, "y":0, "w":0.69, "h":0.85}, {"label":"F5", "x":3.48, "y":0, "w":0.69, "h":0.85}, {"label":"F6", "x":4.17, "y":0, "w":0.69, "h":0.85}, {"label":"F7", "x":4.87, "y":0, "w":0.69, "h":0.85}, {"label":"F8", "x":5.56, "y":0, "w":0.69, "h":0.85}, {"label":"+", "x":0, "y":1.25, "w":1.25}, {"label":"!", "x":1.25, "y":1.25}, {"label":"@", "x":2.25, "y":1}, {"label":"#", "x":3.25, "y":1}, {"label":"$", "x":4.25, "y":1}, {"label":"%", "x":5.25, "y":1}, {"label":"Tab", "x":0, "y":2.25, "w":1.25}, {"label":"Q", "x":1.25, "y":2.25}, {"label":"W", "x":2.25, "y":2}, {"label":"E", "x":3.25, "y":2}, {"label":"R", "x":4.25, "y":2}, {"label":"T", "x":5.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.25, "y":3.25}, {"label":"S", "x":2.25, "y":3}, {"label":"D", "x":3.25, "y":3}, {"label":"F", "x":4.25, "y":3}, {"label":"G", "x":5.25, "y":3}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Z", "x":1.25, "y":4.25}, {"label":"X", "x":2.25, "y":4}, {"label":"C", "x":3.25, "y":4}, {"label":"V", "x":4.25, "y":4}, {"label":"B", "x":5.25, "y":4}, {"label":"~", "x":1.25, "y":5.25}, {"label":"|", "x":2.25, "y":5}, {"label":"←", "x":3.25, "y":5}, {"label":"→", "x":4.25, "y":5}, {"label":"Ctrl", "x":5.25, "y":6}, {"label":"Alt", "x":6.25, "y":6}, {"label":"Home", "x":6.25, "y":7}, {"label":"Back Space", "x":4.25, "y":7, "h":2}, {"label":"Delete", "x":5.25, "y":7, "h":2}, {"label":"End", "x":6.25, "y":8}, {"label":"F9", "x":9.25, "y":0, "w":0.69, "h":0.85}, {"label":"F10", "x":9.95, "y":0, "w":0.69, "h":0.85}, {"label":"F11", "x":10.64, "y":0, "w":0.69, "h":0.85}, {"label":"F12", "x":11.34, "y":0, "w":0.69, "h":0.85}, {"label":"Print Scrn", "x":12.03, "y":0, "w":0.69, "h":0.85}, {"label":"Scroll Lock", "x":12.73, "y":0, "w":0.69, "h":0.85}, {"label":"Pause", "x":13.42, "y":0, "w":0.69, "h":0.85}, {"label":"Keypad", "x":14.12, "y":0, "w":0.69, "h":0.85}, {"label":"Progrm", "x":14.81, "y":0, "w":0.69, "h":0.85}, {"label":"^", "x":9.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1.25}, {"label":"_", "x":14.25, "y":1.25, "w":1.25}, {"label":"Y", "x":9.25, "y":2}, {"label":"U", "x":10.25, "y":2}, {"label":"I", "x":11.25, "y":2}, {"label":"O", "x":12.25, "y":2}, {"label":"P", "x":13.25, "y":2.25}, {"label":"|", "x":14.25, "y":2.25, "w":1.25}, {"label":"H", "x":9.25, "y":3}, {"label":"J", "x":10.25, "y":3}, {"label":"K", "x":11.25, "y":3}, {"label":"L", "x":12.25, "y":3}, {"label":":", "x":13.25, "y":3.25}, {"label":"\"", "x":14.25, "y":3.25, "w":1.25}, {"label":"N", "x":9.25, "y":4}, {"label":"M", "x":10.25, "y":4}, {"label":"<", "x":11.25, "y":4}, {"label":">", "x":12.25, "y":4}, {"label":"?", "x":13.25, "y":4.25}, {"label":"Shift", "x":14.25, "y":4.25, "w":1.25}, {"label":"↑", "x":10.25, "y":5}, {"label":"↓", "x":11.25, "y":5}, {"label":"{", "x":12.25, "y":5}, {"label":"}", "x":13.25, "y":5.25}, {"label":"GUI", "x":8.25, "y":6}, {"label":"Ctrl", "x":9.25, "y":6}, {"label":"Page Up", "x":8.25, "y":7}, {"label":"Page Down", "x":8.25, "y":8}, {"label":"Enter", "x":9.25, "y":7, "h":2}, {"label":"Space", "x":10.25, "y":7, "h":2}] | ||
| 11 | }, | ||
| 12 | |||
| 13 | "LAYOUT_pretty": { | ||
| 14 | "key_count": 86, | ||
| 15 | "layout": [{"label":"Esc", "x":0, "y":0, "w":0.69, "h":0.85}, {"label":"F1", "x":0.7, "y":0, "w":0.69, "h":0.85}, {"label":"F2", "x":1.39, "y":0, "w":0.69, "h":0.85}, {"label":"F3", "x":2.09, "y":0, "w":0.69, "h":0.85}, {"label":"F4", "x":2.78, "y":0, "w":0.69, "h":0.85}, {"label":"F5", "x":3.48, "y":0, "w":0.69, "h":0.85}, {"label":"F6", "x":4.17, "y":0, "w":0.69, "h":0.85}, {"label":"F7", "x":4.87, "y":0, "w":0.69, "h":0.85}, {"label":"F8", "x":5.56, "y":0, "w":0.69, "h":0.85}, {"label":"F9", "x":9.25, "y":0, "w":0.69, "h":0.85}, {"label":"F10", "x":9.95, "y":0, "w":0.69, "h":0.85}, {"label":"F11", "x":10.64, "y":0, "w":0.69, "h":0.85}, {"label":"F12", "x":11.34, "y":0, "w":0.69, "h":0.85}, {"label":"Print Scrn", "x":12.03, "y":0, "w":0.69, "h":0.85}, {"label":"Scroll Lock", "x":12.73, "y":0, "w":0.69, "h":0.85}, {"label":"Pause", "x":13.42, "y":0, "w":0.69, "h":0.85}, {"label":"Keypad", "x":14.12, "y":0, "w":0.69, "h":0.85}, {"label":"Progrm", "x":14.81, "y":0, "w":0.69, "h":0.85}, {"label":"+", "x":0, "y":1.25, "w":1.25}, {"label":"!", "x":1.25, "y":1.25}, {"label":"@", "x":2.25, "y":1}, {"label":"#", "x":3.25, "y":1}, {"label":"$", "x":4.25, "y":1}, {"label":"%", "x":5.25, "y":1}, {"label":"^", "x":9.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1.25}, {"label":"_", "x":14.25, "y":1.25, "w":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.25}, {"label":"Q", "x":1.25, "y":2.25}, {"label":"W", "x":2.25, "y":2}, {"label":"E", "x":3.25, "y":2}, {"label":"R", "x":4.25, "y":2}, {"label":"T", "x":5.25, "y":2}, {"label":"Y", "x":9.25, "y":2}, {"label":"U", "x":10.25, "y":2}, {"label":"I", "x":11.25, "y":2}, {"label":"O", "x":12.25, "y":2}, {"label":"P", "x":13.25, "y":2.25}, {"label":"|", "x":14.25, "y":2.25, "w":1.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.25, "y":3.25}, {"label":"S", "x":2.25, "y":3}, {"label":"D", "x":3.25, "y":3}, {"label":"F", "x":4.25, "y":3}, {"label":"G", "x":5.25, "y":3}, {"label":"H", "x":9.25, "y":3}, {"label":"J", "x":10.25, "y":3}, {"label":"K", "x":11.25, "y":3}, {"label":"L", "x":12.25, "y":3}, {"label":":", "x":13.25, "y":3.25}, {"label":"\"", "x":14.25, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Z", "x":1.25, "y":4.25}, {"label":"X", "x":2.25, "y":4}, {"label":"C", "x":3.25, "y":4}, {"label":"V", "x":4.25, "y":4}, {"label":"B", "x":5.25, "y":4}, {"label":"N", "x":9.25, "y":4}, {"label":"M", "x":10.25, "y":4}, {"label":"<", "x":11.25, "y":4}, {"label":">", "x":12.25, "y":4}, {"label":"?", "x":13.25, "y":4.25}, {"label":"Shift", "x":14.25, "y":4.25, "w":1.25}, {"label":"~", "x":1.25, "y":5.25}, {"label":"|", "x":2.25, "y":5}, {"label":"←", "x":3.25, "y":5}, {"label":"→", "x":4.25, "y":5}, {"label":"↑", "x":10.25, "y":5}, {"label":"↓", "x":11.25, "y":5}, {"label":"{", "x":12.25, "y":5}, {"label":"}", "x":13.25, "y":5.25}, {"label":"Ctrl", "x":5.25, "y":6}, {"label":"Alt", "x":6.25, "y":6}, {"label":"GUI", "x":8.25, "y":6}, {"label":"Ctrl", "x":9.25, "y":6}, {"label":"Home", "x":6.25, "y":7}, {"label":"Page Up", "x":8.25, "y":7}, {"label":"Back Space", "x":4.25, "y":7, "h":2}, {"label":"Delete", "x":5.25, "y":7, "h":2}, {"label":"End", "x":6.25, "y":8}, {"label":"Page Down", "x":8.25, "y":8}, {"label":"Enter", "x":9.25, "y":7, "h":2}, {"label":"Space", "x":10.25, "y":7, "h":2}] | ||
| 16 | } | ||
| 17 | } | ||
| 18 | } | ||
diff --git a/keyboards/kinesis/keymaps/carpalx/keymap.c b/keyboards/kinesis/keymaps/carpalx/keymap.c index 0ef454bc2..c00c5327b 100644 --- a/keyboards/kinesis/keymaps/carpalx/keymap.c +++ b/keyboards/kinesis/keymaps/carpalx/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "kinesis.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -90,7 +88,7 @@ extern keymap_config_t keymap_config; | |||
| 90 | 88 | ||
| 91 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 89 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 92 | 90 | ||
| 93 | [_CX] = KEYMAP( | 91 | [_CX] = LAYOUT( |
| 94 | // Left Hand | 92 | // Left Hand |
| 95 | TO(_CX), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 93 | TO(_CX), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 96 | KC_DEL, KC_1, KC_3, KC_5, KC_7, KC_9, | 94 | KC_DEL, KC_1, KC_3, KC_5, KC_7, KC_9, |
| @@ -116,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 116 | MO(_KP), KC_ENT, KC_SPC | 114 | MO(_KP), KC_ENT, KC_SPC |
| 117 | ), | 115 | ), |
| 118 | 116 | ||
| 119 | [_QW] = KEYMAP( | 117 | [_QW] = LAYOUT( |
| 120 | // Left Hand | 118 | // Left Hand |
| 121 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 119 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 122 | _______, _______, _______, _______, _______, _______, | 120 | _______, _______, _______, _______, _______, _______, |
| @@ -142,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 142 | _______, _______, _______ | 140 | _______, _______, _______ |
| 143 | ), | 141 | ), |
| 144 | 142 | ||
| 145 | [_KP] = KEYMAP( | 143 | [_KP] = LAYOUT( |
| 146 | // Left Hand | 144 | // Left Hand |
| 147 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 145 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 148 | _______, _______, _______, _______, _______, _______, | 146 | _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c index 01a66b5e5..f36d6dd1d 100644 --- a/keyboards/kinesis/keymaps/default/keymap.c +++ b/keyboards/kinesis/keymaps/default/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "kinesis.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define QWERTY 0 // Base qwerty | 3 | #define QWERTY 0 // Base qwerty |
| 4 | 4 | ||
| @@ -30,7 +30,7 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 33 | [QWERTY] = KEYMAP( | 33 | [QWERTY] = LAYOUT( |
| 34 | KC_ESC, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, | 34 | KC_ESC, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, |
| 35 | KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , | 35 | KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , |
| 36 | KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , | 36 | KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , |
diff --git a/keyboards/kinesis/keymaps/default_pretty/config.h b/keyboards/kinesis/keymaps/default_pretty/config.h new file mode 100644 index 000000000..8893d122e --- /dev/null +++ b/keyboards/kinesis/keymaps/default_pretty/config.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #ifndef CONFIG_USER_H | ||
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | |||
| 6 | // place overrides here | ||
| 7 | |||
| 8 | #endif | ||
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c new file mode 100644 index 000000000..58d749074 --- /dev/null +++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | #define QWERTY 0 // Base qwerty | ||
| 4 | |||
| 5 | |||
| 6 | /**************************************************************************************************** | ||
| 7 | * | ||
| 8 | * Keymap: Default Layer in Qwerty | ||
| 9 | * | ||
| 10 | * ,-------------------------------------------------------------------------------------------------------------------. | ||
| 11 | * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F8 | F9 | F10 | F12 | PSCR | SLCK | PAUS | FN0 | BOOT | | ||
| 12 | * |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------| | ||
| 13 | * | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ | | ||
| 14 | * |--------+------+------+------+------+------| +------+------+------+------+------+--------| | ||
| 15 | * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| | | ||
| 16 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| | ||
| 17 | * | Caps | A | S | D | F | G | | H | J | K | L | ;: | '" | | ||
| 18 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| | ||
| 19 | * | Shift | Z | X | C | V | B | | N | M | ,. | .> | /? | Shift | | ||
| 20 | * `--------+------+------+------+------+------- `------+------+------+------+------+--------' | ||
| 21 | * | `~ | INS | Left | Right| | Up | Down | [{ | ]} | | ||
| 22 | * `---------------------------' `---------------------------' | ||
| 23 | * ,-------------. ,-------------. | ||
| 24 | * | Ctrl | Alt | | Gui | Ctrl | | ||
| 25 | * ,------|------|------| |------+------+------. | ||
| 26 | * | | | Home | | PgUp | | | | ||
| 27 | * | BkSp | Del |------| |------|Return| Space| | ||
| 28 | * | | | End | | PgDn | | | | ||
| 29 | * `--------------------' `--------------------' | ||
| 30 | */ | ||
| 31 | |||
| 32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 33 | |||
| 34 | [QWERTY] = LAYOUT_pretty( | ||
| 35 | 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_FN0, KC_1, | ||
| 36 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | ||
| 37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | ||
| 38 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | ||
| 39 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | ||
| 40 | KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, | ||
| 41 | KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL, | ||
| 42 | KC_HOME, KC_PGUP, | ||
| 43 | KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENTER, KC_SPC | ||
| 44 | ) | ||
| 45 | |||
| 46 | }; | ||
| 47 | |||
| 48 | |||
| 49 | const uint16_t PROGMEM fn_actions[] = { | ||
| 50 | |||
| 51 | }; | ||
| 52 | |||
| 53 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
| 54 | { | ||
| 55 | // MACRODOWN only works in this function | ||
| 56 | switch(id) { | ||
| 57 | case 0: | ||
| 58 | if (record->event.pressed) { | ||
| 59 | register_code(KC_RSFT); | ||
| 60 | } else { | ||
| 61 | unregister_code(KC_RSFT); | ||
| 62 | } | ||
| 63 | break; | ||
| 64 | } | ||
| 65 | return MACRO_NONE; | ||
| 66 | }; | ||
| 67 | |||
| 68 | |||
| 69 | void matrix_init_user(void) { | ||
| 70 | |||
| 71 | } | ||
| 72 | |||
| 73 | void matrix_scan_user(void) { | ||
| 74 | |||
| 75 | } | ||
| 76 | |||
| 77 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 78 | return true; | ||
| 79 | } | ||
| 80 | |||
| 81 | void led_set_user(uint8_t usb_led) { | ||
| 82 | |||
| 83 | } | ||
diff --git a/keyboards/kinesis/keymaps/default_pretty/readme.md b/keyboards/kinesis/keymaps/default_pretty/readme.md new file mode 100644 index 000000000..a8783b978 --- /dev/null +++ b/keyboards/kinesis/keymaps/default_pretty/readme.md | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # The default keymap for kinesis-advantage | ||
| 2 | |||
| 3 | This keymap is the same as the one in the `default` directory, but is | ||
| 4 | formatted to use the `LAYOUT_pretty` matrix, which places the two halves of | ||
| 5 | the keyboard side-by-side, rather than the left-hand side being on top. | ||
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk new file mode 100644 index 000000000..9d3df5964 --- /dev/null +++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | # Build Options | ||
| 2 | # change to "no" to disable the options, or define them in the Makefile in | ||
| 3 | # the appropriate keymap folder that will get included automatically | ||
| 4 | # | ||
| 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | ||
| 6 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | ||
| 7 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | ||
| 8 | CONSOLE_ENABLE = no # Console for debug(+400) | ||
| 9 | COMMAND_ENABLE = yes # Commands for debug and configuration | ||
| 10 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 11 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| 12 | MIDI_ENABLE = no # MIDI controls | ||
| 13 | AUDIO_ENABLE = no # Audio output on port C6 | ||
| 14 | UNICODE_ENABLE = no # Unicode | ||
| 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | ||
| 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 18 | |||
| 19 | ifndef QUANTUM_DIR | ||
| 20 | include ../../../../Makefile | ||
| 21 | endif | ||
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c index 9008bc808..5d9739866 100644 --- a/keyboards/kinesis/keymaps/dvorak/keymap.c +++ b/keyboards/kinesis/keymaps/dvorak/keymap.c | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | #include "kinesis.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define _DVORAK 0 // Base Dvorak layer | 3 | #define _DVORAK 0 // Base Dvorak layer |
| 4 | #define _MEDIA 1 // Media layer | 4 | #define _MEDIA 1 // Media layer |
| 5 | 5 | ||
| 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 7 | [_DVORAK] = KEYMAP( | 7 | [_DVORAK] = LAYOUT( |
| 8 | // left hand | 8 | // left hand |
| 9 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 9 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, | 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, |
| @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 29 | TG(_MEDIA), KC_ENT, KC_SPC | 29 | TG(_MEDIA), KC_ENT, KC_SPC |
| 30 | ), | 30 | ), |
| 31 | 31 | ||
| 32 | [_MEDIA] = KEYMAP( | 32 | [_MEDIA] = LAYOUT( |
| 33 | // left hand | 33 | // left hand |
| 34 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 34 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
| 35 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 35 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c index b318e1bea..bac5ea3ff 100644 --- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c +++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "kinesis.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -66,7 +64,7 @@ void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) { | |||
| 66 | } | 64 | } |
| 67 | 65 | ||
| 68 | qk_tap_dance_action_t tap_dance_actions[] = { | 66 | qk_tap_dance_action_t tap_dance_actions[] = { |
| 69 | [ADJ] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset), // Double-tap to activate Adjust layer via oneshot layer | 67 | [ADJ] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset), // Double-tap to activate Adjust layer via oneshot layer |
| 70 | [LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR), // Left bracket on a single-tap, left brace on a double-tap | 68 | [LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR), // Left bracket on a single-tap, left brace on a double-tap |
| 71 | [RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR), // Right bracket on a single-tap, right brace on a double-tap | 69 | [RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR), // Right bracket on a single-tap, right brace on a double-tap |
| 72 | [EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS), // Plus sign on a single-tap, equal sign on a double-tap | 70 | [EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS), // Plus sign on a single-tap, equal sign on a double-tap |
| @@ -106,9 +104,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 106 | * | Space | Enter |App/Alt| | RGUI | Delete| Bspc | | 104 | * | Space | Enter |App/Alt| | RGUI | Delete| Bspc | |
| 107 | * | / | / |-------| |-------| / | / | | 105 | * | / | / |-------| |-------| / | / | |
| 108 | * | Fn | Number| Bspc | | Enter |Number2| Fn2 | | 106 | * | Fn | Number| Bspc | | Enter |Number2| Fn2 | |
| 109 | * `-----------------------' `-----------------------' | 107 | * `-----------------------' `-----------------------' |
| 110 | */ | 108 | */ |
| 111 | [_COLEMAK] = KEYMAP( | 109 | [_COLEMAK] = LAYOUT( |
| 112 | // Left Hand | 110 | // Left Hand |
| 113 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 111 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 114 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, | 112 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, |
| @@ -152,9 +150,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 152 | * | Space | Enter |App/Alt| | RGUI | Delete| Bspc | | 150 | * | Space | Enter |App/Alt| | RGUI | Delete| Bspc | |
| 153 | * | / | / |-------| |-------| / | / | | 151 | * | / | / |-------| |-------| / | / | |
| 154 | * | Fn | Number| Bspc | | Enter |Number2| Fn2 | | 152 | * | Fn | Number| Bspc | | Enter |Number2| Fn2 | |
| 155 | * `-----------------------' `-----------------------' | 153 | * `-----------------------' `-----------------------' |
| 156 | */ | 154 | */ |
| 157 | [_QWERTY] = KEYMAP( | 155 | [_QWERTY] = LAYOUT( |
| 158 | // Left Hand | 156 | // Left Hand |
| 159 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 157 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 160 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, | 158 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, |
| @@ -162,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 162 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, | 160 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, |
| 163 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, | 161 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, |
| 164 | KC_INS, KC_GRV, KC_LBRC, KC_RBRC, | 162 | KC_INS, KC_GRV, KC_LBRC, KC_RBRC, |
| 165 | //Left Thumb | 163 | //Left Thumb |
| 166 | CTLESC, ALL_T(KC_NO), | 164 | CTLESC, ALL_T(KC_NO), |
| 167 | ALTAPP, | 165 | ALTAPP, |
| 168 | SPCFN, ENTNS, KC_BSPC, | 166 | SPCFN, ENTNS, KC_BSPC, |
| @@ -199,9 +197,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 199 | * | | | | | | | | | 197 | * | | | | | | | | |
| 200 | * | | |-------| |-------| | | | 198 | * | | |-------| |-------| | | |
| 201 | * | | | | | | | | | 199 | * | | | | | | | | |
| 202 | * `-----------------------' `-----------------------' | 200 | * `-----------------------' `-----------------------' |
| 203 | */ | 201 | */ |
| 204 | [_NUMBERS] = KEYMAP( | 202 | [_NUMBERS] = LAYOUT( |
| 205 | // Left Hand | 203 | // Left Hand |
| 206 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 204 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 207 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, | 205 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, |
| @@ -216,17 +214,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 216 | // Right Hand | 214 | // Right Hand |
| 217 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 215 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 218 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 216 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 219 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, | 217 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, |
| 220 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, | 218 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, |
| 221 | TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, | 219 | TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, |
| 222 | _______, _______, _______, _______, | 220 | _______, _______, _______, _______, |
| 223 | // Right Thumb | 221 | // Right Thumb |
| 224 | _______, _______, | 222 | _______, _______, |
| 225 | _______, | 223 | _______, |
| 226 | _______, _______, _______ | 224 | _______, _______, _______ |
| 227 | ), | 225 | ), |
| 228 | 226 | ||
| 229 | [_NUMBERS2] = KEYMAP( | 227 | [_NUMBERS2] = LAYOUT( |
| 230 | // Left Hand | 228 | // Left Hand |
| 231 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 229 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 232 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, | 230 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, |
| @@ -241,10 +239,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 241 | // Right Hand | 239 | // Right Hand |
| 242 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 240 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 243 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 241 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 244 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, | 242 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, |
| 245 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, | 243 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, |
| 246 | TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, | 244 | TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, |
| 247 | _______, _______, _______, _______, | 245 | _______, _______, _______, _______, |
| 248 | // Right Thumb | 246 | // Right Thumb |
| 249 | _______, _______, | 247 | _______, _______, |
| 250 | _______, | 248 | _______, |
| @@ -269,13 +267,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 269 | * | | | | | | | | | 267 | * | | | | | | | | |
| 270 | * | | |-------| |-------| | | | 268 | * | | |-------| |-------| | | |
| 271 | * | | | | | | | | | 269 | * | | | | | | | | |
| 272 | * `-----------------------' `-----------------------' | 270 | * `-----------------------' `-----------------------' |
| 273 | */ | 271 | */ |
| 274 | [_FUNCTION] = KEYMAP( | 272 | [_FUNCTION] = LAYOUT( |
| 275 | // Left Hand | 273 | // Left Hand |
| 276 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 274 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 277 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, | 275 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, |
| 278 | _______, _______, _______, KC_UP, _______, _______, | 276 | _______, _______, _______, KC_UP, _______, _______, |
| 279 | _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), | 277 | _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), |
| 280 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, | 278 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, |
| 281 | _______, _______, _______, _______, | 279 | _______, _______, _______, _______, |
| @@ -283,7 +281,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 283 | _______, _______, | 281 | _______, _______, |
| 284 | _______, | 282 | _______, |
| 285 | _______, _______, _______, | 283 | _______, _______, _______, |
| 286 | // Right Hand | 284 | // Right Hand |
| 287 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 285 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 288 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 286 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 289 | _______, _______, KC_UP, LCTL(KC_Y), _______, _______, | 287 | _______, _______, KC_UP, LCTL(KC_Y), _______, _______, |
| @@ -296,11 +294,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 296 | _______, _______, _______ | 294 | _______, _______, _______ |
| 297 | ), | 295 | ), |
| 298 | 296 | ||
| 299 | [_FUNCTION2] = KEYMAP( | 297 | [_FUNCTION2] = LAYOUT( |
| 300 | // Left Hand | 298 | // Left Hand |
| 301 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 299 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 302 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, | 300 | KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, |
| 303 | _______, _______, _______, KC_UP, _______, _______, | 301 | _______, _______, _______, KC_UP, _______, _______, |
| 304 | _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), | 302 | _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), |
| 305 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, | 303 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, |
| 306 | _______, _______, _______, _______, | 304 | _______, _______, _______, _______, |
| @@ -308,7 +306,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 308 | _______, _______, | 306 | _______, _______, |
| 309 | _______, | 307 | _______, |
| 310 | _______, _______, _______, | 308 | _______, _______, _______, |
| 311 | // Right Hand | 309 | // Right Hand |
| 312 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 310 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 313 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 311 | KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 314 | _______, _______, KC_UP, LCTL(KC_Y), _______, _______, | 312 | _______, _______, KC_UP, LCTL(KC_Y), _______, _______, |
| @@ -340,9 +338,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 340 | * | | | | | | | | | 338 | * | | | | | | | | |
| 341 | * | | |-------| |-------| | | | 339 | * | | |-------| |-------| | | |
| 342 | * | | | | | KP Ent| | | | 340 | * | | | | | KP Ent| | | |
| 343 | * `-----------------------' `-----------------------' | 341 | * `-----------------------' `-----------------------' |
| 344 | */ | 342 | */ |
| 345 | [_NUMPAD] = KEYMAP( | 343 | [_NUMPAD] = LAYOUT( |
| 346 | // Left Hand | 344 | // Left Hand |
| 347 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 345 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 348 | _______, KC_NLCK, _______, _______, _______, _______, | 346 | _______, KC_NLCK, _______, _______, _______, _______, |
| @@ -386,9 +384,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 386 | * | | | LAlt | | RGUI | | | | 384 | * | | | LAlt | | RGUI | | | |
| 387 | * | Space | Enter |-------| |-------| Delete| Bspc | | 385 | * | Space | Enter |-------| |-------| Delete| Bspc | |
| 388 | * | | | Bspc | | Enter | | | | 386 | * | | | Bspc | | Enter | | | |
| 389 | * `-----------------------' `-----------------------' | 387 | * `-----------------------' `-----------------------' |
| 390 | */ | 388 | */ |
| 391 | [_COLEMAKGM] = KEYMAP( | 389 | [_COLEMAKGM] = LAYOUT( |
| 392 | // Left Hand | 390 | // Left Hand |
| 393 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 391 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 394 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, | 392 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, |
| @@ -432,9 +430,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 432 | * | | | LAlt | | RGUI | | | | 430 | * | | | LAlt | | RGUI | | | |
| 433 | * | Space | Enter |-------| |-------| Delete| Bspc | | 431 | * | Space | Enter |-------| |-------| Delete| Bspc | |
| 434 | * | | | Bspc | | Enter | | | | 432 | * | | | Bspc | | Enter | | | |
| 435 | * `-----------------------' `-----------------------' | 433 | * `-----------------------' `-----------------------' |
| 436 | */ | 434 | */ |
| 437 | [_QWERTYGM] = KEYMAP( | 435 | [_QWERTYGM] = LAYOUT( |
| 438 | // Left Hand | 436 | // Left Hand |
| 439 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, | 437 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, |
| 440 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, | 438 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, |
| @@ -478,9 +476,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 478 | * | | | | | | | | | 476 | * | | | | | | | | |
| 479 | * | | |-------| |-------| | | | 477 | * | | |-------| |-------| | | |
| 480 | * | | | | | | | | | 478 | * | | | | | | | | |
| 481 | * `-----------------------' `-----------------------' | 479 | * `-----------------------' `-----------------------' |
| 482 | */ | 480 | */ |
| 483 | [_ADJUST] = KEYMAP( | 481 | [_ADJUST] = LAYOUT( |
| 484 | // Left Hand | 482 | // Left Hand |
| 485 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 483 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 486 | _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, | 484 | _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, |
| @@ -498,14 +496,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 498 | _______, _______, _______, _______, _______, _______, | 496 | _______, _______, _______, _______, _______, _______, |
| 499 | _______, NKROTG, _______, _______, _______, _______, | 497 | _______, NKROTG, _______, _______, _______, _______, |
| 500 | _______, _______, _______, _______, _______, _______, | 498 | _______, _______, _______, _______, _______, _______, |
| 501 | _______, _______, _______, _______, | 499 | _______, _______, _______, _______, |
| 502 | // Right Thumb | 500 | // Right Thumb |
| 503 | _______, _______, | 501 | _______, _______, |
| 504 | _______, | 502 | _______, |
| 505 | _______, _______, _______ | 503 | _______, _______, _______ |
| 506 | ), | 504 | ), |
| 507 | 505 | ||
| 508 | [_ADJUST2] = KEYMAP( | 506 | [_ADJUST2] = LAYOUT( |
| 509 | // Left Hand | 507 | // Left Hand |
| 510 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 508 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 511 | _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, | 509 | _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, |
| @@ -523,7 +521,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 523 | _______, _______, _______, _______, _______, _______, | 521 | _______, _______, _______, _______, _______, _______, |
| 524 | _______, NKROTG, _______, _______, _______, _______, | 522 | _______, NKROTG, _______, _______, _______, _______, |
| 525 | _______, _______, _______, _______, _______, _______, | 523 | _______, _______, _______, _______, _______, _______, |
| 526 | _______, _______, _______, _______, | 524 | _______, _______, _______, _______, |
| 527 | // Right Thumb | 525 | // Right Thumb |
| 528 | _______, _______, | 526 | _______, _______, |
| 529 | _______, | 527 | _______, |
diff --git a/keyboards/kinesis/keymaps/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c index bf1f9c591..1ae7d9082 100644 --- a/keyboards/kinesis/keymaps/milestogo/keymap.c +++ b/keyboards/kinesis/keymaps/milestogo/keymap.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include "kinesis.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "mousekey.h" | 2 | #include "mousekey.h" |
| 4 | 3 | ||
| 5 | #define _QWERTY 0 // Base qerty | 4 | #define _QWERTY 0 // Base qerty |
| @@ -23,7 +22,7 @@ enum { | |||
| 23 | }; | 22 | }; |
| 24 | 23 | ||
| 25 | 24 | ||
| 26 | // Train out of using uncomfortable esc and GUI keys. | 25 | // Train out of using uncomfortable esc and GUI keys. |
| 27 | /**************************************************************************************************** | 26 | /**************************************************************************************************** |
| 28 | * | 27 | * |
| 29 | * Keymap: Default Layer in Qwerty | 28 | * Keymap: Default Layer in Qwerty |
| @@ -51,7 +50,7 @@ enum { | |||
| 51 | */ | 50 | */ |
| 52 | 51 | ||
| 53 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 52 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 54 | [_QWERTY] = KEYMAP( | 53 | [_QWERTY] = LAYOUT( |
| 55 | XXXXXXX, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, | 54 | XXXXXXX, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, |
| 56 | KC_GRAVE, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , | 55 | KC_GRAVE, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , |
| 57 | KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , | 56 | KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , |
| @@ -66,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 66 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, | 65 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, |
| 67 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, | 66 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, |
| 68 | KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, | 67 | KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, |
| 69 | KC_FN6, KC_FN7, KC_LBRC ,KC_RBRC, | 68 | KC_FN6, KC_FN7, KC_LBRC ,KC_RBRC, |
| 70 | KC_RALT,KC_RGUI, | 69 | KC_RALT,KC_RGUI, |
| 71 | KC_PGUP, | 70 | KC_PGUP, |
| 72 | KC_PGDN,KC_ENTER ,KC_SPC | 71 | KC_PGDN,KC_ENTER ,KC_SPC |
| 73 | ), | 72 | ), |
| 74 | 73 | ||
| 75 | 74 | ||
| 76 | /* _SYMB level, more planck like. Much work to make sequences into multi-finger rolls. eg ([1,0]), !=0 | 75 | /* _SYMB level, more planck like. Much work to make sequences into multi-finger rolls. eg ([1,0]), !=0 |
| 77 | * Also sorted by frequency / strength of finger. | 76 | * Also sorted by frequency / strength of finger. |
| 78 | * | 77 | * |
| @@ -100,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 100 | 99 | ||
| 101 | 100 | ||
| 102 | 101 | ||
| 103 | [_SYMB] = KEYMAP( | 102 | [_SYMB] = LAYOUT( |
| 104 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 103 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 105 | _______, _______, _______, _______, _______, _______, | 104 | _______, _______, _______, _______, _______, _______, |
| 106 | _______, KC_CIRC, KC_LCBR, KC_RCBR, KC_AT, KC_PERC, | 105 | _______, KC_CIRC, KC_LCBR, KC_RCBR, KC_AT, KC_PERC, |
| @@ -120,8 +119,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 120 | _______, | 119 | _______, |
| 121 | _______, _______, _______ | 120 | _______, _______, _______ |
| 122 | ), | 121 | ), |
| 123 | 122 | ||
| 124 | 123 | ||
| 125 | /* _SYMB2ol level, more ergodox like | 124 | /* _SYMB2ol level, more ergodox like |
| 126 | * | 125 | * |
| 127 | * ,-------------------------------------------------------------------------------------------------------------------. | 126 | * ,-------------------------------------------------------------------------------------------------------------------. |
| @@ -148,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 148 | 147 | ||
| 149 | 148 | ||
| 150 | 149 | ||
| 151 | [_SYMB2] = KEYMAP( | 150 | [_SYMB2] = LAYOUT( |
| 152 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 151 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 153 | _______, _______, KC_ASTR, KC_HASH, _______, _______, | 152 | _______, _______, KC_ASTR, KC_HASH, _______, _______, |
| 154 | _______, KC_SLSH, RSFT(KC_COMM), RSFT(KC_DOT), _______, _______, | 153 | _______, KC_SLSH, RSFT(KC_COMM), RSFT(KC_DOT), _______, _______, |
| @@ -175,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 175 | * |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------| | 174 | * |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------| |
| 176 | * | =+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) |MS Fast | | 175 | * | =+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) |MS Fast | |
| 177 | * |--------+------+------+------+------+------| +------+------+------+------+------+--------| | 176 | * |--------+------+------+------+------+------| +------+------+------+------+------+--------| |
| 178 | * | Tab | | | | |PgUp | | MwU |MS_UL | MS_U |MS_UR | | Ms Norm| | 177 | * | Tab | | | | |PgUp | | MwU |MS_UL | MS_U |MS_UR | | Ms Norm| |
| 179 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| | 178 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| |
| 180 | * |MouseFN1|GUI_V |GUI X |GUI C |GUI_V | | | | MS_L |Mouse1| MS_R | |MS Slow | | 179 | * |MouseFN1|GUI_V |GUI X |GUI C |GUI_V | | | | MS_L |Mouse1| MS_R | |MS Slow | |
| 181 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| | 180 | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| |
| @@ -193,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 193 | */ | 192 | */ |
| 194 | 193 | ||
| 195 | 194 | ||
| 196 | [_MOUSE] = KEYMAP( | 195 | [_MOUSE] = LAYOUT( |
| 197 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, | 196 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, |
| 198 | _______, KC_EXLM ,KC_AT, KC_HASH, KC_DLR ,KC_PERC , | 197 | _______, KC_EXLM ,KC_AT, KC_HASH, KC_DLR ,KC_PERC , |
| 199 | _______, KC_NO, KC_NO, KC_UP, KC_NO, KC_PGUP, | 198 | _______, KC_NO, KC_NO, KC_UP, KC_NO, KC_PGUP, |
| @@ -203,8 +202,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 203 | _______, _______, | 202 | _______, _______, |
| 204 | _______, | 203 | _______, |
| 205 | _______, _______, _______, | 204 | _______, _______, _______, |
| 206 | _______, _______, _______, _______, _______, _______, _______, KC_FN0,RESET, | 205 | _______, _______, _______, _______, _______, _______, _______, KC_FN0,RESET, |
| 207 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_ACL2, | 206 | KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_ACL2, |
| 208 | KC_WH_U, M(A_MUL), KC_MS_U, M(A_MUR), KC_NO, KC_ACL1, | 207 | KC_WH_U, M(A_MUL), KC_MS_U, M(A_MUR), KC_NO, KC_ACL1, |
| 209 | KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_ACL0, | 208 | KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_ACL0, |
| 210 | KC_WH_D, M(A_MDL), KC_MS_D, M(A_MDR), RSFT(KC_LBRC), RSFT(KC_RBRC), | 209 | KC_WH_D, M(A_MDL), KC_MS_D, M(A_MDR), RSFT(KC_LBRC), RSFT(KC_RBRC), |
| @@ -242,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 242 | 241 | ||
| 243 | 242 | ||
| 244 | 243 | ||
| 245 | [_TRANS] = KEYMAP( | 244 | [_TRANS] = LAYOUT( |
| 246 | _______, _______, _______, _______, _______, _______, _______, _______, _______, | 245 | _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 247 | _______, _______, _______, _______, _______, _______, | 246 | _______, _______, _______, _______, _______, _______, |
| 248 | _______, _______, _______, _______, _______, _______, | 247 | _______, _______, _______, _______, _______, _______, |
| @@ -262,22 +261,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 262 | _______, | 261 | _______, |
| 263 | _______, _______, _______ | 262 | _______, _______, _______ |
| 264 | ), | 263 | ), |
| 265 | 264 | ||
| 266 | 265 | ||
| 267 | }; | 266 | }; |
| 268 | 267 | ||
| 269 | 268 | ||
| 270 | 269 | ||
| 271 | const uint16_t PROGMEM fn_actions[] = { | 270 | const uint16_t PROGMEM fn_actions[] = { |
| 272 | [0] = ACTION_LAYER_TAP_TOGGLE(_MOUSE) , | 271 | [0] = ACTION_LAYER_TAP_TOGGLE(_MOUSE) , |
| 273 | [1] = ACTION_LAYER_TOGGLE(_MOUSE) , | 272 | [1] = ACTION_LAYER_TOGGLE(_MOUSE) , |
| 274 | [2] = ACTION_LAYER_TAP_TOGGLE(_SYMB) , | 273 | [2] = ACTION_LAYER_TAP_TOGGLE(_SYMB) , |
| 275 | [5]= ACTION_LAYER_TAP_KEY(_SYMB,KC_RIGHT), | 274 | [5]= ACTION_LAYER_TAP_KEY(_SYMB,KC_RIGHT), |
| 276 | [4]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_LEFT), | 275 | [4]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_LEFT), |
| 277 | [6]= ACTION_LAYER_TAP_KEY(_SYMB,KC_UP), | 276 | [6]= ACTION_LAYER_TAP_KEY(_SYMB,KC_UP), |
| 278 | [7]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_DOWN), | 277 | [7]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_DOWN), |
| 279 | 278 | ||
| 280 | 279 | ||
| 281 | }; | 280 | }; |
| 282 | 281 | ||
| 283 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 282 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| @@ -292,7 +291,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 292 | } | 291 | } |
| 293 | break; | 292 | break; |
| 294 | 293 | ||
| 295 | // from algernon's ErgoDox EZ layout, | 294 | // from algernon's ErgoDox EZ layout, |
| 296 | case A_MUL: | 295 | case A_MUL: |
| 297 | if (record->event.pressed) { | 296 | if (record->event.pressed) { |
| 298 | mousekey_on(KC_MS_UP); | 297 | mousekey_on(KC_MS_UP); |
| @@ -336,7 +335,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 336 | } | 335 | } |
| 337 | mousekey_send(); | 336 | mousekey_send(); |
| 338 | break; | 337 | break; |
| 339 | } | 338 | } |
| 340 | return MACRO_NONE; | 339 | return MACRO_NONE; |
| 341 | }; | 340 | }; |
| 342 | 341 | ||
| @@ -358,7 +357,7 @@ void matrix_scan_user(void) { | |||
| 358 | caps_lock_led_on(); | 357 | caps_lock_led_on(); |
| 359 | } | 358 | } |
| 360 | break; | 359 | break; |
| 361 | 360 | ||
| 362 | case 2: | 361 | case 2: |
| 363 | if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) { | 362 | if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) { |
| 364 | all_led_off(); | 363 | all_led_off(); |
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 4b4ad95cf..4f3dbf83e 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -68,7 +66,7 @@ extern keymap_config_t keymap_config; | |||
| 68 | | BkSp | / |------||------| / | Space | | 66 | | BkSp | / |------||------| / | Space | |
| 69 | | | Media | End || PgDn | KeyPd | | | 67 | | | Media | End || PgDn | KeyPd | | |
| 70 | `---------------------'`----------------------' | 68 | `---------------------'`----------------------' |
| 71 | 69 | ||
| 72 | Colemak layer: | 70 | Colemak layer: |
| 73 | ,-------------------------------------------.,-------------------------------------------. | 71 | ,-------------------------------------------.,-------------------------------------------. |
| 74 | | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | | 72 | | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | |
diff --git a/keyboards/kinesis/stapelberg/readme.md b/keyboards/kinesis/stapelberg/readme.md index 2a69bb725..37b26623f 100644 --- a/keyboards/kinesis/stapelberg/readme.md +++ b/keyboards/kinesis/stapelberg/readme.md | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # kinesis_stapelberg keyboard firmware | 1 | # kinesis_stapelberg keyboard firmware |
| 2 | 2 | ||
| 3 | This folder contains the firmware customization required to run QMK on the custom controller for the Kinesis Advantage created by Michael Stapelberg. | 3 | This folder contains the firmware customization required to run QMK on the custom controller for the Kinesis Advantage created by Michael Stapelberg. |
| 4 | It differs from the `alvicstep keyboard in that the existing QMK Kinesis Advantage project uses the existing controller board provided by Kinesis. | 4 | It differs from the `alvicstep` keyboard in that the existing QMK Kinesis Advantage project uses the existing controller board provided by Kinesis. |
| 5 | 5 | ||
| 6 | The controller board hardware is described | 6 | The controller board hardware is described |
| 7 | [here](http://michael.stapelberg.de/Artikel/kinesis_custom_controller) | 7 | [here](http://michael.stapelberg.de/Artikel/kinesis_custom_controller) |
diff --git a/keyboards/kinesis/stapelberg/stapelberg.h b/keyboards/kinesis/stapelberg/stapelberg.h index 8c8619745..e35e2f5db 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.h +++ b/keyboards/kinesis/stapelberg/stapelberg.h | |||
| @@ -3,45 +3,77 @@ | |||
| 3 | 3 | ||
| 4 | #include "quantum.h" | 4 | #include "quantum.h" |
| 5 | 5 | ||
| 6 | #define ___ KC_NO | ||
| 7 | |||
| 6 | // This a shortcut to help you visually see your layout. | 8 | // This a shortcut to help you visually see your layout. |
| 7 | // The first section contains all of the arguments as on the physical keyboard | 9 | // The first section contains all of the arguments as on the physical keyboard |
| 8 | // The second converts the arguments into the 2-D scanned array | 10 | // The second converts the arguments into the 2-D scanned array |
| 9 | 11 | ||
| 10 | #define KEYMAP( \ | 12 | #define LAYOUT( \ |
| 11 | kC0,kD0,kE0,kC1,kD1,kE1,kC2,kD2,kE2, \ | 13 | kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \ |
| 12 | k00,k10,k20,k30,k40,k50, \ | 14 | k00, k10, k20, k30, k40, k50, \ |
| 13 | k01,k11,k21,k31,k41,k51, \ | 15 | k01, k11, k21, k31, k41, k51, \ |
| 14 | k02,k12,k22,k32,k42,k52, \ | 16 | k02, k12, k22, k32, k42, k52, \ |
| 15 | k03,k13,k23,k33,k43,k53, \ | 17 | k03, k13, k23, k33, k43, k53, \ |
| 16 | k14,k24,k34,k54, \ | 18 | k14, k24, k34, k54, \ |
| 17 | k56,k55, \ | 19 | k56, k55, \ |
| 18 | k35, \ | 20 | k35, \ |
| 19 | k36,k46,k25, \ | 21 | k36, k46, k25, \ |
| 20 | kC3,kD3,kE3,kC4,kD4,kE4,kC5,kE5,kD5, \ | 22 | \ |
| 21 | k60,k70,k80,k90,kA0,kB0, \ | 23 | kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \ |
| 22 | k61,k71,k81,k91,kA1,kB1, \ | 24 | k60, k70, k80, k90, kA0, kB0, \ |
| 23 | k62,k72,k82,k92,kA2,kB2, \ | 25 | k61, k71, k81, k91, kA1, kB1, \ |
| 24 | k63,k73,k83,k93,kA3,kB3, \ | 26 | k62, k72, k82, k92, kA2, kB2, \ |
| 25 | k64,k84,k94,kA4, \ | 27 | k63, k73, k83, k93, kA3, kB3, \ |
| 26 | k96,k85, \ | 28 | k64, k84, k94, kA4, \ |
| 27 | k86, \ | 29 | k96, k85, \ |
| 28 | k66,k75,k65 \ | 30 | k86, \ |
| 29 | ) { \ | 31 | k66, k75, k65 \ |
| 30 | { k00, k01, k02, k03, KC_NO, KC_NO, KC_NO }, \ | 32 | ) { \ |
| 31 | { k10, k11, k12, k13, k14, KC_NO, KC_NO }, \ | 33 | { k00, k01, k02, k03, ___, ___, ___ }, \ |
| 32 | { k20, k21, k22, k23, k24, k25, KC_NO }, \ | 34 | { k10, k11, k12, k13, k14, ___, ___ }, \ |
| 33 | { k30, k31, k32, k33, k34, k35, k36 }, \ | 35 | { k20, k21, k22, k23, k24, k25, ___ }, \ |
| 34 | { k40, k41, k42, k43, KC_NO, KC_NO, k46 }, \ | 36 | { k30, k31, k32, k33, k34, k35, k36 }, \ |
| 35 | { k50, k51, k52, k53, k54, k55, k56 }, \ | 37 | { k40, k41, k42, k43, ___, ___, k46 }, \ |
| 36 | { k60, k61, k62, k63, k64, k65, k66 }, \ | 38 | { k50, k51, k52, k53, k54, k55, k56 }, \ |
| 37 | { k70, k71, k72, k73, KC_NO, k75, KC_NO }, \ | 39 | { k60, k61, k62, k63, k64, k65, k66 }, \ |
| 38 | { k80, k81, k82, k83, k84, k85, k86 }, \ | 40 | { k70, k71, k72, k73, ___, k75, ___ }, \ |
| 39 | { k90, k91, k92, k93, k94, KC_NO, k96 }, \ | 41 | { k80, k81, k82, k83, k84, k85, k86 }, \ |
| 40 | { kA0, kA1, kA2, kA3, kA4, KC_NO, KC_NO }, \ | 42 | { k90, k91, k92, k93, k94, ___, k96 }, \ |
| 41 | { kB0, kB1, kB2, kB3, KC_NO, KC_NO, KC_NO }, \ | 43 | { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \ |
| 42 | { kC0, kC1, kC2, kC3, kC4, kC5, KC_NO }, \ | 44 | { kB0, kB1, kB2, kB3, ___, ___, ___ }, \ |
| 43 | { kD0, kD1, kD2, kD3, kD4, kD5, KC_NO }, \ | 45 | { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \ |
| 44 | { kE0, kE1, kE2, kE3, kE4, kE5, KC_NO } \ | 46 | { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \ |
| 47 | { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \ | ||
| 48 | } | ||
| 49 | |||
| 50 | /* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */ | ||
| 51 | #define LAYOUT_pretty( \ | ||
| 52 | kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \ | ||
| 53 | k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \ | ||
| 54 | k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \ | ||
| 55 | k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \ | ||
| 56 | k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \ | ||
| 57 | k14, k24, k34, k54, k64, k84, k94, kA4, \ | ||
| 58 | k56, k55, k96, k85, \ | ||
| 59 | k35, k86, \ | ||
| 60 | k36, k46, k25, k66, k75, k65 \ | ||
| 61 | ) { \ | ||
| 62 | { k00, k01, k02, k03, ___, ___, ___ }, \ | ||
| 63 | { k10, k11, k12, k13, k14, ___, ___ }, \ | ||
| 64 | { k20, k21, k22, k23, k24, k25, ___ }, \ | ||
| 65 | { k30, k31, k32, k33, k34, k35, k36 }, \ | ||
| 66 | { k40, k41, k42, k43, ___, ___, k46 }, \ | ||
| 67 | { k50, k51, k52, k53, k54, k55, k56 }, \ | ||
| 68 | { k60, k61, k62, k63, k64, k65, k66 }, \ | ||
| 69 | { k70, k71, k72, k73, ___, k75, ___ }, \ | ||
| 70 | { k80, k81, k82, k83, k84, k85, k86 }, \ | ||
| 71 | { k90, k91, k92, k93, k94, ___, k96 }, \ | ||
| 72 | { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \ | ||
| 73 | { kB0, kB1, kB2, kB3, ___, ___, ___ }, \ | ||
| 74 | { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \ | ||
| 75 | { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \ | ||
| 76 | { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \ | ||
| 45 | } | 77 | } |
| 46 | 78 | ||
| 47 | /* | 79 | /* |
