diff options
| author | elmo-space <lorwel@mailbox.org> | 2020-06-13 20:45:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 11:45:03 -0700 |
| commit | 1f2807c2deb0f90222090537feca38682c9aa5b5 (patch) | |
| tree | 232e3161b56566b7f17015d617b5e96392ee321d /keyboards/kbdfans | |
| parent | b1609133095509e9929d6f9bf7a581a67b077fbd (diff) | |
| download | qmk_firmware-1f2807c2deb0f90222090537feca38682c9aa5b5.tar.gz qmk_firmware-1f2807c2deb0f90222090537feca38682c9aa5b5.zip | |
Add ANSI and ISO layout for KBD67mkII soldered PCB (#9340)
* add ansi and iso layouts
* fix iso map mistake
* fix mistake again...
* Update keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c
* rename layout macros to the blocker variants and add ansi_split_bs
* Apply suggestions from code review
Diffstat (limited to 'keyboards/kbdfans')
9 files changed, 435 insertions, 79 deletions
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json index 6440a007e..72c851e35 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json | |||
| @@ -7,77 +7,289 @@ | |||
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_all": { | 8 | "LAYOUT_all": { |
| 9 | "layout": [{"label":"~", "x":0, "y":0}, | 9 | "layout": [{"label":"~", "x":0, "y":0}, |
| 10 | {"label":"!", "x":1, "y":0}, | 10 | {"label":"!", "x":1, "y":0}, |
| 11 | {"label":"@", "x":2, "y":0}, | 11 | {"label":"@", "x":2, "y":0}, |
| 12 | {"label":"#", "x":3, "y":0}, | 12 | {"label":"#", "x":3, "y":0}, |
| 13 | {"label":"$", "x":4, "y":0}, | 13 | {"label":"$", "x":4, "y":0}, |
| 14 | {"label":"%", "x":5, "y":0}, | 14 | {"label":"%", "x":5, "y":0}, |
| 15 | {"label":"^", "x":6, "y":0}, | 15 | {"label":"^", "x":6, "y":0}, |
| 16 | {"label":"&", "x":7, "y":0}, | 16 | {"label":"&", "x":7, "y":0}, |
| 17 | {"label":"*", "x":8, "y":0}, | 17 | {"label":"*", "x":8, "y":0}, |
| 18 | {"label":"(", "x":9, "y":0}, | 18 | {"label":"(", "x":9, "y":0}, |
| 19 | {"label":")", "x":10, "y":0}, | 19 | {"label":")", "x":10, "y":0}, |
| 20 | {"label":"_", "x":11, "y":0}, | 20 | {"label":"_", "x":11, "y":0}, |
| 21 | {"label":"+", "x":12, "y":0}, | 21 | {"label":"+", "x":12, "y":0}, |
| 22 | {"label":"Back Space", "x":13, "y":0}, | 22 | {"label":"Back Space", "x":13, "y":0}, |
| 23 | {"label":"Delete", "x":14, "y":0}, | 23 | {"label":"Delete", "x":14, "y":0}, |
| 24 | {"label":"Home", "x":15, "y":0}, | 24 | {"label":"Home", "x":15, "y":0}, |
| 25 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | 25 | {"label":"Tab", "x":0, "y":1, "w":1.5}, |
| 26 | {"label":"Q", "x":1.5, "y":1}, | 26 | {"label":"Q", "x":1.5, "y":1}, |
| 27 | {"label":"W", "x":2.5, "y":1}, | 27 | {"label":"W", "x":2.5, "y":1}, |
| 28 | {"label":"E", "x":3.5, "y":1}, | 28 | {"label":"E", "x":3.5, "y":1}, |
| 29 | {"label":"R", "x":4.5, "y":1}, | 29 | {"label":"R", "x":4.5, "y":1}, |
| 30 | {"label":"T", "x":5.5, "y":1}, | 30 | {"label":"T", "x":5.5, "y":1}, |
| 31 | {"label":"Y", "x":6.5, "y":1}, | 31 | {"label":"Y", "x":6.5, "y":1}, |
| 32 | {"label":"U", "x":7.5, "y":1}, | 32 | {"label":"U", "x":7.5, "y":1}, |
| 33 | {"label":"I", "x":8.5, "y":1}, | 33 | {"label":"I", "x":8.5, "y":1}, |
| 34 | {"label":"O", "x":9.5, "y":1}, | 34 | {"label":"O", "x":9.5, "y":1}, |
| 35 | {"label":"P", "x":10.5, "y":1}, | 35 | {"label":"P", "x":10.5, "y":1}, |
| 36 | {"label":"{", "x":11.5, "y":1}, | 36 | {"label":"{", "x":11.5, "y":1}, |
| 37 | {"label":"}", "x":12.5, "y":1}, | 37 | {"label":"}", "x":12.5, "y":1}, |
| 38 | {"label":"|", "x":13.5, "y":1, "w":1.5}, | 38 | {"label":"|", "x":13.5, "y":1, "w":1.5}, |
| 39 | {"label":"End", "x":15, "y":1}, | 39 | {"label":"End", "x":15, "y":1}, |
| 40 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | 40 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, |
| 41 | {"label":"A", "x":1.75, "y":2}, | 41 | {"label":"A", "x":1.75, "y":2}, |
| 42 | {"label":"S", "x":2.75, "y":2}, | 42 | {"label":"S", "x":2.75, "y":2}, |
| 43 | {"label":"D", "x":3.75, "y":2}, | 43 | {"label":"D", "x":3.75, "y":2}, |
| 44 | {"label":"F", "x":4.75, "y":2}, | 44 | {"label":"F", "x":4.75, "y":2}, |
| 45 | {"label":"G", "x":5.75, "y":2}, | 45 | {"label":"G", "x":5.75, "y":2}, |
| 46 | {"label":"H", "x":6.75, "y":2}, | 46 | {"label":"H", "x":6.75, "y":2}, |
| 47 | {"label":"J", "x":7.75, "y":2}, | 47 | {"label":"J", "x":7.75, "y":2}, |
| 48 | {"label":"K", "x":8.75, "y":2}, | 48 | {"label":"K", "x":8.75, "y":2}, |
| 49 | {"label":"L", "x":9.75, "y":2}, | 49 | {"label":"L", "x":9.75, "y":2}, |
| 50 | {"label":":", "x":10.75, "y":2}, | 50 | {"label":":", "x":10.75, "y":2}, |
| 51 | {"label":"\"", "x":11.75, "y":2}, | 51 | {"label":"\"", "x":11.75, "y":2}, |
| 52 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | 52 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, |
| 53 | {"label":"PgUp", "x":15, "y":2}, | 53 | {"label":"PgUp", "x":15, "y":2}, |
| 54 | {"label":"Shift", "x":0, "y":3, "w":1.25}, | 54 | {"label":"Shift", "x":0, "y":3, "w":1.25}, |
| 55 | {"label":"Hi", "x":1.25, "y":3}, | 55 | {"label":"Hi", "x":1.25, "y":3}, |
| 56 | {"label":"Z", "x":2.25, "y":3}, | 56 | {"label":"Z", "x":2.25, "y":3}, |
| 57 | {"label":"X", "x":3.25, "y":3}, | 57 | {"label":"X", "x":3.25, "y":3}, |
| 58 | {"label":"C", "x":4.25, "y":3}, | 58 | {"label":"C", "x":4.25, "y":3}, |
| 59 | {"label":"V", "x":5.25, "y":3}, | 59 | {"label":"V", "x":5.25, "y":3}, |
| 60 | {"label":"B", "x":6.25, "y":3}, | 60 | {"label":"B", "x":6.25, "y":3}, |
| 61 | {"label":"N", "x":7.25, "y":3}, | 61 | {"label":"N", "x":7.25, "y":3}, |
| 62 | {"label":"M", "x":8.25, "y":3}, | 62 | {"label":"M", "x":8.25, "y":3}, |
| 63 | {"label":"<", "x":9.25, "y":3}, | 63 | {"label":"<", "x":9.25, "y":3}, |
| 64 | {"label":">", "x":10.25, "y":3}, | 64 | {"label":">", "x":10.25, "y":3}, |
| 65 | {"label":"?", "x":11.25, "y":3}, | 65 | {"label":"?", "x":11.25, "y":3}, |
| 66 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | 66 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, |
| 67 | {"label":"↑", "x":14, "y":3}, | 67 | {"label":"↑", "x":14, "y":3}, |
| 68 | {"label":"PgDn", "x":15, "y":3}, | 68 | {"label":"PgDn", "x":15, "y":3}, |
| 69 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | 69 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, |
| 70 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, | 70 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, |
| 71 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | 71 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, |
| 72 | {"x":3.75, "y":4, "w":2.25}, | 72 | {"x":3.75, "y":4, "w":2.25}, |
| 73 | {"x":6, "y":4, "w":1.25}, | 73 | {"x":6, "y":4, "w":1.25}, |
| 74 | {"x":7.25, "y":4, "w":2.75}, | 74 | {"x":7.25, "y":4, "w":2.75}, |
| 75 | {"label":"Alt", "x":10, "y":4, "w":1.25}, | 75 | {"label":"Alt", "x":10, "y":4, "w":1.25}, |
| 76 | {"label":"Win", "x":11.25, "y":4, "w":1.25}, | 76 | {"label":"Win", "x":11.25, "y":4, "w":1.25}, |
| 77 | {"label":"←", "x":13, "y":4}, | 77 | {"label":"←", "x":13, "y":4}, |
| 78 | {"label":"↓", "x":14, "y":4}, | 78 | {"label":"↓", "x":14, "y":4}, |
| 79 | {"label":"→", "x":15, "y":4} | 79 | {"label":"→", "x":15, "y":4} |
| 80 | ] | 80 | ] |
| 81 | }, | ||
| 82 | "LAYOUT_65_ansi_blocker": { | ||
| 83 | "layout": [{"label":"Esc", "x":0, "y":0}, | ||
| 84 | {"label":"!", "x":1, "y":0}, | ||
| 85 | {"label":"@", "x":2, "y":0}, | ||
| 86 | {"label":"#", "x":3, "y":0}, | ||
| 87 | {"label":"$", "x":4, "y":0}, | ||
| 88 | {"label":"%", "x":5, "y":0}, | ||
| 89 | {"label":"^", "x":6, "y":0}, | ||
| 90 | {"label":"&", "x":7, "y":0}, | ||
| 91 | {"label":"*", "x":8, "y":0}, | ||
| 92 | {"label":"(", "x":9, "y":0}, | ||
| 93 | {"label":")", "x":10, "y":0}, | ||
| 94 | {"label":"_", "x":11, "y":0}, | ||
| 95 | {"label":"+", "x":12, "y":0}, | ||
| 96 | {"label":"Backspace", "x":13, "y":0, "w":2}, | ||
| 97 | {"label":"Home", "x":15, "y":0}, | ||
| 98 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
| 99 | {"label":"Q", "x":1.5, "y":1}, | ||
| 100 | {"label":"W", "x":2.5, "y":1}, | ||
| 101 | {"label":"E", "x":3.5, "y":1}, | ||
| 102 | {"label":"R", "x":4.5, "y":1}, | ||
| 103 | {"label":"T", "x":5.5, "y":1}, | ||
| 104 | {"label":"Y", "x":6.5, "y":1}, | ||
| 105 | {"label":"U", "x":7.5, "y":1}, | ||
| 106 | {"label":"I", "x":8.5, "y":1}, | ||
| 107 | {"label":"O", "x":9.5, "y":1}, | ||
| 108 | {"label":"P", "x":10.5, "y":1}, | ||
| 109 | {"label":"{", "x":11.5, "y":1}, | ||
| 110 | {"label":"}", "x":12.5, "y":1}, | ||
| 111 | {"label":"|", "x":13.5, "y":1, "w":1.5}, | ||
| 112 | {"label":"End", "x":15, "y":1}, | ||
| 113 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
| 114 | {"label":"A", "x":1.75, "y":2}, | ||
| 115 | {"label":"S", "x":2.75, "y":2}, | ||
| 116 | {"label":"D", "x":3.75, "y":2}, | ||
| 117 | {"label":"F", "x":4.75, "y":2}, | ||
| 118 | {"label":"G", "x":5.75, "y":2}, | ||
| 119 | {"label":"H", "x":6.75, "y":2}, | ||
| 120 | {"label":"J", "x":7.75, "y":2}, | ||
| 121 | {"label":"K", "x":8.75, "y":2}, | ||
| 122 | {"label":"L", "x":9.75, "y":2}, | ||
| 123 | {"label":":", "x":10.75, "y":2}, | ||
| 124 | {"label":"\"", "x":11.75, "y":2}, | ||
| 125 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||
| 126 | {"label":"PgUp", "x":15, "y":2}, | ||
| 127 | {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||
| 128 | {"label":"Z", "x":2.25, "y":3}, | ||
| 129 | {"label":"X", "x":3.25, "y":3}, | ||
| 130 | {"label":"C", "x":4.25, "y":3}, | ||
| 131 | {"label":"V", "x":5.25, "y":3}, | ||
| 132 | {"label":"B", "x":6.25, "y":3}, | ||
| 133 | {"label":"N", "x":7.25, "y":3}, | ||
| 134 | {"label":"M", "x":8.25, "y":3}, | ||
| 135 | {"label":"<", "x":9.25, "y":3}, | ||
| 136 | {"label":">", "x":10.25, "y":3}, | ||
| 137 | {"label":"?", "x":11.25, "y":3}, | ||
| 138 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
| 139 | {"label":"\u2191", "x":14, "y":3}, | ||
| 140 | {"label":"PgDn", "x":15, "y":3}, | ||
| 141 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||
| 142 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||
| 143 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||
| 144 | {"x":3.75, "y":4, "w":6.25}, | ||
| 145 | {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||
| 146 | {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, | ||
| 147 | {"label":"\u2190", "x":13, "y":4}, | ||
| 148 | {"label":"\u2193", "x":14, "y":4}, | ||
| 149 | {"label":"\u2192", "x":15, "y":4} | ||
| 150 | ] | ||
| 151 | }, | ||
| 152 | "LAYOUT_65_iso_blocker": { | ||
| 153 | "layout": [{"label":"Esc", "x":0, "y":0}, | ||
| 154 | {"label":"!", "x":1, "y":0}, | ||
| 155 | {"label":"@", "x":2, "y":0}, | ||
| 156 | {"label":"#", "x":3, "y":0}, | ||
| 157 | {"label":"$", "x":4, "y":0}, | ||
| 158 | {"label":"%", "x":5, "y":0}, | ||
| 159 | {"label":"^", "x":6, "y":0}, | ||
| 160 | {"label":"&", "x":7, "y":0}, | ||
| 161 | {"label":"*", "x":8, "y":0}, | ||
| 162 | {"label":"(", "x":9, "y":0}, | ||
| 163 | {"label":")", "x":10, "y":0}, | ||
| 164 | {"label":"_", "x":11, "y":0}, | ||
| 165 | {"label":"+", "x":12, "y":0}, | ||
| 166 | {"label":"Backspace", "x":13, "y":0, "w":2}, | ||
| 167 | {"label":"Home", "x":15, "y":0}, | ||
| 168 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
| 169 | {"label":"Q", "x":1.5, "y":1}, | ||
| 170 | {"label":"W", "x":2.5, "y":1}, | ||
| 171 | {"label":"E", "x":3.5, "y":1}, | ||
| 172 | {"label":"R", "x":4.5, "y":1}, | ||
| 173 | {"label":"T", "x":5.5, "y":1}, | ||
| 174 | {"label":"Y", "x":6.5, "y":1}, | ||
| 175 | {"label":"U", "x":7.5, "y":1}, | ||
| 176 | {"label":"I", "x":8.5, "y":1}, | ||
| 177 | {"label":"O", "x":9.5, "y":1}, | ||
| 178 | {"label":"P", "x":10.5, "y":1}, | ||
| 179 | {"label":"{", "x":11.5, "y":1}, | ||
| 180 | {"label":"}", "x":12.5, "y":1}, | ||
| 181 | {"label":"End", "x":15, "y":1}, | ||
| 182 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
| 183 | {"label":"A", "x":1.75, "y":2}, | ||
| 184 | {"label":"S", "x":2.75, "y":2}, | ||
| 185 | {"label":"D", "x":3.75, "y":2}, | ||
| 186 | {"label":"F", "x":4.75, "y":2}, | ||
| 187 | {"label":"G", "x":5.75, "y":2}, | ||
| 188 | {"label":"H", "x":6.75, "y":2}, | ||
| 189 | {"label":"J", "x":7.75, "y":2}, | ||
| 190 | {"label":"K", "x":8.75, "y":2}, | ||
| 191 | {"label":"L", "x":9.75, "y":2}, | ||
| 192 | {"label":":", "x":10.75, "y":2}, | ||
| 193 | {"label":"\"", "x":11.75, "y":2}, | ||
| 194 | {"label":"~", "x":12.75, "y":2}, | ||
| 195 | {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, | ||
| 196 | {"label":"PgUp", "x":15, "y":2}, | ||
| 197 | {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||
| 198 | {"label":"|", "x":1.25, "y":3}, | ||
| 199 | {"label":"Z", "x":2.25, "y":3}, | ||
| 200 | {"label":"X", "x":3.25, "y":3}, | ||
| 201 | {"label":"C", "x":4.25, "y":3}, | ||
| 202 | {"label":"V", "x":5.25, "y":3}, | ||
| 203 | {"label":"B", "x":6.25, "y":3}, | ||
| 204 | {"label":"N", "x":7.25, "y":3}, | ||
| 205 | {"label":"M", "x":8.25, "y":3}, | ||
| 206 | {"label":"<", "x":9.25, "y":3}, | ||
| 207 | {"label":">", "x":10.25, "y":3}, | ||
| 208 | {"label":"?", "x":11.25, "y":3}, | ||
| 209 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
| 210 | {"label":"\u2191", "x":14, "y":3}, | ||
| 211 | {"label":"PgDn", "x":15, "y":3}, | ||
| 212 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||
| 213 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||
| 214 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||
| 215 | {"x":3.75, "y":4, "w":6.25}, | ||
| 216 | {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||
| 217 | {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, | ||
| 218 | {"label":"\u2190", "x":13, "y":4}, | ||
| 219 | {"label":"\u2193", "x":14, "y":4}, | ||
| 220 | {"label":"\u2192", "x":15, "y":4} | ||
| 221 | ] | ||
| 222 | }, | ||
| 223 | "LAYOUT_65_ansi_blocker_split_bs": { | ||
| 224 | "layout": [{"label":"Esc", "x":0, "y":0}, | ||
| 225 | {"label":"!", "x":1, "y":0}, | ||
| 226 | {"label":"@", "x":2, "y":0}, | ||
| 227 | {"label":"#", "x":3, "y":0}, | ||
| 228 | {"label":"$", "x":4, "y":0}, | ||
| 229 | {"label":"%", "x":5, "y":0}, | ||
| 230 | {"label":"^", "x":6, "y":0}, | ||
| 231 | {"label":"&", "x":7, "y":0}, | ||
| 232 | {"label":"*", "x":8, "y":0}, | ||
| 233 | {"label":"(", "x":9, "y":0}, | ||
| 234 | {"label":")", "x":10, "y":0}, | ||
| 235 | {"label":"_", "x":11, "y":0}, | ||
| 236 | {"label":"+", "x":12, "y":0}, | ||
| 237 | {"label":"|", "x":13, "y":0}, | ||
| 238 | {"label":"Del", "x":14, "y":0}, | ||
| 239 | {"label":"Home", "x":15, "y":0}, | ||
| 240 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
| 241 | {"label":"Q", "x":1.5, "y":1}, | ||
| 242 | {"label":"W", "x":2.5, "y":1}, | ||
| 243 | {"label":"E", "x":3.5, "y":1}, | ||
| 244 | {"label":"R", "x":4.5, "y":1}, | ||
| 245 | {"label":"T", "x":5.5, "y":1}, | ||
| 246 | {"label":"Y", "x":6.5, "y":1}, | ||
| 247 | {"label":"U", "x":7.5, "y":1}, | ||
| 248 | {"label":"I", "x":8.5, "y":1}, | ||
| 249 | {"label":"O", "x":9.5, "y":1}, | ||
| 250 | {"label":"P", "x":10.5, "y":1}, | ||
| 251 | {"label":"{", "x":11.5, "y":1}, | ||
| 252 | {"label":"}", "x":12.5, "y":1}, | ||
| 253 | {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, | ||
| 254 | {"label":"End", "x":15, "y":1}, | ||
| 255 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
| 256 | {"label":"A", "x":1.75, "y":2}, | ||
| 257 | {"label":"S", "x":2.75, "y":2}, | ||
| 258 | {"label":"D", "x":3.75, "y":2}, | ||
| 259 | {"label":"F", "x":4.75, "y":2}, | ||
| 260 | {"label":"G", "x":5.75, "y":2}, | ||
| 261 | {"label":"H", "x":6.75, "y":2}, | ||
| 262 | {"label":"J", "x":7.75, "y":2}, | ||
| 263 | {"label":"K", "x":8.75, "y":2}, | ||
| 264 | {"label":"L", "x":9.75, "y":2}, | ||
| 265 | {"label":":", "x":10.75, "y":2}, | ||
| 266 | {"label":"\"", "x":11.75, "y":2}, | ||
| 267 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||
| 268 | {"label":"PgUp", "x":15, "y":2}, | ||
| 269 | {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||
| 270 | {"label":"Z", "x":2.25, "y":3}, | ||
| 271 | {"label":"X", "x":3.25, "y":3}, | ||
| 272 | {"label":"C", "x":4.25, "y":3}, | ||
| 273 | {"label":"V", "x":5.25, "y":3}, | ||
| 274 | {"label":"B", "x":6.25, "y":3}, | ||
| 275 | {"label":"N", "x":7.25, "y":3}, | ||
| 276 | {"label":"M", "x":8.25, "y":3}, | ||
| 277 | {"label":"<", "x":9.25, "y":3}, | ||
| 278 | {"label":">", "x":10.25, "y":3}, | ||
| 279 | {"label":"?", "x":11.25, "y":3}, | ||
| 280 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
| 281 | {"label":"\u2191", "x":14, "y":3}, | ||
| 282 | {"label":"PgDn", "x":15, "y":3}, | ||
| 283 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||
| 284 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||
| 285 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||
| 286 | {"x":3.75, "y":4, "w":6.25}, | ||
| 287 | {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||
| 288 | {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||
| 289 | {"label":"\u2190", "x":13, "y":4}, | ||
| 290 | {"label":"\u2193", "x":14, "y":4}, | ||
| 291 | {"label":"\u2192", "x":15, "y":4} | ||
| 292 | ] | ||
| 81 | } | 293 | } |
| 82 | } | 294 | } |
| 83 | } | 295 | } |
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c new file mode 100644 index 000000000..1f093baab --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | /* Copyright 2020 elmo-space<mail@elmo.space> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | [0] = LAYOUT_65_ansi_blocker( /* Base */ | ||
| 20 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, | ||
| 21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, | ||
| 22 | MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, | ||
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 25 | ), | ||
| 26 | [1] = LAYOUT_65_ansi_blocker( /* FN */ | ||
| 27 | RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_INC, | ||
| 28 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | ||
| 32 | ) | ||
| 33 | }; | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md new file mode 100644 index 000000000..051a9ce16 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # The default ANSI keymap for KBD67 MKII | ||
| 2 | |||
| 3 | A basic 65% keymap. | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c new file mode 100644 index 000000000..1c443ae73 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | /* Copyright 2020 elmo-space<mail@elmo.space> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | [0] = LAYOUT_65_ansi_blocker_split_bs( /* Base */ | ||
| 20 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_HOME, | ||
| 21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_END, | ||
| 22 | MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, | ||
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 25 | ), | ||
| 26 | [1] = LAYOUT_65_ansi_blocker_split_bs( /* FN */ | ||
| 27 | RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_INC, | ||
| 28 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | ||
| 32 | ) | ||
| 33 | }; | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md new file mode 100644 index 000000000..1f3f36335 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # The default ANSI with Split Backspace keymap for KBD67 MKII | ||
| 2 | |||
| 3 | A basic 65% keymap. | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c index 6dcbf00dd..61f3aa8c5 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c | |||
| @@ -15,13 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | /* K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \ | ||
| 19 | * K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | ||
| 20 | * K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ | ||
| 21 | * K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | ||
| 22 | * K400, K401, K402, K403, K405, K407, K409, K410, K411, K413, K414 \ | ||
| 23 | */ | ||
| 24 | |||
| 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 26 | [0] = LAYOUT_all( /* Base */ | 19 | [0] = LAYOUT_all( /* Base */ |
| 27 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, | 20 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, |
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c new file mode 100644 index 000000000..c49da9572 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | /* Copyright 2019 Ryota Goto | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 18 | [0] = LAYOUT_65_iso_blocker( /* Base */ | ||
| 19 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, | ||
| 20 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, | ||
| 21 | MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, | ||
| 22 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 23 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 24 | ), | ||
| 25 | [1] = LAYOUT_65_iso_blocker( /* FN */ | ||
| 26 | RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_INC, | ||
| 27 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, | ||
| 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | ||
| 31 | ) | ||
| 32 | }; | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md new file mode 100644 index 000000000..e2dd06107 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # The default ISO keymap for KBD67 MKII | ||
| 2 | |||
| 3 | A basic 65% keymap. | ||
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h index 7eb11f1ff..6b80aa20b 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h +++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h | |||
| @@ -37,7 +37,51 @@ | |||
| 37 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ | 37 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ |
| 38 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ | 38 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ |
| 39 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | 39 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ |
| 40 | { K400, K401, K402, K403, K404, K405, KC_NO, K407, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ | 40 | { K400, K401, K402, K403, K404, K405, KC_NO, K407, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | #define LAYOUT_65_ansi_blocker( \ | ||
| 44 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | ||
| 45 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | ||
| 46 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ | ||
| 47 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | ||
| 48 | K400, K401, K402, K405, K409, K410, K411, K413, K414 \ | ||
| 49 | ) \ | ||
| 50 | { \ | ||
| 51 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ | ||
| 52 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ | ||
| 53 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ | ||
| 54 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | ||
| 55 | { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ | ||
| 56 | } | ||
| 57 | |||
| 58 | #define LAYOUT_65_ansi_blocker_split_bs( \ | ||
| 59 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \ | ||
| 60 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | ||
| 61 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ | ||
| 62 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | ||
| 63 | K400, K401, K402, K405, K409, K410, K411, K413, K414 \ | ||
| 64 | ) \ | ||
| 65 | { \ | ||
| 66 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ | ||
| 67 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ | ||
| 68 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ | ||
| 69 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | ||
| 70 | { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ | ||
| 71 | } | ||
| 43 | 72 | ||
| 73 | |||
| 74 | #define LAYOUT_65_iso_blocker( \ | ||
| 75 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | ||
| 76 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \ | ||
| 77 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ | ||
| 78 | K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | ||
| 79 | K400, K401, K402, K405, K409, K410, K411, K413, K414 \ | ||
| 80 | ) \ | ||
| 81 | { \ | ||
| 82 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ | ||
| 83 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114 }, \ | ||
| 84 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ | ||
| 85 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | ||
| 86 | { K400, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ | ||
| 87 | } | ||
