summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/boards/shields/kyria/Kconfig.defconfig7
-rw-r--r--app/boards/shields/kyria/Kconfig.shield5
-rw-r--r--app/boards/shields/kyria/keymaps/default/include/keymap.h5
-rw-r--r--app/boards/shields/kyria/keymaps/default/keymap.c34
-rw-r--r--app/boards/shields/kyria/keymaps/default/keymap.overlay63
-rw-r--r--app/boards/shields/kyria/kyria.conf0
-rw-r--r--app/boards/shields/kyria/kyria.overlay75
-rw-r--r--app/dts/bindings/zmk,keymap.yaml4
-rw-r--r--app/dts/bindings/zmk,matrix-transform.yaml9
-rw-r--r--app/include/dt-bindings/zmk/matrix-transform.h5
-rw-r--r--app/src/keymap.c49
11 files changed, 256 insertions, 0 deletions
diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
new file mode 100644
index 0000000..0bd3562
--- /dev/null
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -0,0 +1,7 @@
+
+if SHIELD_KYRIA
+
+config ZMK_KEYBOARD_NAME
+ default "Kyria"
+
+endif
diff --git a/app/boards/shields/kyria/Kconfig.shield b/app/boards/shields/kyria/Kconfig.shield
new file mode 100644
index 0000000..598fc81
--- /dev/null
+++ b/app/boards/shields/kyria/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config SHIELD_KYRIA
+ def_bool $(shields_list_contains,kyria)
diff --git a/app/boards/shields/kyria/keymaps/default/include/keymap.h b/app/boards/shields/kyria/keymaps/default/include/keymap.h
new file mode 100644
index 0000000..01cd9e5
--- /dev/null
+++ b/app/boards/shields/kyria/keymaps/default/include/keymap.h
@@ -0,0 +1,5 @@
+
+#include <dt-bindings/zmk/keys.h>
+
+#define CC_RAIS ZC_CSTM(1)
+#define CC_LOWR ZC_CSTM(2) \ No newline at end of file
diff --git a/app/boards/shields/kyria/keymaps/default/keymap.c b/app/boards/shields/kyria/keymaps/default/keymap.c
new file mode 100644
index 0000000..067cd08
--- /dev/null
+++ b/app/boards/shields/kyria/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+
+#include <zmk/keys.h>
+#include <zmk/keymap.h>
+#include <keymap.h>
+
+bool zmk_handle_key_user(struct zmk_key_event *key_event)
+{
+ switch (key_event->key)
+ {
+ case CC_LOWR:
+ if (key_event->pressed)
+ {
+ zmk_keymap_layer_activate(1);
+ }
+ else
+ {
+ zmk_keymap_layer_deactivate(1);
+ }
+
+ return false;
+ case CC_RAIS:
+ if (key_event->pressed)
+ {
+ zmk_keymap_layer_activate(2);
+ }
+ else
+ {
+ zmk_keymap_layer_deactivate(2);
+ }
+ return false;
+ }
+
+ return true;
+};
diff --git a/app/boards/shields/kyria/keymaps/default/keymap.overlay b/app/boards/shields/kyria/keymaps/default/keymap.overlay
new file mode 100644
index 0000000..303c675
--- /dev/null
+++ b/app/boards/shields/kyria/keymaps/default/keymap.overlay
@@ -0,0 +1,63 @@
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/matrix-transform.h>
+#include <keymap.h>
+
+/ {
+ chosen {
+ zmk,keymap = &keymap0;
+ };
+
+ keymap0: keymap {
+ compatible = "zmk,keymap";
+ label ="Default Kyria Keymap";
+ layers = <&default>;
+ transform = <&default_transform>;
+ };
+
+ default_transform: keymap_transform_0 {
+ compatible = "zmk,matrix-transform";
+// | 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 |
+// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 |
+ map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
+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) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15)
+ RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12)
+ >;
+ };
+
+// | MX5 | MX4 | MX3 | MX2 | MX1 | | MX1 | MX2 | MX3 | MX4 | MX5 |
+// | MX11 | MX10 | MX9 | MX8 | MX7 | | MX7 | MX8 | MX9 | MX10 | MX11 |
+// | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 |
+// | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 |
+ five_column_transform: keymap_transform_1 {
+ compatible = "zmk,matrix-transform";
+ 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)
+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) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+ RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
+ >;
+ };
+
+ layers {
+ compatible = "zmk,layers";
+
+ default: layer_0 {
+ label = "DEFAULT";
+// ---------------------------------------------------------------------------------------------------------------------------------
+// | ESC | Q | W | E | R | T | | Y | U | I | O | P | "|" |
+// | <- | A | S | D | F | G | | H | J | K | L | ; | ' |
+// | SHIFT | Z | X | C | V | B | L SHIFT | L SHIFT | | L SHIFT | L SHIFT | N | M | , | . | / | - |
+// | GUI | DEL | RET | SPACE | ESC | | RET | SPACE | TAB | BSPC | R-ALT |
+ keys = <
+ KC_ESC KC_Q KC_W KC_E KC_R KC_T KC_Y KC_U KC_I KC_O KC_P KC_PIPE
+ KC_BKSP KC_A KC_S KC_D KC_F KC_G KC_H KC_J KC_K KC_L KC_SCLN KC_QUOT
+ KC_LSFT KC_Z KC_X KC_C KC_V KC_B KC_LSFT KC_LSFT KC_LSFT KC_LSFT KC_N KC_M KC_CMMA KC_DOT KC_BSLH KC_MIN
+ KC_LGUI KC_DEL KC_RET KC_SPC KC_ESC KC_RET KC_SPC KC_TAB KC_BKSP KC_RALT
+ >;
+ };
+ };
+};
diff --git a/app/boards/shields/kyria/kyria.conf b/app/boards/shields/kyria/kyria.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/boards/shields/kyria/kyria.conf
diff --git a/app/boards/shields/kyria/kyria.overlay b/app/boards/shields/kyria/kyria.overlay
new file mode 100644
index 0000000..af4e591
--- /dev/null
+++ b/app/boards/shields/kyria/kyria.overlay
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+ chosen {
+ zmk,kscan = &kscan0;
+ };
+
+ 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>;
+ };
+ };
+
+ kscan_left: kscan_left {
+ compatible = "gpio-kscan";
+ label = "KSCAN_LEFT";
+
+ diode-direction = "row2col";
+ row-gpios = <&pro_micro_pins 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+
+ col-gpios = <&pro_micro_pins 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+ };
+
+ kscan_right: kscan_right {
+ compatible = "gpio-kscan";
+ label = "KSCAN_RIGHT";
+
+ diode-direction = "row2col";
+ row-gpios = <&pro_micro_pins 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+
+ col-gpios = <&pro_micro_pins 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+ <&pro_micro_pins 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+ };
+
+ // TODO: Encoder node(s)
+ // TODO: OLED node
+ // TODO: RGB node(s)
+};
+
diff --git a/app/dts/bindings/zmk,keymap.yaml b/app/dts/bindings/zmk,keymap.yaml
index 8c56f93..b9517a3 100644
--- a/app/dts/bindings/zmk,keymap.yaml
+++ b/app/dts/bindings/zmk,keymap.yaml
@@ -4,6 +4,10 @@ description: |
compatible: "zmk,keymap"
properties:
+ transform:
+ type: phandle
+ required: false
+
label:
type: string
required: true
diff --git a/app/dts/bindings/zmk,matrix-transform.yaml b/app/dts/bindings/zmk,matrix-transform.yaml
new file mode 100644
index 0000000..453da9d
--- /dev/null
+++ b/app/dts/bindings/zmk,matrix-transform.yaml
@@ -0,0 +1,9 @@
+description: |
+ Defines a mapping from keymap logical positions to matrix physical positions
+
+compatible: "zmk,matrix-transform"
+
+properties:
+ map:
+ type: array
+ required: true
diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h
new file mode 100644
index 0000000..4fd3e6c
--- /dev/null
+++ b/app/include/dt-bindings/zmk/matrix-transform.h
@@ -0,0 +1,5 @@
+
+#define KT_ROW(item) (item >> 8)
+#define KT_COL(item) (item & 0xFF)
+
+#define RC(row, col) (((row) << 8) + (col)) \ No newline at end of file
diff --git a/app/src/keymap.c b/app/src/keymap.c
index 569a2cc..1cb705e 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -2,10 +2,57 @@
#include <logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/keymap.h>
+#include <dt-bindings/zmk/matrix-transform.h>
+#include <sys/util.h>
static u32_t zmk_keymap_layer_state = 0;
static u8_t zmk_keymap_layer_default = 0;
+#if DT_NODE_HAS_PROP(ZMK_KEYMAP_NODE, transform)
+#define ZMK_KEYMAP_TRANSFORM_NODE DT_PHANDLE(ZMK_KEYMAP_NODE, transform)
+#define ZMK_KEYMAP_LEN DT_PROP_LEN(ZMK_KEYMAP_TRANSFORM_NODE, map)
+
+#define _TRANSFORM_ENTRY(i, l) \
+ [(KT_ROW(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i)) * ZMK_MATRIX_COLS) + KT_COL(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i))] = DT_PROP_BY_IDX(DT_PHANDLE_BY_IDX(ZMK_KEYMAP_NODE, layers, l), keys, i),
+
+#define TRANSFORMED_LAYER(idx) \
+ { UTIL_LISTIFY(ZMK_KEYMAP_LEN, _TRANSFORM_ENTRY, idx) }
+
+static zmk_key zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_COLS] = {
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 0)
+ TRANSFORMED_LAYER(0),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 1)
+ TRANSFORMED_LAYER(1),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 2)
+ TRANSFORMED_LAYER(2),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 3)
+ TRANSFORMED_LAYER(3),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 4)
+ TRANSFORMED_LAYER(4),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 5)
+ TRANSFORMED_LAYER(5),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 6)
+ TRANSFORMED_LAYER(6),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 7)
+ TRANSFORMED_LAYER(7),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 8)
+ TRANSFORMED_LAYER(8),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 9)
+ TRANSFORMED_LAYER(9),
+#endif
+};
+
+#else
+
static zmk_key zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_COLS] = {
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 0)
DT_PROP_BY_PHANDLE_IDX(ZMK_KEYMAP_NODE, layers, 0, keys),
@@ -33,6 +80,8 @@ static zmk_key zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_CO
#endif
};
+#endif
+
#define SET_LAYER_STATE(layer, state) \
if (layer >= 32) \
{ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 14:47:59 +0000