From 25d4c0c810727b4feae148ad26fd210ab99398ff Mon Sep 17 00:00:00 2001 From: Thomas Baart Date: Mon, 4 Nov 2019 00:43:26 +0100 Subject: [Keyboard] Add the Kyria keyboard (#7222) * Added raw api for sending data directly to the buffer * Added default keymap variant * Applied proposed OLED display fix * Keymap progress * Keymap progress * Fixed inconsistent tabs * Fixed oled_write_raw apis * Updated keymap * Personal keymap * Added functionality to own keymap * Fixed spacing and build error * Keymap changes * Revert "Updated split encoders so indexes are based on left hand encoders first (#6382)" This reverts commit 46c49ae4e639509ceb6e81c460855d2eb89086b8. * Updated keymaps and configs * Revert "Revert "Updated split encoders so indexes are based on left hand encoders first (#6382)"" This reverts commit f6a85fe1aa9acd2ef77a5ed0ad8f39834cc366d7. * Update keyboards/kyria/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/rev1/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/rules.mk Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/rules.mk Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/rev1/rev1.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/rev1/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/readme.md Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/rev1/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/kyria/readme.md Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/default/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/default/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/default/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/rules.mk Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Update keyboards/kyria/keymaps/thomasbaart/keymap.c Co-Authored-By: fauxpark * Processed keymap feedback * Reverted OLED raw API functionality --- keyboards/kyria/rev1/config.h | 65 +++++++++++++++++++++++++++++++++++++++++++ keyboards/kyria/rev1/rev1.c | 1 + keyboards/kyria/rev1/rev1.h | 43 ++++++++++++++++++++++++++++ keyboards/kyria/rev1/rules.mk | 3 ++ 4 files changed, 112 insertions(+) create mode 100644 keyboards/kyria/rev1/config.h create mode 100644 keyboards/kyria/rev1/rev1.c create mode 100644 keyboards/kyria/rev1/rev1.h create mode 100644 keyboards/kyria/rev1/rules.mk (limited to 'keyboards/kyria/rev1') diff --git a/keyboards/kyria/rev1/config.h b/keyboards/kyria/rev1/config.h new file mode 100644 index 0000000000..29209f3fc6 --- /dev/null +++ b/keyboards/kyria/rev1/config.h @@ -0,0 +1,65 @@ +/* +Copyright 2019 Thomas Baart + +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 . +*/ + +#pragma once + + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER splitkb +#define PRODUCT Kyria Keyboard +#define DESCRIPTION Split 40 percent ergonomic keyboard + +/* key matrix size */ +/* Rows are doubled up */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 8 + +// wiring +#define MATRIX_ROW_PINS { B4, E6, D7, D4 } +#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } +#define UNUSED_PINS + +#define ENCODERS_PAD_A { C6 } +#define ENCODERS_PAD_B { B5 } +#define ENCODERS_PAD_A_RIGHT { B5 } +#define ENCODERS_PAD_B_RIGHT { C6 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D2 + +#define RGB_DI_PIN D3 +#define RGBLED_SPLIT { 10, 10 } +#define RGBLED_NUM 20 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kyria/rev1/rev1.c b/keyboards/kyria/rev1/rev1.c new file mode 100644 index 0000000000..9aedcc130a --- /dev/null +++ b/keyboards/kyria/rev1/rev1.c @@ -0,0 +1 @@ +#include "rev1.h" \ No newline at end of file diff --git a/keyboards/kyria/rev1/rev1.h b/keyboards/kyria/rev1/rev1.h new file mode 100644 index 0000000000..2ef05bb0e9 --- /dev/null +++ b/keyboards/kyria/rev1/rev1.h @@ -0,0 +1,43 @@ +/* Copyright 2019 Thomas Baart + * + * 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 . + */ +#pragma once + +#include "kyria.h" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \ + L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ + L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \ + L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \ +) \ +{ \ + { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ + { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ + { L31, L30, L29, L28, L27, L26, L25, L24 }, \ + { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \ + { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ + { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ + { R32, R33, R34, R35, R36, R37, R38, R39 }, \ + { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ +} diff --git a/keyboards/kyria/rev1/rules.mk b/keyboards/kyria/rev1/rules.mk new file mode 100644 index 0000000000..8b1c9616cb --- /dev/null +++ b/keyboards/kyria/rev1/rules.mk @@ -0,0 +1,3 @@ +OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays +ENCODER_ENABLE = yes # ENables the use of one or more encoders +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -- cgit v1.2.3