summaryrefslogtreecommitdiff
path: root/keyboards/splitkb/kyria/rev1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/splitkb/kyria/rev1')
-rw-r--r--keyboards/splitkb/kyria/rev1/base/info.json5
-rw-r--r--keyboards/splitkb/kyria/rev1/base/rules.mk0
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h9
-rw-r--r--keyboards/splitkb/kyria/rev1/info.json178
-rw-r--r--keyboards/splitkb/kyria/rev1/proton_c/info.json5
-rw-r--r--keyboards/splitkb/kyria/rev1/proton_c/proton_c.c17
-rw-r--r--keyboards/splitkb/kyria/rev1/proton_c/proton_c.h19
-rw-r--r--keyboards/splitkb/kyria/rev1/proton_c/rules.mk3
-rw-r--r--keyboards/splitkb/kyria/rev1/rev1.c2
-rw-r--r--keyboards/splitkb/kyria/rev1/rev1.h70
10 files changed, 138 insertions, 170 deletions
diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/info.json
new file mode 100644
index 0000000000..9f75b9c218
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev1/base/info.json
@@ -0,0 +1,5 @@
+{
+ "build": {
+ "lto": true
+ }
+}
diff --git a/keyboards/splitkb/kyria/rev1/base/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev1/base/rules.mk
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 8ca0d50ea6..dc83cf6b86 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring
-#define MATRIX_ROW_PINS \
- { B4, E6, D7, D4 }
-#define MATRIX_COL_PINS \
- { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 895f9283ac..03774dcfe5 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,11 @@
"pid": "0x9D9D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B4", "E6", "D7", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "B5"}
@@ -18,59 +23,130 @@
}
}
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_5"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_split_3x6_5": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0.75},
+ {"matrix": [0, 6], "x": 1, "y": 0.75},
+ {"matrix": [0, 5], "x": 2, "y": 0.25},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0.25},
+ {"matrix": [0, 2], "x": 5, "y": 0.5},
+
+ {"matrix": [4, 2], "x": 10.5, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.5, "y": 0.25},
+ {"matrix": [4, 4], "x": 12.5, "y": 0},
+ {"matrix": [4, 5], "x": 13.5, "y": 0.25},
+ {"matrix": [4, 6], "x": 14.5, "y": 0.75},
+ {"matrix": [4, 7], "x": 15.5, "y": 0.75},
+
+ {"matrix": [1, 7], "x": 0, "y": 1.75},
+ {"matrix": [1, 6], "x": 1, "y": 1.75},
+ {"matrix": [1, 5], "x": 2, "y": 1.25},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1.25},
+ {"matrix": [1, 2], "x": 5, "y": 1.5},
+
+ {"matrix": [5, 2], "x": 10.5, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.5, "y": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1.25},
+ {"matrix": [5, 6], "x": 14.5, "y": 1.75},
+ {"matrix": [5, 7], "x": 15.5, "y": 1.75},
+
+ {"matrix": [2, 7], "x": 0, "y": 2.75},
+ {"matrix": [2, 6], "x": 1, "y": 2.75},
+ {"matrix": [2, 5], "x": 2, "y": 2.25},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 2], "x": 5, "y": 2.5},
+ {"matrix": [2, 1], "x": 6, "y": 3},
+ {"matrix": [2, 0], "x": 7, "y": 3.25},
+
+ {"matrix": [6, 0], "x": 8.5, "y": 3.25},
+ {"matrix": [6, 1], "x": 9.5, "y": 3},
+ {"matrix": [6, 2], "x": 10.5, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.5, "y": 2.25},
+ {"matrix": [6, 4], "x": 12.5, "y": 2},
+ {"matrix": [6, 5], "x": 13.5, "y": 2.25},
+ {"matrix": [6, 6], "x": 14.5, "y": 2.75},
+ {"matrix": [6, 7], "x": 15.5, "y": 2.75},
+
+ {"matrix": [3, 4], "x": 2.5, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 1], "x": 5.5, "y": 4},
+ {"matrix": [3, 0], "x": 6.5, "y": 4.25},
+
+ {"matrix": [7, 0], "x": 9, "y": 4.25},
+ {"matrix": [7, 1], "x": 10, "y": 4},
+ {"matrix": [7, 2], "x": 11, "y": 3.5},
+ {"matrix": [7, 3], "x": 12, "y": 3.25},
+ {"matrix": [7, 4], "x": 13, "y": 3.25}
+ ]
+ },
+ "LAYOUT_stack": {
"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}
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [1, 7], "x": 6, "y": 0},
+ {"matrix": [1, 6], "x": 7, "y": 0},
+ {"matrix": [1, 5], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 3], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+
+ {"matrix": [2, 7], "x": 12, "y": 0},
+ {"matrix": [2, 6], "x": 13, "y": 0},
+ {"matrix": [2, 5], "x": 14, "y": 0},
+ {"matrix": [2, 4], "x": 15, "y": 0},
+ {"matrix": [2, 3], "x": 16, "y": 0},
+ {"matrix": [2, 2], "x": 17, "y": 0},
+ {"matrix": [2, 1], "x": 18, "y": 0},
+ {"matrix": [2, 0], "x": 19, "y": 0},
+
+ {"matrix": [3, 4], "x": 20, "y": 0},
+ {"matrix": [3, 3], "x": 21, "y": 0},
+ {"matrix": [3, 2], "x": 22, "y": 0},
+ {"matrix": [3, 1], "x": 23, "y": 0},
+ {"matrix": [3, 0], "x": 24, "y": 0},
+
+ {"matrix": [4, 2], "x": 25, "y": 0},
+ {"matrix": [4, 3], "x": 26, "y": 0},
+ {"matrix": [4, 4], "x": 27, "y": 0},
+ {"matrix": [4, 5], "x": 28, "y": 0},
+ {"matrix": [4, 6], "x": 29, "y": 0},
+ {"matrix": [4, 7], "x": 30, "y": 0},
+
+ {"matrix": [5, 2], "x": 31, "y": 0},
+ {"matrix": [5, 3], "x": 32, "y": 0},
+ {"matrix": [5, 4], "x": 33, "y": 0},
+ {"matrix": [5, 5], "x": 34, "y": 0},
+ {"matrix": [5, 6], "x": 35, "y": 0},
+ {"matrix": [5, 7], "x": 36, "y": 0},
+
+ {"matrix": [6, 0], "x": 37, "y": 0},
+ {"matrix": [6, 1], "x": 38, "y": 0},
+ {"matrix": [6, 2], "x": 39, "y": 0},
+ {"matrix": [6, 3], "x": 40, "y": 0},
+ {"matrix": [6, 4], "x": 41, "y": 0},
+ {"matrix": [6, 5], "x": 42, "y": 0},
+ {"matrix": [6, 6], "x": 43, "y": 0},
+ {"matrix": [6, 7], "x": 44, "y": 0},
+
+ {"matrix": [7, 0], "x": 45, "y": 0},
+ {"matrix": [7, 1], "x": 46, "y": 0},
+ {"matrix": [7, 2], "x": 47, "y": 0},
+ {"matrix": [7, 3], "x": 48, "y": 0},
+ {"matrix": [7, 4], "x": 49, "y": 0}
]
}
}
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/info.json
new file mode 100644
index 0000000000..6cc38d4a21
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev1/proton_c/info.json
@@ -0,0 +1,5 @@
+{
+ "ws2812": {
+ "driver": "pwm"
+ }
+}
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
deleted file mode 100644
index 628fabb2e5..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@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 "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
deleted file mode 100644
index 718f5636ff..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@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
-
-#include "rev1.h"
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
index 8c22db19ee..a58b20c575 100644
--- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
@@ -1,5 +1,2 @@
-WS2812_DRIVER = pwm
SERIAL_DRIVER = usart
-AUDIO_ENABLE = no
-LTO_ENABLE = no
CONVERT_TO = proton_c
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c
index 52a62ccef8..db14411933 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.c
+++ b/keyboards/splitkb/kyria/rev1/rev1.c
@@ -13,7 +13,7 @@
* 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 "rev1.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off
diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h
deleted file mode 100644
index 8a5fbeb21d..0000000000
--- a/keyboards/splitkb/kyria/rev1/rev1.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@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
-
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c
-# include "proton_c.h"
-#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.
- */
-#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 }, \
-}
-
-#define LAYOUT_stack( \
- L00, L01, L02, L03, L04, L05, \
- L12, L13, L14, L15, L16, L17, \
- L24, L25, L26, L27, L28, L29, L30, L31, \
- L40, L41, L42, L43, L44, \
- \
- R06, R07, R08, R09, R10, R11, \
- R18, R19, R20, R21, R22, R23, \
- R32, R33, R34, R35, R36, R37, R38, R39, \
- 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 }, \
-}
-
-#define LAYOUT_split_3x6_5 LAYOUT
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 16:55:39 +0000