From 0858135e0448a4333e10ed99314647247ab1c6d5 Mon Sep 17 00:00:00 2001 From: George Wietor Date: Sat, 4 Apr 2020 21:51:50 -0400 Subject: [PATCH 1/8] Add VIA keymap --- keyboards/kbdfans/kbd6x/keymaps/via/keymap.c | 50 +++++++++++++++++++ keyboards/kbdfans/kbd6x/keymaps/via/readme.md | 7 +++ keyboards/kbdfans/kbd6x/keymaps/via/rules.mk | 2 + 3 files changed, 59 insertions(+) create mode 100644 keyboards/kbdfans/kbd6x/keymaps/via/keymap.c create mode 100644 keyboards/kbdfans/kbd6x/keymaps/via/readme.md create mode 100644 keyboards/kbdfans/kbd6x/keymaps/via/rules.mk diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c new file mode 100644 index 000000000000..9d05640b0b52 --- /dev/null +++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2018 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + 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_INS, KC_GRV, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDOWN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_STOP, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/readme.md b/keyboards/kbdfans/kbd6x/keymaps/via/readme.md new file mode 100644 index 000000000000..9e125443e14e --- /dev/null +++ b/keyboards/kbdfans/kbd6x/keymaps/via/readme.md @@ -0,0 +1,7 @@ +# VIA keymap for KBDFans KBD6x. + +Predefined Layers: +- 0 - Default KBD6x keymap +- 1 - A modified version of the classic HHKB function layer +- 2 - Lighting control and RESET +- 3 - Blank \ No newline at end of file diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file From b25922583b62d0b67c9818c5f36dbcf55d78ed0f Mon Sep 17 00:00:00 2001 From: George Wietor Date: Sat, 4 Apr 2020 21:56:08 -0400 Subject: [PATCH 2/8] Update VID/PID - Update VID/PID to match other KBDfans keyboards - Flesh out keyboard description --- keyboards/kbdfans/kbd6x/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 61d086fbd58e..32a625f71e49 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -20,12 +20,12 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0x4B42 +#define PRODUCT_ID 0x3658 #define DEVICE_VER 0x0001 #define MANUFACTURER You #define PRODUCT kbd6x -#define DESCRIPTION A custom keyboard +#define DESCRIPTION Dual USB-C Tsangan Hot Swap PCB /* key matrix size */ #define MATRIX_ROWS 5 From 4ab3d1b4cf6160b6255c266ae2f30f6db9e10ba5 Mon Sep 17 00:00:00 2001 From: George Wietor Date: Sat, 4 Apr 2020 22:03:54 -0400 Subject: [PATCH 3/8] add missing newline. whoops. --- keyboards/kbdfans/kbd6x/keymaps/via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk index 43061db1dd46..36b7ba9cbc98 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +LTO_ENABLE = yes From b40f2e276b03626eb79d03d5dc1824cb8f441f4b Mon Sep 17 00:00:00 2001 From: George Wietor Date: Sun, 5 Apr 2020 02:00:16 -0400 Subject: [PATCH 4/8] Update keyboards/kbdfans/kbd6x/keymaps/via/rules.mk Co-Authored-By: Drashna Jaelre --- keyboards/kbdfans/kbd6x/keymaps/via/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk index 36b7ba9cbc98..3b21b1547f4b 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes -LTO_ENABLE = yes +EXTRAFLAGS += -flto +TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE From 6905a194d45c1295231cc30931510275c45183db Mon Sep 17 00:00:00 2001 From: George Wietor Date: Wed, 8 Apr 2020 16:14:27 -0400 Subject: [PATCH 5/8] update author / copyright date --- keyboards/kbdfans/kbd6x/kbd6x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd6x/kbd6x.h b/keyboards/kbdfans/kbd6x/kbd6x.h index 46e3c2460736..b19afd002854 100644 --- a/keyboards/kbdfans/kbd6x/kbd6x.h +++ b/keyboards/kbdfans/kbd6x/kbd6x.h @@ -1,4 +1,4 @@ -/* Copyright 2018 MechMerlin +/* Copyright 2020 mixedfeelings * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From f63eeaeb54254b2f3e06cc0d5745da5255a062f4 Mon Sep 17 00:00:00 2001 From: George Wietor Date: Wed, 8 Apr 2020 19:20:21 -0400 Subject: [PATCH 6/8] Update keyboards/kbdfans/kbd6x/keymaps/via/rules.mk Co-Authored-By: Ryan --- keyboards/kbdfans/kbd6x/keymaps/via/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk index 3b21b1547f4b..36b7ba9cbc98 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes -EXTRAFLAGS += -flto -TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE +LTO_ENABLE = yes From 6cb405ca1523187012ffbb435e2f4d7dbb5e8090 Mon Sep 17 00:00:00 2001 From: George Wietor Date: Wed, 8 Apr 2020 19:28:55 -0400 Subject: [PATCH 7/8] Update keyboards/kbdfans/kbd6x/keymaps/via/keymap.c Co-Authored-By: Joel Challis --- keyboards/kbdfans/kbd6x/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c index 9d05640b0b52..07883b0a5e07 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2018 MechMerlin +/* Copyright 2020 mixedfeelings * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From c0c22436691a8a212aa8086477fbc4d0b79a1452 Mon Sep 17 00:00:00 2001 From: George Wietor Date: Wed, 8 Apr 2020 19:35:04 -0400 Subject: [PATCH 8/8] Update keyboards/kbdfans/kbd6x/kbd6x.h Co-Authored-By: Joel Challis --- keyboards/kbdfans/kbd6x/kbd6x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd6x/kbd6x.h b/keyboards/kbdfans/kbd6x/kbd6x.h index b19afd002854..46e3c2460736 100644 --- a/keyboards/kbdfans/kbd6x/kbd6x.h +++ b/keyboards/kbdfans/kbd6x/kbd6x.h @@ -1,4 +1,4 @@ -/* Copyright 2020 mixedfeelings +/* Copyright 2018 MechMerlin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by