aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kyria
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-06-17 21:11:33 -0700
committerGitHub <noreply@github.com>2021-06-17 21:11:33 -0700
commit8e607851fbacff8fd742f9cfff03186f8ca036a8 (patch)
tree6d5fdf9592073b93c6f6b6a9af4c2ca0f444877b /keyboards/kyria
parentf81cd4696e5d32a86292287cb07de97d7215dcc1 (diff)
downloadqmk_firmware-8e607851fbacff8fd742f9cfff03186f8ca036a8.tar.gz
qmk_firmware-8e607851fbacff8fd742f9cfff03186f8ca036a8.zip
[Keyboard] Fix revision issues with Kyria (#13208)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/kyria')
-rw-r--r--keyboards/kyria/kyria.h59
-rw-r--r--keyboards/kyria/rev1/rev1.h39
-rw-r--r--keyboards/kyria/rules.mk7
3 files changed, 43 insertions, 62 deletions
diff --git a/keyboards/kyria/kyria.h b/keyboards/kyria/kyria.h
index de87c5ba5..c1db6307e 100644
--- a/keyboards/kyria/kyria.h
+++ b/keyboards/kyria/kyria.h
@@ -17,6 +17,10 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#if defined(KEYBOARD_kyria_rev1)
21# include "rev1.h"
22#endif
23
20/* This a shortcut to help you visually see your layout. 24/* This a shortcut to help you visually see your layout.
21 * 25 *
22 * The first section contains all of the arguments representing the physical 26 * The first section contains all of the arguments representing the physical
@@ -25,58 +29,3 @@
25 * The second converts the arguments into a two-dimensional array which 29 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix. 30 * represents the switch matrix.
27 */ 31 */
28#define LAYOUT( \
29 L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
30 L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
31 L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
32 L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
33) \
34{ \
35 { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
36 { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
37 { L31, L30, L29, L28, L27, L26, L25, L24 }, \
38 { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
39 { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
40 { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
41 { R32, R33, R34, R35, R36, R37, R38, R39 }, \
42 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
43}
44
45#define LAYOUT_stack( \
46 L00, L01, L02, L03, L04, L05, \
47 L12, L13, L14, L15, L16, L17, \
48 L24, L25, L26, L27, L28, L29, L30, L31, \
49 L40, L41, L42, L43, L44, \
50 \
51 R06, R07, R08, R09, R10, R11, \
52 R18, R19, R20, R21, R22, R23, \
53 R32, R33, R34, R35, R36, R37, R38, R39, \
54 R45, R46, R47, R48, R49 \
55) \
56{ \
57 { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
58 { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
59 { L31, L30, L29, L28, L27, L26, L25, L24 }, \
60 { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
61 { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
62 { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
63 { R32, R33, R34, R35, R36, R37, R38, R39 }, \
64 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
65}
66
67#define LAYOUT_split_3x6_5( \
68 L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
69 L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
70 L24, L25, L26, L27, L28, L29, R34, R35, R36, R37, R38, R39, \
71 L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
72) \
73{ \
74 { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
75 { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
76 { KC_NO, KC_NO, L29, L28, L27, L26, L25, L24 }, \
77 { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
78 { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
79 { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
80 { KC_NO, KC_NO, R34, R35, R36, R37, R38, R39 }, \
81 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
82}
diff --git a/keyboards/kyria/rev1/rev1.h b/keyboards/kyria/rev1/rev1.h
index 2ef05bb0e..44060a153 100644
--- a/keyboards/kyria/rev1/rev1.h
+++ b/keyboards/kyria/rev1/rev1.h
@@ -41,3 +41,42 @@
41 { R32, R33, R34, R35, R36, R37, R38, R39 }, \ 41 { R32, R33, R34, R35, R36, R37, R38, R39 }, \
42 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ 42 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
43} 43}
44
45#define LAYOUT_stack( \
46 L00, L01, L02, L03, L04, L05, \
47 L12, L13, L14, L15, L16, L17, \
48 L24, L25, L26, L27, L28, L29, L30, L31, \
49 L40, L41, L42, L43, L44, \
50 \
51 R06, R07, R08, R09, R10, R11, \
52 R18, R19, R20, R21, R22, R23, \
53 R32, R33, R34, R35, R36, R37, R38, R39, \
54 R45, R46, R47, R48, R49 \
55) \
56{ \
57 { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
58 { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
59 { L31, L30, L29, L28, L27, L26, L25, L24 }, \
60 { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
61 { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
62 { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
63 { R32, R33, R34, R35, R36, R37, R38, R39 }, \
64 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
65}
66
67#define LAYOUT_split_3x6_5( \
68 L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
69 L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
70 L24, L25, L26, L27, L28, L29, R34, R35, R36, R37, R38, R39, \
71 L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
72) \
73{ \
74 { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
75 { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
76 { KC_NO, KC_NO, L29, L28, L27, L26, L25, L24 }, \
77 { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
78 { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
79 { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
80 { KC_NO, KC_NO, R34, R35, R36, R37, R38, R39 }, \
81 { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
82}
diff --git a/keyboards/kyria/rules.mk b/keyboards/kyria/rules.mk
index 61d90c67c..2c749186a 100644
--- a/keyboards/kyria/rules.mk
+++ b/keyboards/kyria/rules.mk
@@ -2,13 +2,6 @@
2MCU = atmega32u4 2MCU = atmega32u4
3 3
4# Bootloader selection 4# Bootloader selection
5# Teensy halfkay
6# Pro Micro caterina
7# Atmel DFU atmel-dfu
8# LUFA DFU lufa-dfu
9# QMK DFU qmk-dfu
10# ATmega32A bootloadHID
11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu 5BOOTLOADER = atmel-dfu
13 6
14# Build Options 7# Build Options
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 16:32:13 +0000