summaryrefslogtreecommitdiff
path: root/app/boards
diff options
context:
space:
mode:
Diffstat (limited to 'app/boards')
-rw-r--r--app/boards/shields/kyria/Kconfig.defconfig2
-rw-r--r--app/boards/shields/kyria/Kconfig.shield7
-rw-r--r--app/boards/shields/kyria/keymap/keymap.overlay2
-rw-r--r--app/boards/shields/kyria/kyria.dtsi (renamed from app/boards/shields/kyria/kyria.overlay)65
-rw-r--r--app/boards/shields/kyria/kyria_left.overlay21
-rw-r--r--app/boards/shields/kyria/kyria_right.overlay25
6 files changed, 60 insertions, 62 deletions
diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
index 0bd3562..25af537 100644
--- a/app/boards/shields/kyria/Kconfig.defconfig
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -1,5 +1,5 @@
-if SHIELD_KYRIA
+if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_RIGHT
config ZMK_KEYBOARD_NAME
default "Kyria"
diff --git a/app/boards/shields/kyria/Kconfig.shield b/app/boards/shields/kyria/Kconfig.shield
index 598fc81..7dee044 100644
--- a/app/boards/shields/kyria/Kconfig.shield
+++ b/app/boards/shields/kyria/Kconfig.shield
@@ -1,5 +1,8 @@
# Copyright (c) 2020 Pete Johanson
# SPDX-License-Identifier: MIT
-config SHIELD_KYRIA
- def_bool $(shields_list_contains,kyria)
+config SHIELD_KYRIA_LEFT
+ def_bool $(shields_list_contains,kyria_left)
+
+config SHIELD_KYRIA_RIGHT
+ def_bool $(shields_list_contains,kyria_right)
diff --git a/app/boards/shields/kyria/keymap/keymap.overlay b/app/boards/shields/kyria/keymap/keymap.overlay
index f61bb6c..0c00aef 100644
--- a/app/boards/shields/kyria/keymap/keymap.overlay
+++ b/app/boards/shields/kyria/keymap/keymap.overlay
@@ -26,7 +26,7 @@
bindings = <
&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp PIPE
&kp BKSP &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
- &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp LSFT &kp LSFT &kp LSFT &kp LSFT &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp MINUS
+ &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp LSFT &kp LSFT &kp LSFT &kp LSFT &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp MINUS
&kp LGUI &kp DEL &kp RET &kp SPC &kp ESC &kp RET &kp SPC &kp TAB &kp BKSP &kp RALT
>;
};
diff --git a/app/boards/shields/kyria/kyria.overlay b/app/boards/shields/kyria/kyria.dtsi
index 85b22be..f96adf0 100644
--- a/app/boards/shields/kyria/kyria.overlay
+++ b/app/boards/shields/kyria/kyria.dtsi
@@ -5,36 +5,17 @@
*/
#include <dt-bindings/zmk/matrix-transform.h>
-#include <behaviors/keymap.dtsi>
-#include <behaviors/hid.dtsi>
/ {
chosen {
- zmk,kscan = &kscan_left;
+ zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
- kscan0: kscan_comp {
- compatible = "zmk,kscan-composite";
-
- label = "KSCAN_COMP";
- rows = <4>;
- columns = <16>;
-
- left {
- kscan = <&kscan_left>;
- };
-
- // right {
- // kscan = <&kscan_right>;
- // // TODO: Actually put this in the kscan driver, so it can report
- // // HID events directly to host if plugged in directly.
- // column-offset = <8>;
- // };
- };
-
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
+ columns = <16>;
+ rows = <4>;
// | MX6 | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 | MX6 |
// | MX12 | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 | MX12 |
// | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 |
@@ -53,6 +34,8 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 |
five_column_transform: keymap_transform_1 {
compatible = "zmk,matrix-transform";
+ columns = <14>;
+ rows = <4>;
map = <
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
@@ -61,9 +44,9 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
>;
};
- kscan_left: kscan_left {
+ kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
- label = "KSCAN_LEFT";
+ label = "KSCAN";
diode-direction = "col2row";
row-gpios
@@ -72,43 +55,9 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
, <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
-
- col-gpios
- = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH)>
- , <&pro_micro_d 10 (GPIO_ACTIVE_HIGH)>
- ;
};
- // kscan_right: kscan_right {
- // compatible = "zmk,kscan-gpio-matrix";
- // label = "KSCAN_RIGHT";
-
- // diode-direction = "col2row";
- // row-gpios
- // = <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // ;
- // col-gpios
- // = <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- // ;
- // };
-
// TODO: Encoder node(s)
// TODO: OLED node
// TODO: RGB node(s)
diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay
new file mode 100644
index 0000000..c6305bd
--- /dev/null
+++ b/app/boards/shields/kyria/kyria_left.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "kyria.dtsi"
+
+&kscan0 {
+ col-gpios
+ = <&pro_micro_a 3 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 2 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 10 GPIO_ACTIVE_HIGH>
+ ;
+};
+
diff --git a/app/boards/shields/kyria/kyria_right.overlay b/app/boards/shields/kyria/kyria_right.overlay
new file mode 100644
index 0000000..b919bb2
--- /dev/null
+++ b/app/boards/shields/kyria/kyria_right.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "kyria.dtsi"
+
+&default_transform {
+ col-offset = <8>;
+};
+
+&kscan0 {
+ col-gpios
+ = <&pro_micro_d 10 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 2 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_a 3 GPIO_ACTIVE_HIGH>
+ ;
+};
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 22:06:45 +0000