From 07bd60f500e5400ceb9e7d24032b4690f2e24c19 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Fri, 4 Sep 2020 21:24:13 -0500 Subject: [PATCH 1/9] add via support for boardsource/5x12 --- .../boardsource/3x4/keymaps/via/readme.md | 4 +- .../boardsource/5x12/keymaps/via/keymap.c | 39 +++++++++++++++++++ .../boardsource/5x12/keymaps/via/readme.md | 5 +++ .../boardsource/5x12/keymaps/via/rules.mk | 1 + 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 keyboards/boardsource/5x12/keymaps/via/keymap.c create mode 100644 keyboards/boardsource/5x12/keymaps/via/readme.md create mode 100644 keyboards/boardsource/5x12/keymaps/via/rules.mk diff --git a/keyboards/boardsource/3x4/keymaps/via/readme.md b/keyboards/boardsource/3x4/keymaps/via/readme.md index c68eb9cf5a6b..fbc5d747802e 100644 --- a/keyboards/boardsource/3x4/keymaps/via/readme.md +++ b/keyboards/boardsource/3x4/keymaps/via/readme.md @@ -1,5 +1,5 @@ -# The via keymap for boardsource 3x4 macropad +# The via keymap for boardsource 5x12 orthlinear keyboard -This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 3x4 macropad +This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 orthlinear keyboard Maintained by: [gwillad](https://github.com/gwillad) diff --git a/keyboards/boardsource/5x12/keymaps/via/keymap.c b/keyboards/boardsource/5x12/keymaps/via/keymap.c new file mode 100644 index 000000000000..19bdde0ffb9c --- /dev/null +++ b/keyboards/boardsource/5x12/keymaps/via/keymap.c @@ -0,0 +1,39 @@ +#include QMK_KEYBOARD_H + +enum layers { + _MAIN, + _RAISE, + _LOWER, +}; + +// Readability keycodes +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_MAIN] = LAYOUT_ortho_5x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_RAISE] = LAYOUT_ortho_5x12( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, + KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, + RESET, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), + + [_LOWER] = LAYOUT_ortho_5x12( + 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_UP, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RESET, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) + +}; diff --git a/keyboards/boardsource/5x12/keymaps/via/readme.md b/keyboards/boardsource/5x12/keymaps/via/readme.md new file mode 100644 index 000000000000..c68eb9cf5a6b --- /dev/null +++ b/keyboards/boardsource/5x12/keymaps/via/readme.md @@ -0,0 +1,5 @@ +# The via keymap for boardsource 3x4 macropad + +This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 3x4 macropad + +Maintained by: [gwillad](https://github.com/gwillad) diff --git a/keyboards/boardsource/5x12/keymaps/via/rules.mk b/keyboards/boardsource/5x12/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/boardsource/5x12/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file From d125075d02a785f9f7718e7def69e66887301ab2 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Fri, 4 Sep 2020 21:33:32 -0500 Subject: [PATCH 2/9] make product id for 5x12 unique (there is already an 0x0512) by setting it to 0x5012 --- keyboards/boardsource/5x12/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/config.h b/keyboards/boardsource/5x12/config.h index 1cd7101589aa..dbdcff13ea4c 100644 --- a/keyboards/boardsource/5x12/config.h +++ b/keyboards/boardsource/5x12/config.h @@ -4,7 +4,7 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0xF7E0 -#define PRODUCT_ID 0x0412 +#define PRODUCT_ID 0x5012 #define DEVICE_VER 0x0000 #define MANUFACTURER Boardsource #define PRODUCT 5x12 From 7715a0861e1694c78040e31cd9cd4847fbabfe1c Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Fri, 4 Sep 2020 21:41:19 -0500 Subject: [PATCH 3/9] un-swap the readme's for 3x4 and 5x12 --- keyboards/boardsource/3x4/keymaps/via/readme.md | 4 ++-- keyboards/boardsource/5x12/keymaps/via/readme.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/boardsource/3x4/keymaps/via/readme.md b/keyboards/boardsource/3x4/keymaps/via/readme.md index fbc5d747802e..c68eb9cf5a6b 100644 --- a/keyboards/boardsource/3x4/keymaps/via/readme.md +++ b/keyboards/boardsource/3x4/keymaps/via/readme.md @@ -1,5 +1,5 @@ -# The via keymap for boardsource 5x12 orthlinear keyboard +# The via keymap for boardsource 3x4 macropad -This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 orthlinear keyboard +This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 3x4 macropad Maintained by: [gwillad](https://github.com/gwillad) diff --git a/keyboards/boardsource/5x12/keymaps/via/readme.md b/keyboards/boardsource/5x12/keymaps/via/readme.md index c68eb9cf5a6b..fbc5d747802e 100644 --- a/keyboards/boardsource/5x12/keymaps/via/readme.md +++ b/keyboards/boardsource/5x12/keymaps/via/readme.md @@ -1,5 +1,5 @@ -# The via keymap for boardsource 3x4 macropad +# The via keymap for boardsource 5x12 orthlinear keyboard -This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 3x4 macropad +This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 orthlinear keyboard Maintained by: [gwillad](https://github.com/gwillad) From 4ba8419874e80627cc715aa75579632144968874 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Sat, 12 Sep 2020 21:33:35 -0500 Subject: [PATCH 4/9] Update keyboards/boardsource/5x12/config.h update vendor id Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/boardsource/5x12/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/config.h b/keyboards/boardsource/5x12/config.h index dbdcff13ea4c..c99ff9cb086d 100644 --- a/keyboards/boardsource/5x12/config.h +++ b/keyboards/boardsource/5x12/config.h @@ -3,7 +3,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xF7E0 +#define VENDOR_ID 0x4273 // "Bs" - Boardsource #define PRODUCT_ID 0x5012 #define DEVICE_VER 0x0000 #define MANUFACTURER Boardsource From c81175422f39be32ad903fef01c4c9a59c4639aa Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Sat, 12 Sep 2020 21:33:55 -0500 Subject: [PATCH 5/9] Update keyboards/boardsource/5x12/keymaps/via/keymap.c use correct number of layers for VIA Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/boardsource/5x12/keymaps/via/keymap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/keyboards/boardsource/5x12/keymaps/via/keymap.c b/keyboards/boardsource/5x12/keymaps/via/keymap.c index 19bdde0ffb9c..5b97e9951da4 100644 --- a/keyboards/boardsource/5x12/keymaps/via/keymap.c +++ b/keyboards/boardsource/5x12/keymaps/via/keymap.c @@ -34,6 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), + [3] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ) }; From 7b5e44300891ca87958da3b068222b933d88aba2 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Mon, 14 Sep 2020 08:00:54 -0500 Subject: [PATCH 6/9] update product id to use same pattern as others --- keyboards/boardsource/5x12/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/config.h b/keyboards/boardsource/5x12/config.h index c99ff9cb086d..05a8ce2b0612 100644 --- a/keyboards/boardsource/5x12/config.h +++ b/keyboards/boardsource/5x12/config.h @@ -4,7 +4,7 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0x4273 // "Bs" - Boardsource -#define PRODUCT_ID 0x5012 +#define PRODUCT_ID 0x0512 #define DEVICE_VER 0x0000 #define MANUFACTURER Boardsource #define PRODUCT 5x12 From d4feead9e3a18d5d77f4b7385993776693e519d2 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Mon, 14 Sep 2020 15:54:35 -0500 Subject: [PATCH 7/9] Update keyboards/boardsource/5x12/keymaps/via/readme.md Co-authored-by: Danny --- keyboards/boardsource/5x12/keymaps/via/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/keymaps/via/readme.md b/keyboards/boardsource/5x12/keymaps/via/readme.md index fbc5d747802e..9ce93cc7d431 100644 --- a/keyboards/boardsource/5x12/keymaps/via/readme.md +++ b/keyboards/boardsource/5x12/keymaps/via/readme.md @@ -1,5 +1,5 @@ # The via keymap for boardsource 5x12 orthlinear keyboard -This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 orthlinear keyboard +This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 ortholinear keyboard Maintained by: [gwillad](https://github.com/gwillad) From de6cdc7d6a41cfc69b5a2c09e8597bc38a6a7184 Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Wed, 16 Sep 2020 13:54:51 -0500 Subject: [PATCH 8/9] Update keyboards/boardsource/5x12/keymaps/via/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/boardsource/5x12/keymaps/via/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/keymaps/via/readme.md b/keyboards/boardsource/5x12/keymaps/via/readme.md index 9ce93cc7d431..d088e0a64cf1 100644 --- a/keyboards/boardsource/5x12/keymaps/via/readme.md +++ b/keyboards/boardsource/5x12/keymaps/via/readme.md @@ -1,4 +1,4 @@ -# The via keymap for boardsource 5x12 orthlinear keyboard +# The via keymap for boardsource 5x12 ortholinear keyboard This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 5x12 ortholinear keyboard From d7b986a31b946b12a84d103c6b02259d2cb7d6ee Mon Sep 17 00:00:00 2001 From: Adam Gwilliam Date: Thu, 1 Oct 2020 12:03:00 -0500 Subject: [PATCH 9/9] error in compiling --- keyboards/boardsource/5x12/keymaps/via/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/boardsource/5x12/keymaps/via/keymap.c b/keyboards/boardsource/5x12/keymaps/via/keymap.c index 5b97e9951da4..8601fa377c95 100644 --- a/keyboards/boardsource/5x12/keymaps/via/keymap.c +++ b/keyboards/boardsource/5x12/keymaps/via/keymap.c @@ -35,12 +35,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), + [3] = LAYOUT_ortho_5x12( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) };