From bb77652f3f882694122b9f1b71da2cfcb299fdbc Mon Sep 17 00:00:00 2001 From: rkun Date: Thu, 2 Mar 2023 23:27:32 +0900 Subject: [PATCH] add: lugg46e --- app/boards/shields/lugg46e/Kconfig.defconfig | 16 +++ app/boards/shields/lugg46e/Kconfig.shield | 5 + app/boards/shields/lugg46e/lugg46e.conf | 3 + app/boards/shields/lugg46e/lugg46e.dtsi | 44 +++++++++ app/boards/shields/lugg46e/lugg46e.keymap | 55 +++++++++++ app/boards/shields/lugg46e/lugg46e.zmk.yml | 12 +++ .../shields/lugg46e/lugg46e_left.overlay | 18 ++++ .../shields/lugg46e/lugg46e_right.overlay | 22 +++++ app/kitware-archive.sh | 99 +++++++++++++++++++ app/package-lock.json | 2 +- 10 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 app/boards/shields/lugg46e/Kconfig.defconfig create mode 100644 app/boards/shields/lugg46e/Kconfig.shield create mode 100644 app/boards/shields/lugg46e/lugg46e.conf create mode 100644 app/boards/shields/lugg46e/lugg46e.dtsi create mode 100644 app/boards/shields/lugg46e/lugg46e.keymap create mode 100644 app/boards/shields/lugg46e/lugg46e.zmk.yml create mode 100644 app/boards/shields/lugg46e/lugg46e_left.overlay create mode 100644 app/boards/shields/lugg46e/lugg46e_right.overlay create mode 100644 app/kitware-archive.sh diff --git a/app/boards/shields/lugg46e/Kconfig.defconfig b/app/boards/shields/lugg46e/Kconfig.defconfig new file mode 100644 index 00000000..8b5f49a9 --- /dev/null +++ b/app/boards/shields/lugg46e/Kconfig.defconfig @@ -0,0 +1,16 @@ +if SHIELD_LUGG46E_LEFT + +config ZMK_KEYBOARD_NAME + default "Lugg46e" + +config ZMK_SPLIT_ROLE_CENTRAL + default y + +endif + +if SHIELD_LUGG46E_LEFT || SHIELD_LUGG46E_RIGHT + +config ZMK_SPLIT + default y + +endif \ No newline at end of file diff --git a/app/boards/shields/lugg46e/Kconfig.shield b/app/boards/shields/lugg46e/Kconfig.shield new file mode 100644 index 00000000..b3af7b21 --- /dev/null +++ b/app/boards/shields/lugg46e/Kconfig.shield @@ -0,0 +1,5 @@ +config SHIELD_LUGG46E_LEFT + def_bool $(shields_list_contains,lugg46e_left) + +config SHIELD_LUGG46E_RIGHT + def_bool $(shields_list_contains,lugg46e_right) \ No newline at end of file diff --git a/app/boards/shields/lugg46e/lugg46e.conf b/app/boards/shields/lugg46e/lugg46e.conf new file mode 100644 index 00000000..3219efc8 --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e.conf @@ -0,0 +1,3 @@ +// lugg46e.conf + +CONFIG_ZMK_SLEEP=y \ No newline at end of file diff --git a/app/boards/shields/lugg46e/lugg46e.dtsi b/app/boards/shields/lugg46e/lugg46e.dtsi new file mode 100644 index 00000000..ba441874 --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e.dtsi @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; +// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | +// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | +// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | +// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +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(3,0) RC(3,1) 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) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "row2col"; + row-gpios + = <&xiao_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + }; +}; \ No newline at end of file diff --git a/app/boards/shields/lugg46e/lugg46e.keymap b/app/boards/shields/lugg46e/lugg46e.keymap new file mode 100644 index 00000000..880572c3 --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e.keymap @@ -0,0 +1,55 @@ +#include +#include +#include + +#define DEFAULT 0 +#define LOWER 1 +#define RAISE 2 + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------------------------------------------------------------ +// | ESC | Q | W | E | R | T | | Y | U | I | O | P | \ | +// | SHIFT | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | | N | M | , | . | / | = | +// | ALT | GUI | LOWER | SPC | LBKT | | RBKT | RET | RAISE | / | R CTRL | + bindings = < + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT + &kp LSHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp EQL + &kp ALT &kp GUI &mo LOWER &kp SPACE &kp LBKT &kp RBKT &kp RET &mo RAISE &kp BSPC &kp DEL + >; + }; + + lower_layer { +// ------------------------------------------------------------------------------------------------------------------------------------------------ +// | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | +// | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 10 | 11 | 12 | +// | SHIFT | Z | X | C | V | B | | N | M | < | > | ? | + | +// | ALT | GUI | LOWER | SPC | KP_LPAR | | KP_RPAR | RET | RAISE | / | R CTRL | + bindings = < + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 + &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N10 &kp N11 &kp N12 + &kp LSHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp EQL + &kp ALT &kp GUI &mo LOWER &kp SPACE &kp LPAR &kp RPAR &kp RET &mo RAISE &kp BSPC &kp DEL + >; + }; + + raise_layer { +// ------------------------------------------------------------------------------------------------------------------------------------------------ +// | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | +// | 1 | 2 | 3 | 4 | 5 | 6 | | LEFT | DOWN | UP | RIGHT | | | +// | SHIFT | Z | X | C | V | B | | N | M | < | > | ? | + | +// | ALT | GUI | LOWER | SPC | KP_LPAR | | KP_RPAR | RET | RAISE | / | R CTRL | + bindings = < + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 + &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp N11 &kp N12 + &kp LSHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp EQL + &kp ALT &kp GUI &mo LOWER &kp SPACE &kp LPAR &kp RPAR &kp RET &mo RAISE &kp BSPC &kp DEL + >; + }; + }; +}; \ No newline at end of file diff --git a/app/boards/shields/lugg46e/lugg46e.zmk.yml b/app/boards/shields/lugg46e/lugg46e.zmk.yml new file mode 100644 index 00000000..3b1b2e24 --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e.zmk.yml @@ -0,0 +1,12 @@ +file_format: "1" +id: lugg46e +name: Lugg46e +type: shield +url: https://github.com/rkun123/lugg46e/ +requires: [xiao] +exposes: [] +features: + - keys +siblings: + - lugg46e_left + - lugg46e_right \ No newline at end of file diff --git a/app/boards/shields/lugg46e/lugg46e_left.overlay b/app/boards/shields/lugg46e/lugg46e_left.overlay new file mode 100644 index 00000000..16687b93 --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e_left.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include "iris.dtsi" + +&kscan0 { + col-gpios + = <&xiao_d 5 GPIO_ACTIVE_HIGH> + , <&xiao_d 4 GPIO_ACTIVE_HIGH> + , <&xiao_d 3 GPIO_ACTIVE_HIGH> + , <&xiao_d 2 GPIO_ACTIVE_HIGH> + , <&xiao_d 1 GPIO_ACTIVE_HIGH> + , <&xiao_d 0 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/boards/shields/lugg46e/lugg46e_right.overlay b/app/boards/shields/lugg46e/lugg46e_right.overlay new file mode 100644 index 00000000..0ca34aed --- /dev/null +++ b/app/boards/shields/lugg46e/lugg46e_right.overlay @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include "iris.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&xiao_d 5 GPIO_ACTIVE_HIGH> + , <&xiao_d 4 GPIO_ACTIVE_HIGH> + , <&xiao_d 3 GPIO_ACTIVE_HIGH> + , <&xiao_d 2 GPIO_ACTIVE_HIGH> + , <&xiao_d 1 GPIO_ACTIVE_HIGH> + , <&xiao_d 0 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/kitware-archive.sh b/app/kitware-archive.sh new file mode 100644 index 00000000..87d6443e --- /dev/null +++ b/app/kitware-archive.sh @@ -0,0 +1,99 @@ +#!/bin/sh + +set -eu + +help() { + echo "Usage: $0 [--release ] [--rc]" > /dev/stderr +} + +doing= +rc= +release= +help= +for opt in "$@" +do + case "${doing}" in + release) + release="${opt}" + doing= + ;; + "") + case "${opt}" in + --rc) + rc=1 + ;; + --release) + doing=release + ;; + --help) + help=1 + ;; + esac + ;; + esac +done + +if [ -n "${doing}" ] +then + echo "--${doing} option given no argument." > /dev/stderr + echo > /dev/stderr + help + exit 1 +fi + +if [ -n "${help}" ] +then + help + exit +fi + +if [ -z "${release}" ] +then + unset UBUNTU_CODENAME + . /etc/os-release + + if [ -z "${UBUNTU_CODENAME+x}" ] + then + echo "This is not an Ubuntu system. Aborting." > /dev/stderr + exit 1 + fi + + release="${UBUNTU_CODENAME}" +fi + +case "${release}" in +bionic|focal|jammy) + packages= + keyring_packages="gpg wget" + ;; +*) + echo "Only Ubuntu Bionic (18.04), Focal (20.04), and Jammy (22.04) are supported. Aborting." > /dev/stderr + exit 1 + ;; +esac + +get_keyring= +if [ ! -f /usr/share/keyrings/kitware-archive-keyring.gpg ] +then + packages="${packages} ${keyring_packages}" + get_keyring=1 +fi + +# Start the real work +set -x + +apt-get update +# shellcheck disable=SC2086 +apt-get install -y ${packages} + +test -n "${get_keyring}" && (wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg) + +echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release} main" > /etc/apt/sources.list.d/kitware.list +if [ -n "${rc}" ] +then + echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release}-rc main" >> /etc/apt/sources.list.d/kitware.list +fi + +apt-get update +test -n "${get_keyring}" && rm /usr/share/keyrings/kitware-archive-keyring.gpg +apt-get install -y kitware-archive-keyring diff --git a/app/package-lock.json b/app/package-lock.json index ed8765f3..b2bb917b 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "prettier": "^2.7.1" + "prettier": "^2.4.0" } }, "node_modules/prettier": {