diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2020-10-01 12:36:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 12:36:52 -0700 |
| commit | b31df1af94abdf26bb7bcbf5183c05be1c500005 (patch) | |
| tree | e2df530e97adff304a772f20863842b326f46dc8 | |
| parent | 7a2124db6bfea74672acd714d78c10eb9288732a (diff) | |
| download | qmk_firmware-b31df1af94abdf26bb7bcbf5183c05be1c500005.tar.gz qmk_firmware-b31df1af94abdf26bb7bcbf5183c05be1c500005.zip | |
KBDFans KBD19x: VIA Support & LAYOUT macro fixing (#10401)
* first pass at fixing the key labeling
* second pass of fixing key labeling
* third pass of this key naming
* another pass of changing key naming
* another pass
* another pass
* another pass
* renamed it all
* give a good vid and pid
* add via keymap
* add on to the comments
* update readme and comments
* one more small change
| -rw-r--r-- | keyboards/kbdfans/kbd19x/config.h | 4 | ||||
| -rw-r--r-- | keyboards/kbdfans/kbd19x/kbd19x.h | 77 | ||||
| -rw-r--r-- | keyboards/kbdfans/kbd19x/keymaps/via/keymap.c | 56 | ||||
| -rw-r--r-- | keyboards/kbdfans/kbd19x/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/kbdfans/kbd19x/readme.md | 6 |
5 files changed, 102 insertions, 43 deletions
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 3fcda998c..1146afa62 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h | |||
| @@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | #include "config_common.h" | 20 | #include "config_common.h" |
| 21 | 21 | ||
| 22 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
| 23 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0x4B42 |
| 24 | #define PRODUCT_ID 0x0000 | 24 | #define PRODUCT_ID 0x0191 |
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER KBDFans | 26 | #define MANUFACTURER KBDFans |
| 27 | #define PRODUCT kbd19x | 27 | #define PRODUCT kbd19x |
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 73f3cbe16..28ad83158 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h | |||
| @@ -41,61 +41,62 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } | |||
| 41 | * represents the switch matrix. | 41 | * represents the switch matrix. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | // 2u backspace: XXX, k1e | 44 | // 2u backspace: XXX, k71 |
| 45 | // split backspace: k1d, k1e | 45 | // split backspace: k70, k71 |
| 46 | 46 | ||
| 47 | // 2u numpad +: k2i, XXX | 47 | // 2u numpad +: k2c, XXX |
| 48 | // split numpad +: k2i, k3i | 48 | // split numpad +: k2c, k3c |
| 49 | 49 | ||
| 50 | // 2u numpad enter: k4i, XXX | 50 | // 2u numpad enter: k4c, XXX |
| 51 | // split numpad enter: k4i, k5i | 51 | // split numpad enter: k4c, k5c |
| 52 | 52 | ||
| 53 | // 2.25u lshift: k40, XXX | 53 | // 2.25u lshift: k40, XXX |
| 54 | // split (1.25u, 1u) lshift: k40, k41 | 54 | // split (1.25u, 1u) lshift: k40, k41 |
| 55 | 55 | ||
| 56 | // ANSI enter or ISO enter: k3e | 56 | // ANSI enter or ISO enter: k38 |
| 57 | // backslash or NUHS: k2e | 57 | // Key next to ISO enter: k72 |
| 58 | // backslash or NUHS: k73 | ||
| 58 | 59 | ||
| 59 | // left winkey: k50, k51, k52 | 60 | // left winkey: k50, k51, k52 |
| 60 | // left WKL: k50, XXX, k52 | 61 | // left WKL: k50, XXX, k52 |
| 61 | 62 | ||
| 62 | // right winkey: k59, k5a, k5b | 63 | // right winkey: k55, k56, k57 |
| 63 | // right WKL: k59, XXX, k5b | 64 | // right WKL: k55, XXX, k57 |
| 64 | 65 | ||
| 65 | #define LAYOUT_all( \ | 66 | #define LAYOUT_all( \ |
| 66 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, k0i, \ | 67 | k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ |
| 67 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, \ | 68 | k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k70, k71, k19, k1a, k1b, k1c, \ |
| 68 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, k2h, k2i, \ | 69 | k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k29, k2a, k2b, k2c, \ |
| 69 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i, \ | 70 | k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ |
| 70 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4e, k4f, k4g, k4h, k4i, \ | 71 | k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k49, k4a, k4b, k4c, \ |
| 71 | k50, k51, k52, k56, k59, k5a, k5b, k5d, k5e, k5f, k5g, k5h, k5i \ | 72 | k50, k51, k52, k59, k55, k56, k57, k58, k53, k54, k5a, k5b, k5c \ |
| 72 | )\ | 73 | )\ |
| 73 | {\ | 74 | {\ |
| 74 | {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ | 75 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ |
| 75 | {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\ | 76 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\ |
| 76 | {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ | 77 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\ |
| 77 | {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i},\ | 78 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c},\ |
| 78 | {k40, k41, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ | 79 | {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\ |
| 79 | {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5i},\ | 80 | {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c},\ |
| 80 | {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\ | 81 | {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ |
| 81 | {k1d, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\ | 82 | {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ |
| 82 | } | 83 | } |
| 83 | 84 | ||
| 84 | #define LAYOUT_ansi( \ | 85 | #define LAYOUT_ansi( \ |
| 85 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, k0i, \ | 86 | k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ |
| 86 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, k1h, k1i, \ | 87 | k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k71, k19, k1a, k1b, k1c, \ |
| 87 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, k2h, k2i, \ | 88 | k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k29, k2a, k2b, k2c, \ |
| 88 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, k3h, \ | 89 | k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, \ |
| 89 | k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4e, k4f, k4g, k4h, k4i, \ | 90 | k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k49, k4a, k4b, k4c, \ |
| 90 | k50, k51, k52, k56, k59, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ | 91 | k50, k51, k52, k59, k55, k56, k57, k58, k53, k54, k5a, k5b \ |
| 91 | )\ | 92 | )\ |
| 92 | {\ | 93 | {\ |
| 93 | {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ | 94 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ |
| 94 | {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\ | 95 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\ |
| 95 | {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ | 96 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\ |
| 96 | {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, XXX},\ | 97 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\ |
| 97 | {k40, XXX, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ | 98 | {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\ |
| 98 | {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\ | 99 | {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\ |
| 99 | {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\ | 100 | {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ |
| 100 | {XXX, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\ | 101 | {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ |
| 101 | } | 102 | } |
diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c new file mode 100644 index 000000000..138fe97f1 --- /dev/null +++ b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2020 MechMerlin | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | #include QMK_KEYBOARD_H | ||
| 18 | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 20 | [0] = LAYOUT_ansi( /* Base */ | ||
| 21 | 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, BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN, \ | ||
| 22 | KC_GRV, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ | ||
| 23 | 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_P7, KC_P8, KC_P9, KC_PPLS, \ | ||
| 24 | KC_CAPS, 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_P4, KC_P5, KC_P6, \ | ||
| 25 | 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_P1, KC_P2, KC_P3, KC_PENT, \ | ||
| 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ | ||
| 27 | ), | ||
| 28 | [1] = LAYOUT_ansi( /* Func */ | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, \ | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, \ | ||
| 31 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
| 35 | ), | ||
| 36 | |||
| 37 | [2] = LAYOUT_ansi( | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
| 44 | ), | ||
| 45 | |||
| 46 | [3] = LAYOUT_ansi( | ||
| 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 48 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 50 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 51 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 52 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
| 53 | ), | ||
| 54 | }; | ||
| 55 | |||
| 56 | |||
diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk new file mode 100644 index 000000000..36b7ba9cb --- /dev/null +++ b/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | LTO_ENABLE = yes | ||
diff --git a/keyboards/kbdfans/kbd19x/readme.md b/keyboards/kbdfans/kbd19x/readme.md index 50adfb77f..da37474ad 100644 --- a/keyboards/kbdfans/kbd19x/readme.md +++ b/keyboards/kbdfans/kbd19x/readme.md | |||
| @@ -10,9 +10,9 @@ The KBD19x is a compact-1800 keyboard kit produced by KBDfans, offering a number | |||
| 10 | 10 | ||
| 11 | **Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. | 11 | **Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. |
| 12 | 12 | ||
| 13 | Keyboard Maintainer: [jshuf](https://github.com/jshuf) | 13 | * Keyboard Maintainer: [jshuf](https://github.com/jshuf), [MechMerlin](https://github.com/mechmerlin) |
| 14 | Hardware Supported: KBD19x PCB | 14 | * Hardware Supported: KBD19x PCB |
| 15 | Hardware Availability: [KBDfans](https://kbdfans.cn) | 15 | * Hardware Availability: [KBDfans](https://kbdfans.cn) |
| 16 | 16 | ||
| 17 | Make example for this keyboard (after setting up your build environment): | 17 | Make example for this keyboard (after setting up your build environment): |
| 18 | 18 | ||
