From dbce3b5211b28ff0bc7f31ba95b031a50b7018c7 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Tue, 29 Dec 2020 00:12:03 +0000 Subject: [PATCH] Update pocket type to be a cleaner dongle approach / organize code better --- .../boards/shields/pockettype/pockettype.dtsi | 68 ------------------- .../shields/pockettype/pockettype.overlay | 53 ++++++++++++++- .../shields/pockettype/pockettype_mdk.keymap | 15 +--- .../shields/pockettype/pockettype_mdk.overlay | 17 +++-- .../pockettype/pockettype_peripheral.overlay | 6 +- .../pockettype/pockettype_transform.dtsi | 33 +++++++++ 6 files changed, 97 insertions(+), 95 deletions(-) delete mode 100644 keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi create mode 100644 keyboards/zmk-config/config/boards/shields/pockettype/pockettype_transform.dtsi diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi deleted file mode 100644 index d3f1e475..00000000 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - leds { - compatible = "gpio-leds"; - act_led: led_a { - gpios = <&pro_micro_a 3 GPIO_ACTIVE_HIGH>; - label = "ACT LED"; - }; - power_led: led_p { - gpios = <&pro_micro_a 2 GPIO_ACTIVE_HIGH>; - label = "PWR LED"; - }; - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; - - diode-direction = "col2row"; - - col-gpios - = <&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> - , <&pro_micro_d 8 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 7 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 5 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 4 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 3 GPIO_ACTIVE_HIGH> - , <&pro_micro_d 0 GPIO_ACTIVE_HIGH> - ; - - row-gpios - = <&pro_micro_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <12>; - rows = <4>; - - 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) - >; - }; - - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; -}; diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay index 07011ab8..7fe4dcf4 100644 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.overlay @@ -4,4 +4,55 @@ * SPDX-License-Identifier: MIT */ -#include "pockettype.dtsi" +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +#include "pockettype_transform.dtsi" + +/ { + leds { + compatible = "gpio-leds"; + act_led: led_a { + gpios = <&pro_micro_a 3 GPIO_ACTIVE_HIGH>; + label = "ACT LED"; + }; + power_led: led_p { + gpios = <&pro_micro_a 2 GPIO_ACTIVE_HIGH>; + label = "PWR LED"; + }; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + + col-gpios + = <&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> + , <&pro_micro_d 8 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 7 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 5 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 4 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 3 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 0 GPIO_ACTIVE_HIGH> + ; + + row-gpios + = <&pro_micro_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; +}; diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.keymap b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.keymap index 3f4e2851..f1909364 100644 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.keymap +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.keymap @@ -4,17 +4,4 @@ * SPDX-License-Identifier: MIT */ -#include -#include - -/ { - keymap0: keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &bootloader - >; - }; - }; -}; \ No newline at end of file +#include "pockettype.keymap" diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay index 741cd75d..bca6c799 100644 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay @@ -4,14 +4,16 @@ * SPDX-License-Identifier: MIT */ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + #include / { - chosen { - zmk,kscan = &kscan0; - }; - - kscan0: kscan_0 { + kscan0: kscan { compatible = "zmk,kscan-gpio-direct"; label = "KSCAN"; @@ -19,6 +21,7 @@ input-gpios = <&gpio1 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)> ; - }; -}; \ No newline at end of file +}; + +#include "pockettype_transform.dtsi" diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.overlay b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.overlay index ba405208..7eac26f9 100644 --- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.overlay +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.overlay @@ -4,9 +4,5 @@ * SPDX-License-Identifier: MIT */ -#include "pockettype.dtsi" +#include "pockettype.overlay" #include "pockettype.keymap" - -&default_transform { - col-offset = <0>; -}; diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_transform.dtsi b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_transform.dtsi new file mode 100644 index 00000000..70638607 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_transform.dtsi @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + + 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) + >; + }; + + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; +};