From 2eb04cf36430cd6ef5fcafc3f082188a4f195ab4 Mon Sep 17 00:00:00 2001 From: Andrew Rae Date: Tue, 15 Mar 2022 00:01:58 -0400 Subject: [PATCH] Trying out local shield --- config/Kconfig.defconfig | 19 +++++++++++++ config/Kconfig.shield | 8 ++++++ config/README.md | 6 ++++ config/rae_dux.conf | 2 +- config/rae_dux.dtsi | 53 ++++++++++++++++++++++++++++++++++++ config/rae_dux.zmk.yml | 11 ++++++++ config/rae_dux_left.overlay | 7 +++++ config/rae_dux_right.overlay | 11 ++++++++ config/west.yml | 2 +- 9 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 config/Kconfig.defconfig create mode 100644 config/Kconfig.shield create mode 100644 config/README.md create mode 100644 config/rae_dux.dtsi create mode 100644 config/rae_dux.zmk.yml create mode 100644 config/rae_dux_left.overlay create mode 100644 config/rae_dux_right.overlay diff --git a/config/Kconfig.defconfig b/config/Kconfig.defconfig new file mode 100644 index 0000000..0821218 --- /dev/null +++ b/config/Kconfig.defconfig @@ -0,0 +1,19 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_RAE_DUX_LEFT + +config ZMK_KEYBOARD_NAME + default "rae-dux" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif + +if SHIELD_RAE_DUX_LEFT || SHIELD_RAE_DUX_RIGHT + +config ZMK_SPLIT + default y + +endif diff --git a/config/Kconfig.shield b/config/Kconfig.shield new file mode 100644 index 0000000..006903b --- /dev/null +++ b/config/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_RAE_DUX_LEFT + def_bool $(shields_list_contains,rae_dux_left) + +config SHIELD_RAE_DUX_RIGHT + def_bool $(shields_list_contains,rae_dux_right) diff --git a/config/README.md b/config/README.md new file mode 100644 index 0000000..e47566a --- /dev/null +++ b/config/README.md @@ -0,0 +1,6 @@ +# Rae-Dux + +Shield configuration for [rae-dux][1], a 36-key diodeless interpretation of the [A. Dux by Tapi][2]. + +[1]: https://github.com/andrewjrae/rae-dux +[2]: https://github.com/tapioki/cephalopoda/tree/main/Architeuthis%20dux diff --git a/config/rae_dux.conf b/config/rae_dux.conf index fa97157..fb23f20 100644 --- a/config/rae_dux.conf +++ b/config/rae_dux.conf @@ -1,2 +1,2 @@ -# Copyright (c) 2021 The ZMK Contributors +# Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT diff --git a/config/rae_dux.dtsi b/config/rae_dux.dtsi new file mode 100644 index 0000000..f713b75 --- /dev/null +++ b/config/rae_dux.dtsi @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <36>; + rows = <1>; + map = < + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,22) RC(0,21) RC(0,20) RC(0,19) RC(0,18) + RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,27) RC(0,26) RC(0,25) RC(0,24) RC(0,23) + RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,32) RC(0,31) RC(0,30) RC(0,29) RC(0,28) + RC(0,15) RC(0,16) RC(0,17) RC(0,35) RC(0,34) RC(0,33) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-direct"; + label = "KSCAN"; + input-gpios = + <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>, + <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; + }; + +}; diff --git a/config/rae_dux.zmk.yml b/config/rae_dux.zmk.yml new file mode 100644 index 0000000..2551ff6 --- /dev/null +++ b/config/rae_dux.zmk.yml @@ -0,0 +1,11 @@ +file_format: "1" +id: rae_dux +name: rae-dux +type: shield +url: https://github.com/andrewjrae/rae-dux +requires: [pro_micro] +features: + - keys +siblings: + - rae_dux_left + - rae_dux_right diff --git a/config/rae_dux_left.overlay b/config/rae_dux_left.overlay new file mode 100644 index 0000000..59ee4af --- /dev/null +++ b/config/rae_dux_left.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "rae_dux.dtsi" diff --git a/config/rae_dux_right.overlay b/config/rae_dux_right.overlay new file mode 100644 index 0000000..34b5717 --- /dev/null +++ b/config/rae_dux_right.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "rae_dux.dtsi" + +&default_transform { + col-offset = <18>; +}; diff --git a/config/west.yml b/config/west.yml index 0f94807..379d291 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,7 +1,7 @@ manifest: remotes: - name: zmkfirmware - url-base: https://github.com/andrewjrae + url-base: https://github.com/zmkfirmware projects: - name: zmk remote: zmkfirmware