From 4232bf3fc9184f5bb5414f07c1b5c5e49a6817ee Mon Sep 17 00:00:00 2001 From: hsgw Date: Tue, 31 Mar 2020 22:52:04 +0900 Subject: [PATCH 1/7] define VID/PID in post_config.h, add via keymap --- keyboards/plaid/config.h | 5 +- keyboards/plaid/keymaps/via/config.h | 2 + keyboards/plaid/keymaps/via/keymap.c | 84 ++++++++++++++++++++++++++++ keyboards/plaid/keymaps/via/rules.mk | 0 keyboards/plaid/post_config.h | 8 +++ 5 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 keyboards/plaid/keymaps/via/config.h create mode 100644 keyboards/plaid/keymaps/via/keymap.c create mode 100644 keyboards/plaid/keymaps/via/rules.mk create mode 100644 keyboards/plaid/post_config.h diff --git a/keyboards/plaid/config.h b/keyboards/plaid/config.h index 4d7bedee5fc0..e623db2e817d 100644 --- a/keyboards/plaid/config.h +++ b/keyboards/plaid/config.h @@ -20,9 +20,6 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ -#define VENDOR_ID 0x16c0 -#define PRODUCT_ID 0x27db #define DEVICE_VER 0x0002 #define MANUFACTURER dm9records #define PRODUCT Plaid @@ -42,9 +39,11 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ +// clang-format off #define MATRIX_ROW_PINS { B4, B5, B3, D4 } #define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 } #define UNUSED_PINS +// clang-format on /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/plaid/keymaps/via/config.h b/keyboards/plaid/keymaps/via/config.h new file mode 100644 index 000000000000..594ee9405eaf --- /dev/null +++ b/keyboards/plaid/keymaps/via/config.h @@ -0,0 +1,2 @@ +#define VENDOR_ID 0x1111 +#define PRODUCT_ID 0x1111 diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c new file mode 100644 index 000000000000..bffc3421bb90 --- /dev/null +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -0,0 +1,84 @@ +#include QMK_KEYBOARD_H + +#define LOWER MO(0) +#define RAISE MO(1) + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | RAlt | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[0] = LAYOUT_plaid_grid( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + 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_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[1] = LAYOUT_plaid_grid( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[2] = LAYOUT_plaid_grid( + 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_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * |Reset | | | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[3] = LAYOUT_plaid_grid( + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +) + + +}; + +// clang-format on diff --git a/keyboards/plaid/keymaps/via/rules.mk b/keyboards/plaid/keymaps/via/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/plaid/post_config.h b/keyboards/plaid/post_config.h new file mode 100644 index 000000000000..343df910750c --- /dev/null +++ b/keyboards/plaid/post_config.h @@ -0,0 +1,8 @@ +/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ +#if !defined(VENDOR_ID) +# define VENDOR_ID 0x16c0 +#endif + +#if !defined(PRODUCT_ID) +# define PRODUCT_ID 0x27db +#endif From a77d68069c32195067e1a029a5e1d520fce878a6 Mon Sep 17 00:00:00 2001 From: hsgw Date: Wed, 1 Apr 2020 01:27:29 +0900 Subject: [PATCH 2/7] update readme, set vid/pid for via --- keyboards/plaid/config.h | 2 -- keyboards/plaid/keymaps/via/config.h | 4 ++-- keyboards/plaid/keymaps/via/keymap.c | 1 - keyboards/plaid/keymaps/via/readme.md | 3 +++ keyboards/plaid/keymaps/via/rules.mk | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 keyboards/plaid/keymaps/via/readme.md diff --git a/keyboards/plaid/config.h b/keyboards/plaid/config.h index e623db2e817d..f701842807ab 100644 --- a/keyboards/plaid/config.h +++ b/keyboards/plaid/config.h @@ -39,11 +39,9 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -// clang-format off #define MATRIX_ROW_PINS { B4, B5, B3, D4 } #define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 } #define UNUSED_PINS -// clang-format on /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/plaid/keymaps/via/config.h b/keyboards/plaid/keymaps/via/config.h index 594ee9405eaf..907a34857af1 100644 --- a/keyboards/plaid/keymaps/via/config.h +++ b/keyboards/plaid/keymaps/via/config.h @@ -1,2 +1,2 @@ -#define VENDOR_ID 0x1111 -#define PRODUCT_ID 0x1111 +#define VENDOR_ID 0x0d39 +#define PRODUCT_ID 0x0001 diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c index bffc3421bb90..b0615fa2f2f8 100644 --- a/keyboards/plaid/keymaps/via/keymap.c +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -78,7 +78,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) - }; // clang-format on diff --git a/keyboards/plaid/keymaps/via/readme.md b/keyboards/plaid/keymaps/via/readme.md new file mode 100644 index 000000000000..480f0eaa6ea0 --- /dev/null +++ b/keyboards/plaid/keymaps/via/readme.md @@ -0,0 +1,3 @@ +# The via keymap for plaid + +This is an experimental. Use at your own risk. diff --git a/keyboards/plaid/keymaps/via/rules.mk b/keyboards/plaid/keymaps/via/rules.mk index e69de29bb2d1..930e3552ad08 100644 --- a/keyboards/plaid/keymaps/via/rules.mk +++ b/keyboards/plaid/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +MOUSEKEY_ENABLE = no +EXTRAKEY_ENABLE = no From 3980427a9a637dc1e989b05c14413170daa3c049 Mon Sep 17 00:00:00 2001 From: hsgw Date: Wed, 1 Apr 2020 02:17:41 +0900 Subject: [PATCH 3/7] update keymap --- keyboards/plaid/keymaps/via/keymap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c index b0615fa2f2f8..019f798374c4 100644 --- a/keyboards/plaid/keymaps/via/keymap.c +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -3,7 +3,6 @@ #define LOWER MO(0) #define RAISE MO(1) -// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -60,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -/* Adjust (Lower + Raise) +/* * ,-----------------------------------------------------------------------------------. - * |Reset | | | | | | | | | | | Del | + * | | | | | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| @@ -72,12 +71,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [3] = LAYOUT_plaid_grid( - RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - -// clang-format on From fa5c93f232a619fba57c97f389a07d85dd1c6cc2 Mon Sep 17 00:00:00 2001 From: hsgw Date: Wed, 1 Apr 2020 12:51:12 +0900 Subject: [PATCH 4/7] delete usbconfig.h, update keymap --- keyboards/plaid/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c index 019f798374c4..29cbc6b8d925 100644 --- a/keyboards/plaid/keymaps/via/keymap.c +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H -#define LOWER MO(0) -#define RAISE MO(1) +#define LOWER MO(1) +#define RAISE MO(2) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From b4101b15ba10526d26617cb7f6307f3da8792350 Mon Sep 17 00:00:00 2001 From: hsgw Date: Wed, 1 Apr 2020 17:22:39 +0900 Subject: [PATCH 5/7] add status led feature --- keyboards/plaid/keymaps/via/config.h | 1 + keyboards/plaid/keymaps/via/keymap.c | 28 ++++++++++++++++++++++++++- keyboards/plaid/keymaps/via/readme.md | 5 +++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/keyboards/plaid/keymaps/via/config.h b/keyboards/plaid/keymaps/via/config.h index 907a34857af1..53239c0db811 100644 --- a/keyboards/plaid/keymaps/via/config.h +++ b/keyboards/plaid/keymaps/via/config.h @@ -1,2 +1,3 @@ +// These VID/PID is not verified. Use at your own risk. #define VENDOR_ID 0x0d39 #define PRODUCT_ID 0x0001 diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c index 29cbc6b8d925..5f1249934edc 100644 --- a/keyboards/plaid/keymaps/via/keymap.c +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2020 Takuya Urakawa (dm9records.com) + * + * 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 #define LOWER MO(1) @@ -45,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * | DEL | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -78,3 +94,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; + +uint32_t layer_state_set_user(uint32_t state) { + return update_tri_layer_state(state, 1, 2, 3); +} + +bool led_update_user(led_t led_state) { + writePin(LED_RED, led_state.caps_lock); + writePin(LED_GREEN, led_state.scroll_lock); + return false; +} diff --git a/keyboards/plaid/keymaps/via/readme.md b/keyboards/plaid/keymaps/via/readme.md index 480f0eaa6ea0..28dd6721114e 100644 --- a/keyboards/plaid/keymaps/via/readme.md +++ b/keyboards/plaid/keymaps/via/readme.md @@ -1,3 +1,8 @@ # The via keymap for plaid This is an experimental. Use at your own risk. + +Layer3 is activated when Layer1 and 2 are both on. + +LED RED : CAPSLOCK +LED GREEN : SCROLLLOCK From 272f921d3cc286f1ad2885e8d4b425e01d21ab23 Mon Sep 17 00:00:00 2001 From: Takuya Urakawa Date: Thu, 2 Apr 2020 00:16:46 +0900 Subject: [PATCH 6/7] Apply suggestions from code review Co-Authored-By: Joel Challis --- keyboards/plaid/keymaps/via/keymap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/plaid/keymaps/via/keymap.c b/keyboards/plaid/keymaps/via/keymap.c index 5f1249934edc..7bb28c07edd4 100644 --- a/keyboards/plaid/keymaps/via/keymap.c +++ b/keyboards/plaid/keymaps/via/keymap.c @@ -16,8 +16,8 @@ #include QMK_KEYBOARD_H -#define LOWER MO(1) -#define RAISE MO(2) +#define LOWER FN_MO13 +#define RAISE FN_MO23 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -94,11 +94,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -uint32_t layer_state_set_user(uint32_t state) { - return update_tri_layer_state(state, 1, 2, 3); -} - bool led_update_user(led_t led_state) { writePin(LED_RED, led_state.caps_lock); writePin(LED_GREEN, led_state.scroll_lock); From 6bceb1eebca9ef8a111ba06a2325dfb491a2b17a Mon Sep 17 00:00:00 2001 From: hsgw Date: Thu, 2 Apr 2020 00:30:41 +0900 Subject: [PATCH 7/7] undef vid/pid in keymap --- keyboards/plaid/config.h | 3 +++ keyboards/plaid/keymaps/via/config.h | 3 +++ keyboards/plaid/post_config.h | 8 -------- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 keyboards/plaid/post_config.h diff --git a/keyboards/plaid/config.h b/keyboards/plaid/config.h index f701842807ab..4d7bedee5fc0 100644 --- a/keyboards/plaid/config.h +++ b/keyboards/plaid/config.h @@ -20,6 +20,9 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ +/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ +#define VENDOR_ID 0x16c0 +#define PRODUCT_ID 0x27db #define DEVICE_VER 0x0002 #define MANUFACTURER dm9records #define PRODUCT Plaid diff --git a/keyboards/plaid/keymaps/via/config.h b/keyboards/plaid/keymaps/via/config.h index 53239c0db811..4c84c55b848a 100644 --- a/keyboards/plaid/keymaps/via/config.h +++ b/keyboards/plaid/keymaps/via/config.h @@ -1,3 +1,6 @@ // These VID/PID is not verified. Use at your own risk. +#undef VENDOR_ID +#undef PRODUCT_ID + #define VENDOR_ID 0x0d39 #define PRODUCT_ID 0x0001 diff --git a/keyboards/plaid/post_config.h b/keyboards/plaid/post_config.h deleted file mode 100644 index 343df910750c..000000000000 --- a/keyboards/plaid/post_config.h +++ /dev/null @@ -1,8 +0,0 @@ -/* VID & PID from vusb project, see tmk_core/protocol/vusb/USB-IDs-for-free.txt"*/ -#if !defined(VENDOR_ID) -# define VENDOR_ID 0x16c0 -#endif - -#if !defined(PRODUCT_ID) -# define PRODUCT_ID 0x27db -#endif