From bf0dd0325fd22ca9100c746bde99699300d5ef29 Mon Sep 17 00:00:00 2001 From: shuiguohuooo <97853321+shuihuohuooo@users.noreply.github.com> Date: Sat, 1 Apr 2023 00:19:44 +0800 Subject: [PATCH 1/2] add shield fa65 --- app/boards/shields/fa65/Kconfig.defconfig | 9 ++++ app/boards/shields/fa65/Kconfig.shield | 5 ++ app/boards/shields/fa65/README.md | 7 +++ app/boards/shields/fa65/fa65.conf | 9 ++++ app/boards/shields/fa65/fa65.keymap | 44 +++++++++++++++++ app/boards/shields/fa65/fa65.overlay | 59 +++++++++++++++++++++++ app/boards/shields/fa65/fa65_zmk.yml | 8 +++ 7 files changed, 141 insertions(+) create mode 100644 app/boards/shields/fa65/Kconfig.defconfig create mode 100644 app/boards/shields/fa65/Kconfig.shield create mode 100644 app/boards/shields/fa65/README.md create mode 100644 app/boards/shields/fa65/fa65.conf create mode 100644 app/boards/shields/fa65/fa65.keymap create mode 100644 app/boards/shields/fa65/fa65.overlay create mode 100644 app/boards/shields/fa65/fa65_zmk.yml diff --git a/app/boards/shields/fa65/Kconfig.defconfig b/app/boards/shields/fa65/Kconfig.defconfig new file mode 100644 index 00000000..07883ab6 --- /dev/null +++ b/app/boards/shields/fa65/Kconfig.defconfig @@ -0,0 +1,9 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_FA65 + +config ZMK_KEYBOARD_NAME + default "fa65" + +endif diff --git a/app/boards/shields/fa65/Kconfig.shield b/app/boards/shields/fa65/Kconfig.shield new file mode 100644 index 00000000..b4adc252 --- /dev/null +++ b/app/boards/shields/fa65/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_FA65 + def_bool $(shields_list_contains,fa65) diff --git a/app/boards/shields/fa65/README.md b/app/boards/shields/fa65/README.md new file mode 100644 index 00000000..9432ade6 --- /dev/null +++ b/app/boards/shields/fa65/README.md @@ -0,0 +1,7 @@ +# [fadog65]() + +A 65% ANSI keyboard designed and manufactured by hu. + +## Features +- Uses makerdiary M.2 nRF52833 module +- Matrix wiring diff --git a/app/boards/shields/fa65/fa65.conf b/app/boards/shields/fa65/fa65.conf new file mode 100644 index 00000000..818ca76c --- /dev/null +++ b/app/boards/shields/fa65/fa65.conf @@ -0,0 +1,9 @@ +# Copyright (c) 2021 Nick Winans +# SPDX-License-Identifier: MIT + +#sleep +CONFIG_ZMK_IDLE_TIMEOUT=30000 +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 +#nkro +CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y \ No newline at end of file diff --git a/app/boards/shields/fa65/fa65.keymap b/app/boards/shields/fa65/fa65.keymap new file mode 100644 index 00000000..cd79280f --- /dev/null +++ b/app/boards/shields/fa65/fa65.keymap @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include +#include + +/ { + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------ +// | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BKSP | +// | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | +// | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | +// | SHIFT | Z | X | C | V | B | N | M | , | . | / | SHIFT | +// | CTL | WIN | ALT | SPACE | ALT | MO(1) | WIN | CTRL | +// ------------------------------------------------------------------------------------------ + bindings = < + &gresc &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC &kp INS + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH &kp DEL + &kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp RET &kp PGUP + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp UP &kp PGDN + &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo 1 &kp LEFT &kp DOWN &kp RIGHT + >; + }; + + fn_layer { + bindings = < + &bootloader &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &out OUT_TOG &kp INS + &bt BT_CLR &bt BT_SEL 1 &bt BT_PRV &bt BT_NXT &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH &kp DEL + &kp CLCK &out OUT_TOG &out OUT_USB &out OUT_BLE &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &bootloader &kp PGUP + &bootloader &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp C_VOL_UP &kp C_MUTE + &kp LCTRL &kp LGUI &kp LALT &kp K_PP &kp RALT &mo 1 &bt BT_NXT &kp C_VOL_DN &bt BT_PRV + >; + }; + }; +}; diff --git a/app/boards/shields/fa65/fa65.overlay b/app/boards/shields/fa65/fa65.overlay new file mode 100644 index 00000000..25b9d7bd --- /dev/null +++ b/app/boards/shields/fa65/fa65.overlay @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&gpio0 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 9(GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&gpio0 29 GPIO_ACTIVE_HIGH> + , <&gpio0 26 GPIO_ACTIVE_HIGH> + , <&gpio0 31 GPIO_ACTIVE_HIGH> + , <&gpio0 06 GPIO_ACTIVE_HIGH> + , <&gpio0 30 GPIO_ACTIVE_HIGH> + , <&gpio0 8 GPIO_ACTIVE_HIGH> + , <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio0 5 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 15 GPIO_ACTIVE_HIGH> + , <&gpio0 17 GPIO_ACTIVE_HIGH> + , <&gpio0 20 GPIO_ACTIVE_HIGH> + , <&gpio0 13 GPIO_ACTIVE_HIGH> + , <&gpio0 22 GPIO_ACTIVE_HIGH> + , <&gpio0 24 GPIO_ACTIVE_HIGH> + ; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <15>; + rows = <5>; + 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(0,12) RC(0,13) RC(0,14) +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(1,12) RC(1,13) RC(1,14) +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,13) RC(2,14) +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,12) RC(3,13) RC(3,14) +RC(4,0) RC(4,1) RC(4,2) RC(4,5) RC(4,9) RC(4,10) RC(4,12) RC(4,13) RC(4,14) + >; + }; +}; + diff --git a/app/boards/shields/fa65/fa65_zmk.yml b/app/boards/shields/fa65/fa65_zmk.yml new file mode 100644 index 00000000..d262cce8 --- /dev/null +++ b/app/boards/shields/fa65/fa65_zmk.yml @@ -0,0 +1,8 @@ +file_format: "1" +id: fa65 +name: fa65 +type: shield +url: +requires: [nrfmicro_13_52833] +features: + - keys From 098452b3a1872811af13518ad9c54c5a7a488acf Mon Sep 17 00:00:00 2001 From: shuiguohuooo <97853321+shuihuohuooo@users.noreply.github.com> Date: Sat, 1 Apr 2023 14:30:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Update=20and=20rename=20app/boards/shields/?= =?UTF-8?q?fa65/fa65=5Fzmk.yml=20to=20.app/=E6=9D=BF/=E7=9B=BE=E7=89=8C/FA?= =?UTF-8?q?65/fa65=5Fzmk.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .app/板/盾牌/FA65/fa65_zmk.yml | 8 ++++++++ app/boards/shields/fa65/fa65_zmk.yml | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 .app/板/盾牌/FA65/fa65_zmk.yml delete mode 100644 app/boards/shields/fa65/fa65_zmk.yml diff --git a/.app/板/盾牌/FA65/fa65_zmk.yml b/.app/板/盾牌/FA65/fa65_zmk.yml new file mode 100644 index 00000000..86192327 --- /dev/null +++ b/.app/板/盾牌/FA65/fa65_zmk.yml @@ -0,0 +1,8 @@ +file_format: "1" +id: fa65 +name: fa65 +type: shield +url: https://github.com/shuihuohuooo/zmk/tree/bf0dd0325fd22ca9100c746bde99699300d5ef29/app/boards/shields/fa65 +requires: [nrfmicro_13_52833] +features: + - keys diff --git a/app/boards/shields/fa65/fa65_zmk.yml b/app/boards/shields/fa65/fa65_zmk.yml deleted file mode 100644 index d262cce8..00000000 --- a/app/boards/shields/fa65/fa65_zmk.yml +++ /dev/null @@ -1,8 +0,0 @@ -file_format: "1" -id: fa65 -name: fa65 -type: shield -url: -requires: [nrfmicro_13_52833] -features: - - keys