masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-01-20 11:23:34 +00:00
parent 560b981746 64c399ba38
commit 0f77ae6a20
20 changed files with 627 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
keyboards/splitkb/kyria/config.h
View File

@ -1,18 +1,17 @@
/* /* Copyright 2022 splitkb.com <support@splitkb.com>
Copyright 2019 Thomas Baart <thomas@splitkb.com> *
This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (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 * This program is distributed in the hope that it will be useful,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
You should have received a copy of the GNU General Public License * GNU General Public License for more details.
along with this program. If not, see <http://www.gnu.org/licenses/>. *
*/ * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once #pragma once
#include "config_common.h"

69
keyboards/splitkb/kyria/info.json
View File

@ -1,65 +1,16 @@
{ {
"manufacturer": "splitkb", "manufacturer": "splitkb.com",
"url": "https://splitkb.com", "url": "https://splitkb.com/products/kyria-pcb-kit",
"maintainer": "splitkb.com", "maintainer": "splitkb",
"usb": { "usb": {
"vid": "0x8D1D", "vid": "0x8D1D",
"pid": "0x9D9D" "device_version": "1.0.0"
}, },
"layouts": { "development_board": "elite_c",
"LAYOUT": { "split": {
"layout": [ "enabled": true
{"x":0, "y":0.75}, },
{"x":1, "y":0.75}, "build": {
{"x":2, "y":0.25}, "lto": true
{"x":3, "y":0},
{"x":4, "y":0.25},
{"x":5, "y":0.5},
{"x":10.5, "y":0.5},
{"x":11.5, "y":0.25},
{"x":12.5, "y":0},
{"x":13.5, "y":0.25},
{"x":14.5, "y":0.75},
{"x":15.5, "y":0.75},
{"x":0, "y":1.75},
{"x":1, "y":1.75},
{"x":2, "y":1.25},
{"x":3, "y":1},
{"x":4, "y":1.25},
{"x":5, "y":1.5},
{"x":10.5, "y":1.5},
{"x":11.5, "y":1.25},
{"x":12.5, "y":1},
{"x":13.5, "y":1.25},
{"x":14.5, "y":1.75},
{"x":15.5, "y":1.75},
{"x":0, "y":2.75},
{"x":1, "y":2.75},
{"x":2, "y":2.25},
{"x":3, "y":2},
{"x":4, "y":2.25},
{"x":5, "y":2.5},
{"x":6, "y":3},
{"x":7, "y":3.25},
{"x":8.5, "y":3.25},
{"x":9.5, "y":3},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2},
{"x":13.5, "y":2.25},
{"x":14.5, "y":2.75},
{"x":15.5, "y":2.75},
{"x":2.5, "y":3.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":4},
{"x":6.5, "y":4.25},
{"x":9, "y":4.25},
{"x":10, "y":4},
{"x":11, "y":3.5},
{"x":12, "y":3.25},
{"x":13, "y":3.25}
]
}
} }
} }

21
keyboards/splitkb/kyria/keymaps/debug/config.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright 2022 splitkb.com <support@splitkb.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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifdef RGBLIGHT_ENABLE
# define RGBLIGHT_EFFECT_BREATHING
#endif

73
keyboards/splitkb/kyria/keymaps/debug/keymap.c Normal file
View File

@ -0,0 +1,73 @@
/* Copyright 2022 splitkb.com <support@splitkb.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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
enum layers {
_DEFAULT = 0,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT] = LAYOUT(
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, S(KC_F), S(KC_E), S(KC_D), S(KC_C), S(KC_B), S(KC_A),
KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, S(KC_L), S(KC_K), S(KC_J), S(KC_I), S(KC_H), S(KC_G),
KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T, S(KC_T), S(KC_S), S(KC_R), S(KC_Q), S(KC_P), S(KC_O), S(KC_N), S(KC_M),
KC_U, KC_V, KC_W, KC_X, KC_Y, S(KC_Y), S(KC_X), S(KC_W), S(KC_V), S(KC_U)
)
};
#ifdef RGBLIGHT_ENABLE
void keyboard_post_init_user(void) {
rgblight_enable_noeeprom(); // enables RGB, without saving settings
rgblight_sethsv_noeeprom(HSV_RED); // sets the color to red without saving
rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // sets mode to Fast breathing without saving
}
#endif
#ifdef ENCODER_ENABLE
bool encoder_update_user(uint8_t index, bool clockwise) {
// 0 is left-half encoder,
// 1 is right-half encoder
if (index == 0) {
tap_code(KC_0);
} else if (index == 1) {
tap_code(KC_1);
}
if (clockwise) {
tap_code16(KC_PLUS);
} else {
tap_code(KC_MINUS);
}
return false;
}
#endif
#ifdef OLED_ENABLE
bool oled_task_user(void) {
// A 128x64 OLED rotated 180 degrees is 21 characters wide and 8 characters tall
// This example string should fill that neatly
const char *text = PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789!@#$%^&*()[]{}-=_+?/,.|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789!@#$%^&*()[]{}-=_+?/,.|");
if (is_keyboard_master()) {
oled_write_P(text, false);
} else {
oled_write_P(text, false);
}
return false;
}
#endif

24
keyboards/splitkb/kyria/keymaps/debug/readme.md Normal file
View File

@ -0,0 +1,24 @@
# Kyria's Debug Keymap
To make debugging your build as easy as possible, we have provided a special debugging keymap. It is not intended to actually type on, it is just here to make sure that your hardware is working correctly.
## Keys
![Keys](https://i.imgur.com/pmPBYlkh.png)
The left side uses lowercase letters, the right side uses uppercase ones.
## Encoders
Encoders output a number of 0 or 1, depending on the installed position.
These correspond to the index used for custom encoder code.
The number is followed by either a `+` or a `-`, depending on the direction turned.
## LEDs
Both underglow and per-key RGB should be fading between red and off.
## OLEDs
Both the primary and secondary side should be filled with characters.

8
keyboards/splitkb/kyria/keymaps/debug/rules.mk Normal file
View File

@ -0,0 +1,8 @@
# NOTE: These are already enabled by default at the revision level
#ENCODER_ENABLE = yes
#OLED_ENABLE = yes
# RGB Matrix is enabled at the revision level,
# while we use the regular RGB underglow for testing
RGB_MATRIX_ENABLE = no
RGBLIGHT_ENABLE = yes

2
keyboards/splitkb/kyria/keymaps/default/config.h
View File

@ -30,7 +30,9 @@
# define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_VAL_STEP 8
# ifndef RGBLIGHT_LIMIT_VAL
# define RGBLIGHT_LIMIT_VAL 150 # define RGBLIGHT_LIMIT_VAL 150
# endif
#endif #endif
// Lets you roll mod-tap keys // Lets you roll mod-tap keys

1
keyboards/splitkb/kyria/keymaps/default/rules.mk
View File

@ -1,4 +1,5 @@
OLED_ENABLE = yes OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enables the use of OLED displays OLED_DRIVER = SSD1306 # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGB_MATRIX_ENABLE = no # Disable keyboard RGB matrix, as it is enabled by default on rev3
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow

7
keyboards/splitkb/kyria/kyria.c
View File

@ -1,4 +1,4 @@
/* Copyright 2019 Thomas Baart <thomas@splitkb.com> /* Copyright 2022 splitkb.com <support@splitkb.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -13,7 +13,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "kyria.h"
#include "quantum.h"
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) { oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
@ -39,6 +40,8 @@ bool oled_task_kb(void) {
oled_write_P(PSTR("rev1\n\n"), false); oled_write_P(PSTR("rev1\n\n"), false);
#elif defined(KEYBOARD_splitkb_kyria_rev2) #elif defined(KEYBOARD_splitkb_kyria_rev2)
oled_write_P(PSTR("rev2\n\n"), false); oled_write_P(PSTR("rev2\n\n"), false);
#elif defined(KEYBOARD_splitkb_kyria_rev3)
oled_write_P(PSTR("rev3\n\n"), false);
#endif #endif
// Host Keyboard Layer Status // Host Keyboard Layer Status
oled_write_P(PSTR("Layer: "), false); oled_write_P(PSTR("Layer: "), false);

9
keyboards/splitkb/kyria/kyria.h
View File

@ -23,12 +23,3 @@
#if defined(KEYBOARD_splitkb_kyria_rev2) #if defined(KEYBOARD_splitkb_kyria_rev2)
# include "rev2.h" # include "rev2.h"
#endif #endif
/* 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.
*/

15
keyboards/splitkb/kyria/readme.md
View File

@ -4,26 +4,25 @@
An ergonomical 40% split keyboard An ergonomical 40% split keyboard
Keyboard Maintainer: [splitkb.com](https://github.com/splitkb) * Keyboard Maintainer: [splitkb.com](https://github.com/splitkb)
Hardware Supported: Pro Micro 5V/16MHz and compatible. * Hardware Supported: Pro Micro 5V/16MHz and compatible.
Hardware Availability: [splitkb.com](https://splitkb.com) and partners. * Hardware Availability: [splitkb.com](https://splitkb.com/products/kyria-pcb-kit)
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make splitkb/kyria/rev2:default make splitkb/kyria/rev3:default
make splitkb/kyria/rev2/proton_c:default
Example of flashing this keyboard: Example of flashing this keyboard:
make splitkb/kyria/rev2:default:flash make splitkb/kyria/rev3:default:flash
Replace "rev2" with "rev1" if you have a Kyria of revision 1.4 or below. Replace "rev3" with "rev2" if you have a Kyria of revision 2.x, or "rev1" if you have a Kyria of revision 1.4 or below.
Not sure what revision yours is? It is printed on the outer lower edge of the PCB! Not sure what revision yours is? It is printed on the outer lower edge of the PCB!
As a rule of thumb, all Kyrias sold after January 1st 2022 are revision 2.x. As a rule of thumb, all Kyrias sold after January 1st 2022 are revision 2.x.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
A build guide for the Kyria can be found at [docs.splitkb.com](https://docs.splitkb.com/hc/en-us/articles/360010552059-Kyria-Build-Guide-Introduction). A build guide for the Kyria can be found at [docs.splitkb.com](https://docs.splitkb.com/hc/en-us/categories/360002241559-Build-Guides). For revision 3.x you want to use the [Aurora build guide](https://docs.splitkb.com/hc/en-us/articles/6269789921564-Aurora-Build-Guide-1-Introduction), for revision 2.x and below you want to use the [Kyria-specific guide](https://docs.splitkb.com/hc/en-us/articles/360010552059-Kyria-Build-Guide-Introduction).
## Proton C Conversion Guide ## Proton C Conversion Guide

57
keyboards/splitkb/kyria/rev1/info.json
View File

@ -1,6 +1,63 @@
{ {
"keyboard_name": "Kyria rev1", "keyboard_name": "Kyria rev1",
"usb": { "usb": {
"pid": "0x9D9D",
"device_version": "0.0.1" "device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0.75},
{"x":1, "y":0.75},
{"x":2, "y":0.25},
{"x":3, "y":0},
{"x":4, "y":0.25},
{"x":5, "y":0.5},
{"x":10.5, "y":0.5},
{"x":11.5, "y":0.25},
{"x":12.5, "y":0},
{"x":13.5, "y":0.25},
{"x":14.5, "y":0.75},
{"x":15.5, "y":0.75},
{"x":0, "y":1.75},
{"x":1, "y":1.75},
{"x":2, "y":1.25},
{"x":3, "y":1},
{"x":4, "y":1.25},
{"x":5, "y":1.5},
{"x":10.5, "y":1.5},
{"x":11.5, "y":1.25},
{"x":12.5, "y":1},
{"x":13.5, "y":1.25},
{"x":14.5, "y":1.75},
{"x":15.5, "y":1.75},
{"x":0, "y":2.75},
{"x":1, "y":2.75},
{"x":2, "y":2.25},
{"x":3, "y":2},
{"x":4, "y":2.25},
{"x":5, "y":2.5},
{"x":6, "y":3},
{"x":7, "y":3.25},
{"x":8.5, "y":3.25},
{"x":9.5, "y":3},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2},
{"x":13.5, "y":2.25},
{"x":14.5, "y":2.75},
{"x":15.5, "y":2.75},
{"x":2.5, "y":3.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":4},
{"x":6.5, "y":4.25},
{"x":9, "y":4.25},
{"x":10, "y":4},
{"x":11, "y":3.5},
{"x":12, "y":3.25},
{"x":13, "y":3.25}
]
}
} }
} }

15
keyboards/splitkb/kyria/rev1/rules.mk
View File

@ -1,7 +1,14 @@
OLED_ENABLE = yes BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
ENCODER_ENABLE = yes # ENables the use of one or more encoders MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
OLED_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 RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
RGB_MATRIX_SUPPORTED = yes

57
keyboards/splitkb/kyria/rev2/info.json
View File

@ -1,6 +1,63 @@
{ {
"keyboard_name": "Kyria rev2", "keyboard_name": "Kyria rev2",
"usb": { "usb": {
"pid": "0x9D9D",
"device_version": "0.0.2" "device_version": "0.0.2"
},
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0.75},
{"x":1, "y":0.75},
{"x":2, "y":0.25},
{"x":3, "y":0},
{"x":4, "y":0.25},
{"x":5, "y":0.5},
{"x":10.5, "y":0.5},
{"x":11.5, "y":0.25},
{"x":12.5, "y":0},
{"x":13.5, "y":0.25},
{"x":14.5, "y":0.75},
{"x":15.5, "y":0.75},
{"x":0, "y":1.75},
{"x":1, "y":1.75},
{"x":2, "y":1.25},
{"x":3, "y":1},
{"x":4, "y":1.25},
{"x":5, "y":1.5},
{"x":10.5, "y":1.5},
{"x":11.5, "y":1.25},
{"x":12.5, "y":1},
{"x":13.5, "y":1.25},
{"x":14.5, "y":1.75},
{"x":15.5, "y":1.75},
{"x":0, "y":2.75},
{"x":1, "y":2.75},
{"x":2, "y":2.25},
{"x":3, "y":2},
{"x":4, "y":2.25},
{"x":5, "y":2.5},
{"x":6, "y":3},
{"x":7, "y":3.25},
{"x":8.5, "y":3.25},
{"x":9.5, "y":3},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2},
{"x":13.5, "y":2.25},
{"x":14.5, "y":2.75},
{"x":15.5, "y":2.75},
{"x":2.5, "y":3.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":4},
{"x":6.5, "y":4.25},
{"x":9, "y":4.25},
{"x":10, "y":4},
{"x":11, "y":3.5},
{"x":12, "y":3.25},
{"x":13, "y":3.25}
]
}
} }
} }

14
keyboards/splitkb/kyria/rev2/rules.mk
View File

@ -1,8 +1,14 @@
OLED_ENABLE = yes BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
OLED_DRIVER = SSD1306 # Enables the use of OLED displays MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
RGB_MATRIX_SUPPORTED = yes

45
keyboards/splitkb/kyria/rev3/config.h Normal file
View File

@ -0,0 +1,45 @@
/* Copyright 2022 splitkb.com <support@splitkb.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 <http://www.gnu.org/licenses/>.
*/
#pragma once
// `SPLIT_HAND_PIN` can currently be defined in `info.json`,
// but can't yet be given a value
#define SPLIT_HAND_PIN B5
// Not yet available in `info.json`
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
#endif
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define SPLIT_TRANSPORT_MIRROR
#endif
// Not yet available in `info.json`
#ifdef BOOTMAGIC_ENABLE
// Top left key on left half
# define BOOTMAGIC_LITE_ROW 0
# define BOOTMAGIC_LITE_COLUMN 6
// Top right key on right half
# define BOOTMAGIC_LITE_ROW_RIGHT 4
# define BOOTMAGIC_LITE_COLUMN_RIGHT 6
#endif

241
keyboards/splitkb/kyria/rev3/info.json Normal file
View File

@ -0,0 +1,241 @@
{
"keyboard_name": "Kyria rev3",
"usb": {
"pid": "0xCF44",
},
"features": {
"mousekey": true,
"bootmagic": true,
"extrakey": true,
"oled": true,
"rgb_matrix": true
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
{"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
{"label": "R04", "matrix": [4, 4], "x": 13.5, "y": 0.25},
{"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
{"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
{"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
{"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
{"label": "R10", "matrix": [5, 4], "x": 13.5, "y": 1.25},
{"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
{"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
{"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
{"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
{"label": "R18", "matrix": [6, 4], "x": 13.5, "y": 2.25},
{"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
{"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
]
},
"LAYOUT_stack": {
"layout": [
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
{"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
{"label": "R04", "matrix": [4, 4], "x": 13.5, "y": 0.25},
{"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
{"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
{"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
{"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
{"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
{"label": "R10", "matrix": [5, 4], "x": 13.5, "y": 1.25},
{"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
{"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
{"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
{"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
{"label": "R18", "matrix": [6, 4], "x": 13.5, "y": 2.25},
{"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
{"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
]
}
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"rows": ["D4", "C6", "D7", "E6"],
"cols": ["B4", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "F4",
"pin_b": "F5"
}
]
},
"split": {
"soft_serial_pin": "D2",
"main": "matrix_grid",
"matrix_pins": {
"right": {
"rows": ["F6", "F7", "B1", "B3"],
"cols": ["B2", "D4", "C6", "D7", "E6", "B4", "B6"]
}
},
"encoder": {
"right": {
"rotary": [
{
"pin_a": "F4",
"pin_b": "F5"
}
]
}
}
},
"rgblight": {
"pin": "D3",
"led_count": 62,
"split": true,
"split_count": [31, 31],
"max_brightness": 128
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{"flags": 2, "x": 75, "y": 2}, // L RGB1
{"flags": 2, "x": 50, "y": 1}, // L RGB2
{"flags": 2, "x": 14, "y": 4}, // L RGB3
{"flags": 2, "x": 25, "y": 45}, // L RGB4
{"flags": 2, "x": 58, "y": 49}, // L RGB5
{"flags": 2, "x": 94, "y": 53}, // L RGB6
{"flags": 4, "matrix": [3, 0], "x": 94, "y": 64}, // L SW21
{"flags": 4, "matrix": [3, 5], "x": 79, "y": 60}, // L SW22
{"flags": 4, "matrix": [3, 1], "x": 65, "y": 53}, // L SW23
{"flags": 4, "matrix": [3, 2], "x": 51, "y": 49}, // L SW24
{"flags": 4, "matrix": [3, 4], "x": 36, "y": 49}, // L SW25
{"flags": 4, "matrix": [2, 0], "x": 101, "y": 49}, // L SW13
{"flags": 4, "matrix": [3, 3], "x": 87, "y": 45}, // L SW14
{"flags": 4, "matrix": [2, 1], "x": 72, "y": 38}, // L SW15
{"flags": 4, "matrix": [2, 2], "x": 58, "y": 34}, // L SW16
{"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW17
{"flags": 4, "matrix": [2, 4], "x": 29, "y": 34}, // L SW18
{"flags": 4, "matrix": [2, 5], "x": 14, "y": 41}, // L SW19
{"flags": 4, "matrix": [2, 6], "x": 0, "y": 41}, // L SW20
{"flags": 4, "matrix": [1, 1], "x": 72, "y": 23}, // L SW07
{"flags": 4, "matrix": [1, 2], "x": 58, "y": 19}, // L SW08
{"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW09
{"flags": 4, "matrix": [1, 4], "x": 29, "y": 19}, // L SW10
{"flags": 4, "matrix": [1, 5], "x": 14, "y": 26}, // L SW11
{"flags": 4, "matrix": [1, 6], "x": 0, "y": 26}, // L SW12
{"flags": 4, "matrix": [0, 1], "x": 72, "y": 8}, // L SW01
{"flags": 4, "matrix": [0, 2], "x": 58, "y": 4}, // L SW02
{"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW03
{"flags": 4, "matrix": [0, 4], "x": 29, "y": 4}, // L SW04
{"flags": 4, "matrix": [0, 5], "x": 14, "y": 11}, // L SW05
{"flags": 4, "matrix": [0, 6], "x": 0, "y": 11}, // L SW06
{"flags": 2, "x": 149, "y": 2}, // R RGB1
{"flags": 2, "x": 174, "y": 1}, // R RGB2
{"flags": 2, "x": 210, "y": 4}, // R RGB3
{"flags": 2, "x": 199, "y": 45}, // R RGB4
{"flags": 2, "x": 166, "y": 49}, // R RGB5
{"flags": 2, "x": 130, "y": 53}, // R RGB6
{"flags": 4, "matrix": [7, 0], "x": 130, "y": 64}, // R SW21
{"flags": 4, "matrix": [7, 5], "x": 145, "y": 60}, // R SW22
{"flags": 4, "matrix": [7, 1], "x": 159, "y": 53}, // R SW23
{"flags": 4, "matrix": [7, 2], "x": 173, "y": 49}, // R SW24
{"flags": 4, "matrix": [7, 4], "x": 188, "y": 49}, // R SW25
{"flags": 4, "matrix": [6, 0], "x": 123, "y": 49}, // R SW13
{"flags": 4, "matrix": [7, 3], "x": 137, "y": 45}, // R SW14
{"flags": 4, "matrix": [6, 1], "x": 152, "y": 38}, // R SW15
{"flags": 4, "matrix": [6, 2], "x": 166, "y": 34}, // R SW16
{"flags": 4, "matrix": [6, 3], "x": 181, "y": 30}, // R SW17
{"flags": 4, "matrix": [6, 4], "x": 195, "y": 34}, // R SW18
{"flags": 4, "matrix": [6, 5], "x": 210, "y": 41}, // R SW19
{"flags": 4, "matrix": [6, 6], "x": 224, "y": 41}, // R SW20
{"flags": 4, "matrix": [5, 1], "x": 152, "y": 23}, // R SW07
{"flags": 4, "matrix": [5, 2], "x": 166, "y": 19}, // R SW08
{"flags": 4, "matrix": [5, 3], "x": 181, "y": 15}, // R SW09
{"flags": 4, "matrix": [5, 4], "x": 195, "y": 19}, // R SW10
{"flags": 4, "matrix": [5, 5], "x": 210, "y": 26}, // R SW11
{"flags": 4, "matrix": [5, 6], "x": 224, "y": 26}, // R SW12
{"flags": 4, "matrix": [4, 1], "x": 152, "y": 8}, // R SW01
{"flags": 4, "matrix": [4, 2], "x": 166, "y": 4}, // R SW02
{"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04
{"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
{"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}, // R SW06
]
}
}

35
keyboards/splitkb/kyria/rev3/rev3.c Normal file
View File

@ -0,0 +1,35 @@
/* Copyright 2022 splitkb.com <support@splitkb.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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#ifdef SWAP_HANDS_ENABLE
// clang-format off
__attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}},
{{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
{{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}},
{{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}},
{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}},
{{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}},
{{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}},
{{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}},
};
// clang-format on
# ifdef ENCODER_MAP_ENABLE
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1,0};
# endif
#endif

2
keyboards/splitkb/kyria/rev3/rules.mk Normal file
View File

@ -0,0 +1,2 @@
# Although no rules are defined,
# presence of this file is required for QMK to compile it.

22
keyboards/splitkb/kyria/rules.mk
View File

@ -1,21 +1 @@
# MCU name DEFAULT_FOLDER = splitkb/kyria/rev3
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Split common
LTO_ENABLE = yes
DEFAULT_FOLDER = splitkb/kyria/rev2