From 4551d307693dae30802a3f06d5f62fcf3155f8c0 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 3 Sep 2020 13:20:05 +0100 Subject: [PATCH 01/24] ad cradios --- app/boards/shields/cradios/Kconfig.defconfig | 14 +++++++ app/boards/shields/cradios/Kconfig.shield | 5 +++ app/boards/shields/cradios/cradios.dtsi | 31 +++++++++++++++ app/boards/shields/cradios/cradios.keymap | 17 +++++++++ app/boards/shields/cradios/cradios_left.conf | 2 + .../shields/cradios/cradios_left.overlay | 34 +++++++++++++++++ app/boards/shields/cradios/cradios_right.conf | 2 + .../shields/cradios/cradios_right.overlay | 38 +++++++++++++++++++ app/boards/shields/cradios/default.keymap | 19 ++++++++++ 9 files changed, 162 insertions(+) create mode 100644 app/boards/shields/cradios/Kconfig.defconfig create mode 100644 app/boards/shields/cradios/Kconfig.shield create mode 100644 app/boards/shields/cradios/cradios.dtsi create mode 100644 app/boards/shields/cradios/cradios.keymap create mode 100644 app/boards/shields/cradios/cradios_left.conf create mode 100644 app/boards/shields/cradios/cradios_left.overlay create mode 100644 app/boards/shields/cradios/cradios_right.conf create mode 100644 app/boards/shields/cradios/cradios_right.overlay create mode 100644 app/boards/shields/cradios/default.keymap diff --git a/app/boards/shields/cradios/Kconfig.defconfig b/app/boards/shields/cradios/Kconfig.defconfig new file mode 100644 index 00000000..0aca38fc --- /dev/null +++ b/app/boards/shields/cradios/Kconfig.defconfig @@ -0,0 +1,14 @@ + +if SHIELD_CRADIOS + +config ZMK_KEYBOARD_NAME + default "cradios" + +# Unable to use interrupts as the same pin number is used +# across A & B controllers, and STM32F303CCT6 can't enable +# interrutps for multiple controllers for the same "line" +# for the external interrupts. +config ZMK_KSCAN_GPIO_POLLING + default y + +endif diff --git a/app/boards/shields/cradios/Kconfig.shield b/app/boards/shields/cradios/Kconfig.shield new file mode 100644 index 00000000..844d4332 --- /dev/null +++ b/app/boards/shields/cradios/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_CRADIOS + def_bool $(shields_list_contains,cradios) diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi new file mode 100644 index 00000000..7c20c009 --- /dev/null +++ b/app/boards/shields/cradios/cradios.dtsi @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + #include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <10>; + rows = <4>; + map = < +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(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(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(3,4) RC(3,5) RC(3,6) RC(3,7) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-direct"; + }; + + }; diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap new file mode 100644 index 00000000..29392241 --- /dev/null +++ b/app/boards/shields/cradios/cradios.keymap @@ -0,0 +1,17 @@ +#include +#include + + +/ { + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH + &kp DEL &kp RET &kp RET &SPC + }; + }; +}; diff --git a/app/boards/shields/cradios/cradios_left.conf b/app/boards/shields/cradios/cradios_left.conf new file mode 100644 index 00000000..1e028a78 --- /dev/null +++ b/app/boards/shields/cradios/cradios_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay new file mode 100644 index 00000000..6f53d8b9 --- /dev/null +++ b/app/boards/shields/cradios/cradios_left.overlay @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ +#include "cradios.dtsi" + +kscan_0 { + + input-gpios + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; +}; + +&bt_unpair_combo { + key-positions = <0 38>; +}; + diff --git a/app/boards/shields/cradios/cradios_right.conf b/app/boards/shields/cradios/cradios_right.conf new file mode 100644 index 00000000..990cf7c0 --- /dev/null +++ b/app/boards/shields/cradios/cradios_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay new file mode 100644 index 00000000..f991ef9c --- /dev/null +++ b/app/boards/shields/cradios/cradios_right.overlay @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ +#include "cradios.dtsi" + +&default_transform { + col-offset = <5>; +}; + + &kscan0 { + input-gpios + + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; +}; + +&bt_unpair_combo { + key-positions = <0 38>; +}; + diff --git a/app/boards/shields/cradios/default.keymap b/app/boards/shields/cradios/default.keymap new file mode 100644 index 00000000..08210052 --- /dev/null +++ b/app/boards/shields/cradios/default.keymap @@ -0,0 +1,19 @@ +#include +#include + + +/ { + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH + &kp DEL &kp RET &kp RET &kp SPC + + >; + }; + }; +}; From 95bb220702121756a1f7458dcf549bd3c9187216 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 3 Sep 2020 14:46:54 +0100 Subject: [PATCH 02/24] now compiles, not work, baby steps --- app/boards/shields/cradios/cradios.dtsi | 11 ++++++----- app/boards/shields/cradios/cradios.keymap | 13 +++++++------ app/boards/shields/cradios/cradios_left.overlay | 7 +++---- app/boards/shields/cradios/cradios_right.overlay | 9 +++------ 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi index 7c20c009..f5ebb962 100644 --- a/app/boards/shields/cradios/cradios.dtsi +++ b/app/boards/shields/cradios/cradios.dtsi @@ -14,18 +14,19 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <10>; - rows = <4>; + columns = <34>; + rows = <1>; map = < 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(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(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(3,4) RC(3,5) RC(3,6) RC(3,7) +RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19) RC(0,20) +RC(0,21) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26) RC(0,27) RC(0,28) RC(0,29) RC(0,30) +RC(0,31) RC(0,32) RC(0,33) RC(0,34) >; }; kscan0: kscan { compatible = "zmk,kscan-gpio-direct"; + label = "KSCAN"; }; }; diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap index 29392241..3da61b74 100644 --- a/app/boards/shields/cradios/cradios.keymap +++ b/app/boards/shields/cradios/cradios.keymap @@ -3,15 +3,16 @@ / { - keymap0: keymap { - compatible = "zmk,keymap"; + keymap { + compatible = "zmk,keymap"; - default_layer { + default_layer { bindings = < &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp DEL &kp RET &kp RET &SPC + &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH + &kp 3 &kp 4 &kp 2 &kp 1 + >; }; }; }; diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay index 6f53d8b9..3c3e9863 100644 --- a/app/boards/shields/cradios/cradios_left.overlay +++ b/app/boards/shields/cradios/cradios_left.overlay @@ -5,7 +5,8 @@ */ #include "cradios.dtsi" -kscan_0 { + +&kscan0 { input-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> @@ -28,7 +29,5 @@ kscan_0 { ; }; -&bt_unpair_combo { - key-positions = <0 38>; -}; + diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay index f991ef9c..7b47924d 100644 --- a/app/boards/shields/cradios/cradios_right.overlay +++ b/app/boards/shields/cradios/cradios_right.overlay @@ -6,12 +6,11 @@ #include "cradios.dtsi" &default_transform { - col-offset = <5>; + col-offset = <17>; }; - &kscan0 { +&kscan0 { input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> @@ -32,7 +31,5 @@ ; }; -&bt_unpair_combo { - key-positions = <0 38>; -}; + From 8bad40282b89859766cd28949b48fe34c24371fe Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 3 Sep 2020 22:02:25 +0100 Subject: [PATCH 03/24] actually working --- app/boards/shields/cradios/Kconfig.defconfig | 4 ++-- app/boards/shields/cradios/cradios.dtsi | 10 +++++----- app/boards/shields/cradios/cradios.keymap | 2 +- app/boards/shields/cradios/cradios_left.overlay | 3 +-- app/boards/shields/cradios/cradios_right.overlay | 5 ++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/boards/shields/cradios/Kconfig.defconfig b/app/boards/shields/cradios/Kconfig.defconfig index 0aca38fc..5b9ca9a1 100644 --- a/app/boards/shields/cradios/Kconfig.defconfig +++ b/app/boards/shields/cradios/Kconfig.defconfig @@ -1,5 +1,5 @@ -if SHIELD_CRADIOS + config ZMK_KEYBOARD_NAME default "cradios" @@ -11,4 +11,4 @@ config ZMK_KEYBOARD_NAME config ZMK_KSCAN_GPIO_POLLING default y -endif + diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi index f5ebb962..95b4f272 100644 --- a/app/boards/shields/cradios/cradios.dtsi +++ b/app/boards/shields/cradios/cradios.dtsi @@ -17,11 +17,11 @@ columns = <34>; rows = <1>; map = < -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(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19) RC(0,20) -RC(0,21) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26) RC(0,27) RC(0,28) RC(0,29) RC(0,30) -RC(0,31) RC(0,32) RC(0,33) RC(0,34) - >; +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,17) RC(0,18) RC(0,19) RC(0,20) RC(0,21) +RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26) +RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,27) RC(0,28) RC(0,29) RC(0,30) RC(0,31) +RC(0,15) RC(0,16) RC(0,32) RC(0,33) +>; }; kscan0: kscan { diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap index 3da61b74..c46468dd 100644 --- a/app/boards/shields/cradios/cradios.keymap +++ b/app/boards/shields/cradios/cradios.keymap @@ -11,7 +11,7 @@ &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp 3 &kp 4 &kp 2 &kp 1 + &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 >; }; }; diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay index 3c3e9863..ab5a874d 100644 --- a/app/boards/shields/cradios/cradios_left.overlay +++ b/app/boards/shields/cradios/cradios_left.overlay @@ -7,9 +7,8 @@ &kscan0 { - input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay index 7b47924d..59a81ba5 100644 --- a/app/boards/shields/cradios/cradios_right.overlay +++ b/app/boards/shields/cradios/cradios_right.overlay @@ -8,10 +8,9 @@ &default_transform { col-offset = <17>; }; - &kscan0 { input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + = <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> @@ -27,7 +26,7 @@ , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> ; }; From 2855ba75f53554887f6e788736c45b7c818d09ac Mon Sep 17 00:00:00 2001 From: David Barr Date: Sat, 19 Sep 2020 10:55:07 +0100 Subject: [PATCH 04/24] Actually really working Ok, both sides work as expected, need to write a keymap. --- app/boards/shields/Kconfig.defconfig | 14 +++++ app/boards/shields/Kconfig.shield | 5 ++ app/boards/shields/cradios.dtsi | 67 ++++++++++++++++++++++++ app/boards/shields/cradios.keymap | 18 +++++++ app/boards/shields/cradios_left.conf | 2 + app/boards/shields/cradios_left.overlay | 15 ++++++ app/boards/shields/cradios_right.conf | 2 + app/boards/shields/cradios_right.overlay | 17 ++++++ 8 files changed, 140 insertions(+) create mode 100644 app/boards/shields/Kconfig.defconfig create mode 100644 app/boards/shields/Kconfig.shield create mode 100644 app/boards/shields/cradios.dtsi create mode 100644 app/boards/shields/cradios.keymap create mode 100644 app/boards/shields/cradios_left.conf create mode 100644 app/boards/shields/cradios_left.overlay create mode 100644 app/boards/shields/cradios_right.conf create mode 100644 app/boards/shields/cradios_right.overlay diff --git a/app/boards/shields/Kconfig.defconfig b/app/boards/shields/Kconfig.defconfig new file mode 100644 index 00000000..5b9ca9a1 --- /dev/null +++ b/app/boards/shields/Kconfig.defconfig @@ -0,0 +1,14 @@ + + + +config ZMK_KEYBOARD_NAME + default "cradios" + +# Unable to use interrupts as the same pin number is used +# across A & B controllers, and STM32F303CCT6 can't enable +# interrutps for multiple controllers for the same "line" +# for the external interrupts. +config ZMK_KSCAN_GPIO_POLLING + default y + + diff --git a/app/boards/shields/Kconfig.shield b/app/boards/shields/Kconfig.shield new file mode 100644 index 00000000..844d4332 --- /dev/null +++ b/app/boards/shields/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_CRADIOS + def_bool $(shields_list_contains,cradios) diff --git a/app/boards/shields/cradios.dtsi b/app/boards/shields/cradios.dtsi new file mode 100644 index 00000000..68d1fc57 --- /dev/null +++ b/app/boards/shields/cradios.dtsi @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + #include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <34>; + rows = <1>; + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) +RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) +RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) +RC(0,15) RC(0,16) RC(0,33) RC(0,32) +>; + + + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-direct"; + label = "KSCAN"; + }; + + + + + bt_unpair_combo: bt_unpair_combo { + compatible = "zmk,bt-unpair-combo"; + }; + + + + }; + + + &kscan0 { + input-gpios + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; +}; + + diff --git a/app/boards/shields/cradios.keymap b/app/boards/shields/cradios.keymap new file mode 100644 index 00000000..c46468dd --- /dev/null +++ b/app/boards/shields/cradios.keymap @@ -0,0 +1,18 @@ +#include +#include + + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH + &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 + >; + }; + }; +}; diff --git a/app/boards/shields/cradios_left.conf b/app/boards/shields/cradios_left.conf new file mode 100644 index 00000000..1e028a78 --- /dev/null +++ b/app/boards/shields/cradios_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/cradios_left.overlay b/app/boards/shields/cradios_left.overlay new file mode 100644 index 00000000..b0bdc6fe --- /dev/null +++ b/app/boards/shields/cradios_left.overlay @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ +#include "cradios.dtsi" + + + + + + +&bt_unpair_combo { + key-positions = <0 16>; +}; diff --git a/app/boards/shields/cradios_right.conf b/app/boards/shields/cradios_right.conf new file mode 100644 index 00000000..990cf7c0 --- /dev/null +++ b/app/boards/shields/cradios_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/cradios_right.overlay b/app/boards/shields/cradios_right.overlay new file mode 100644 index 00000000..ef920ac3 --- /dev/null +++ b/app/boards/shields/cradios_right.overlay @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ +#include "cradios.dtsi" + +&default_transform { + col-offset = <17>; +}; + + + + +&bt_unpair_combo { + key-positions = <21 32>; +}; From ed5d3646fe7596fb40d0b7505f8062cdac6537be Mon Sep 17 00:00:00 2001 From: David Barr Date: Sat, 19 Sep 2020 10:56:40 +0100 Subject: [PATCH 05/24] Add files via upload --- app/boards/shields/cradios/cradios.dtsi | 51 ++++++++++++++++--- .../shields/cradios/cradios_left.overlay | 25 ++------- .../shields/cradios/cradios_right.overlay | 25 ++------- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi index 95b4f272..68d1fc57 100644 --- a/app/boards/shields/cradios/cradios.dtsi +++ b/app/boards/shields/cradios/cradios.dtsi @@ -10,23 +10,58 @@ zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; }; - default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; columns = <34>; rows = <1>; map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,17) RC(0,18) RC(0,19) RC(0,20) RC(0,21) -RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26) -RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,27) RC(0,28) RC(0,29) RC(0,30) RC(0,31) -RC(0,15) RC(0,16) RC(0,32) RC(0,33) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) +RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) +RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) +RC(0,15) RC(0,16) RC(0,33) RC(0,32) >; + + }; - kscan0: kscan { - compatible = "zmk,kscan-gpio-direct"; - label = "KSCAN"; + kscan0: kscan { + compatible = "zmk,kscan-gpio-direct"; + label = "KSCAN"; + }; + + + + + bt_unpair_combo: bt_unpair_combo { + compatible = "zmk,bt-unpair-combo"; }; + + }; + + + &kscan0 { + input-gpios + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + ; +}; + + diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay index ab5a874d..b0bdc6fe 100644 --- a/app/boards/shields/cradios/cradios_left.overlay +++ b/app/boards/shields/cradios/cradios_left.overlay @@ -6,27 +6,10 @@ #include "cradios.dtsi" -&kscan0 { - input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; -}; + +&bt_unpair_combo { + key-positions = <0 16>; +}; diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay index 59a81ba5..ef920ac3 100644 --- a/app/boards/shields/cradios/cradios_right.overlay +++ b/app/boards/shields/cradios/cradios_right.overlay @@ -8,27 +8,10 @@ &default_transform { col-offset = <17>; }; -&kscan0 { - input-gpios - = <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; -}; + +&bt_unpair_combo { + key-positions = <21 32>; +}; From a3d0c03726a0bc607d4daab7a90dda57d4ba6a6f Mon Sep 17 00:00:00 2001 From: David Barr Date: Wed, 30 Sep 2020 16:20:41 +0100 Subject: [PATCH 06/24] rename cradios to cradio --- .DS_Store | Bin 0 -> 8196 bytes app/.DS_Store | Bin 0 -> 8196 bytes app/boards/.DS_Store | Bin 0 -> 8196 bytes app/boards/shields/.DS_Store | Bin 0 -> 8196 bytes .../{cradios => cradio}/Kconfig.defconfig | 5 +- .../{cradios => cradio}/Kconfig.shield | 4 +- .../{cradios.dtsi => cradio/cradio.dtsi} | 4 -- .../{cradios.keymap => cradio/cradio.keymap} | 0 .../cradio_left.conf} | 0 .../cradio_left.overlay} | 8 +-- .../cradio_right.conf} | 0 .../cradio_right.overlay} | 5 +- .../{cradios => cradio}/default.keymap | 0 app/boards/shields/cradios/cradios.dtsi | 67 ------------------ app/boards/shields/cradios/cradios.keymap | 18 ----- app/boards/shields/cradios_left.conf | 2 - app/boards/shields/cradios_left.overlay | 15 ---- app/boards/shields/cradios_right.conf | 2 - app/boards/shields/cradios_right.overlay | 17 ----- 19 files changed, 6 insertions(+), 141 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/boards/.DS_Store create mode 100644 app/boards/shields/.DS_Store rename app/boards/shields/{cradios => cradio}/Kconfig.defconfig (92%) rename app/boards/shields/{cradios => cradio}/Kconfig.shield (50%) rename app/boards/shields/{cradios.dtsi => cradio/cradio.dtsi} (99%) rename app/boards/shields/{cradios.keymap => cradio/cradio.keymap} (100%) rename app/boards/shields/{cradios/cradios_left.conf => cradio/cradio_left.conf} (100%) rename app/boards/shields/{cradios/cradios_left.overlay => cradio/cradio_left.overlay} (81%) rename app/boards/shields/{cradios/cradios_right.conf => cradio/cradio_right.conf} (100%) rename app/boards/shields/{cradios/cradios_right.overlay => cradio/cradio_right.overlay} (86%) rename app/boards/shields/{cradios => cradio}/default.keymap (100%) delete mode 100644 app/boards/shields/cradios/cradios.dtsi delete mode 100644 app/boards/shields/cradios/cradios.keymap delete mode 100644 app/boards/shields/cradios_left.conf delete mode 100644 app/boards/shields/cradios_left.overlay delete mode 100644 app/boards/shields/cradios_right.conf delete mode 100644 app/boards/shields/cradios_right.overlay diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6b508f3d3ac3d8e154cb8b9356cbeda358ea05b0 GIT binary patch literal 8196 zcmeHMTWl3Y82Y%Mi6DcsKM4J8t2@<}4agPTcNPKrjKq%t>nhl&t^ z5P=YZ5P=YZ5P|;#0(55cBCT-l3v1Yh2!sgSmI(0oLyRhyi9pT@>AyOt@vi_R`4zw~ z)MvayG8V{0AZLXn3l$WhBt<9&R}2*4q>lxDi9pT@DZ&AR%LfKCV{k)3e|CC)%y$P& z2pP5^0wDr7BEWw>d7wcCGO5Yy@9&oBdhz(z7|F|DwR(*t%aXiKKG`$oO!j!1mvdXR z>~TIirg>wjpx^5_)#G&gP7x@nL0O`5tlHcUv_ zo_X3dva(zhY3#MNabxbzl2WFYshj4bgzsXk#LA_?T*^F?GrhB74mGw#me^Y-bXrcA zqw^=~zC~4I+a>8Z*SBU3YK2-+D|S(U*6Y%$gJo9TBg@R~eUP?OgerUQm1L&(Sz5}l z0#*HfQXLtX5NHO&5fs614T!FXYJ@^Q&!N>3! zd;#CVkMJ}63ctbc@CW>b63VDx0jjta%W)gVaX&U-BQ{|R9>Js7h27YTCvgOmsNpDP z@C;_r!}ItkK8BCullVNojIZFU_!_>6@8G+572n4X@N@hU=fwIV^JMJ`)*A@?o;tyg zk;oc+OpA=%jI7c2`<0IWhOFNfaE2DG-%z}9bNS9aHFXD?7dCO(zFkitpEZIOK3(SN z;BVei4$^L`Wy+>#AF;}qTI8_c^gP4a8qObyb3?r=x+Tgual~+2bVrm$h}&XV5#6n@ zJYufwJ69?3C|gA&71q5{C6hIa&(6x$^V>tm*6s7 zg%9CV;@ns81N;QPz@Nl784Iz5*j9#7+>Cc)1@6L1+=KhDo|xB&2e2IvVFw;2_Vr>v z4&V?DV;T)Sjbmu~+{@u4PT|9N0Usd-K7r5TbHu_Ih=rH%^<|vvT*kR8i=3P2$=a4< zkCJAdp-Y{^(Jh5Qp2((@-~ZcJ{{DYUuGBt-AZqLe%FpsJw=rl z?l&u>A3}|P9Vh8u$4M^yVMzTLx$>AqAZLXn4V8cWLqMq-p8r1b0{-y)Uj*ZJ>irGE Cjn>8h literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7b9df9785ffe429ff6989ceea0ab40fc7af0588f GIT binary patch literal 8196 zcmeHMTTC2P82kW${VP;L1B7USCx=2$tOhe2hhMt%sQ!rX(v`$2ZA61 zK?H&b1Q7@#5Jcer5CJ-~SrOJa_qjG`g9ro>xFsXN-VYI~3}Zena`avu)OaZXAxidaiU&o;{%NihhcL+@16hW=bQODCmt&ei6?c zFvc-xg9ro>SRDcO_!K|_Y)~PclfQqINSTJ?Mx$S1C@+6q!FoXy1#zQzvVY2+?RQl- zP{v6{(xlhTvq1i>*^b;BX#u+3)PYN+S>X9)scp1!@`0nlbB(>4%fHnVGhnxLll6&1A+@UA@&b`;BwDGvexVF6)gscG_+C4CAt#arFCivNLA% z4zhMe47wdNlTo}}xFx)!a&NT0>2Sx=#@mWyN!na8JYzUU!qi7qC#hSSVNDLs8k##b zM)9&-Q`0B?u>&ygjW`%f*sXwTB$k0f%PoPqXGOQIws5`)O0TtF-@aL6o&Y zQ%&fmFKRqUqGQ7|Jet0+F1Uv~(!9{otuE3k{4txOD z;6wNXK7()Id-xH4hF{=U_znI*0Y#Ls5Ea~k6}S_lco3Vg8C$Rok6{n?Vjm9RNu0nq zsyK-$JcDU;@jO0^kKm*DI6jLn;!F54zJjmgTlh9!#dq;N{1iXOB|g7Uma@J6e0{)g zsk7q2B+B|9) zN17}tye(YGMA~zuT-q8QByQ<**O|Lod!xXiVUQd3wiAl7nii*#6$fjwN zpSDcfnk0Fatt(xEtD7t8`-Y)c4xVE zgz71(tT4Mpj-CrOUOG Hi#2}&7R=yI literal 0 HcmV?d00001 diff --git a/app/boards/.DS_Store b/app/boards/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f1a7fabe09abafc68e9bade17e3a66f1e4d09db5 GIT binary patch literal 8196 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 - }; kscan0: kscan { @@ -37,11 +36,8 @@ RC(0,15) RC(0,16) RC(0,33) RC(0,32) compatible = "zmk,bt-unpair-combo"; }; - - }; - &kscan0 { input-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> diff --git a/app/boards/shields/cradios.keymap b/app/boards/shields/cradio/cradio.keymap similarity index 100% rename from app/boards/shields/cradios.keymap rename to app/boards/shields/cradio/cradio.keymap diff --git a/app/boards/shields/cradios/cradios_left.conf b/app/boards/shields/cradio/cradio_left.conf similarity index 100% rename from app/boards/shields/cradios/cradios_left.conf rename to app/boards/shields/cradio/cradio_left.conf diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradio/cradio_left.overlay similarity index 81% rename from app/boards/shields/cradios/cradios_left.overlay rename to app/boards/shields/cradio/cradio_left.overlay index b0bdc6fe..c6600724 100644 --- a/app/boards/shields/cradios/cradios_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -3,13 +3,9 @@ * * SPDX-License-Identifier: MIT */ -#include "cradios.dtsi" - - - - - +#include "cradio.dtsi" &bt_unpair_combo { + key-positions = <0 16>; }; diff --git a/app/boards/shields/cradios/cradios_right.conf b/app/boards/shields/cradio/cradio_right.conf similarity index 100% rename from app/boards/shields/cradios/cradios_right.conf rename to app/boards/shields/cradio/cradio_right.conf diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradio/cradio_right.overlay similarity index 86% rename from app/boards/shields/cradios/cradios_right.overlay rename to app/boards/shields/cradio/cradio_right.overlay index ef920ac3..3469199b 100644 --- a/app/boards/shields/cradios/cradios_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -3,15 +3,12 @@ * * SPDX-License-Identifier: MIT */ -#include "cradios.dtsi" +#include "cradio.dtsi" &default_transform { col-offset = <17>; }; - - - &bt_unpair_combo { key-positions = <21 32>; }; diff --git a/app/boards/shields/cradios/default.keymap b/app/boards/shields/cradio/default.keymap similarity index 100% rename from app/boards/shields/cradios/default.keymap rename to app/boards/shields/cradio/default.keymap diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi deleted file mode 100644 index 68d1fc57..00000000 --- a/app/boards/shields/cradios/cradios.dtsi +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ - #include - -/ { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <34>; - rows = <1>; - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) -RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) -RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) -RC(0,15) RC(0,16) RC(0,33) RC(0,32) ->; - - - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-direct"; - label = "KSCAN"; - }; - - - - - bt_unpair_combo: bt_unpair_combo { - compatible = "zmk,bt-unpair-combo"; - }; - - - - }; - - - &kscan0 { - input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_a 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> - ; -}; - - diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap deleted file mode 100644 index c46468dd..00000000 --- a/app/boards/shields/cradios/cradios.keymap +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include - - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 - >; - }; - }; -}; diff --git a/app/boards/shields/cradios_left.conf b/app/boards/shields/cradios_left.conf deleted file mode 100644 index 1e028a78..00000000 --- a/app/boards/shields/cradios_left.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/cradios_left.overlay b/app/boards/shields/cradios_left.overlay deleted file mode 100644 index b0bdc6fe..00000000 --- a/app/boards/shields/cradios_left.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ -#include "cradios.dtsi" - - - - - - -&bt_unpair_combo { - key-positions = <0 16>; -}; diff --git a/app/boards/shields/cradios_right.conf b/app/boards/shields/cradios_right.conf deleted file mode 100644 index 990cf7c0..00000000 --- a/app/boards/shields/cradios_right.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/cradios_right.overlay b/app/boards/shields/cradios_right.overlay deleted file mode 100644 index ef920ac3..00000000 --- a/app/boards/shields/cradios_right.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ -#include "cradios.dtsi" - -&default_transform { - col-offset = <17>; -}; - - - - -&bt_unpair_combo { - key-positions = <21 32>; -}; From 85af75c7f6ac736d2756095853327131732bd496 Mon Sep 17 00:00:00 2001 From: David Barr Date: Wed, 30 Sep 2020 17:10:29 +0100 Subject: [PATCH 07/24] remove .ds_store junk --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e02cca0e..eb4312fd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tools /zephyr /build +**/.DS_Store From 17bee0223aa90037896d3a83d08fe01db1cab97b Mon Sep 17 00:00:00 2001 From: David Barr Date: Wed, 30 Sep 2020 17:12:39 +0100 Subject: [PATCH 08/24] remove ds_store files --- .DS_Store | Bin 8196 -> 0 bytes app/.DS_Store | Bin 8196 -> 0 bytes app/boards/.DS_Store | Bin 8196 -> 0 bytes app/boards/shields/.DS_Store | Bin 8196 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 app/.DS_Store delete mode 100644 app/boards/.DS_Store delete mode 100644 app/boards/shields/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6b508f3d3ac3d8e154cb8b9356cbeda358ea05b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTWl3Y82Y%Mi6DcsKM4J8t2@<}4agPTcNPKrjKq%t>nhl&t^ z5P=YZ5P=YZ5P|;#0(55cBCT-l3v1Yh2!sgSmI(0oLyRhyi9pT@>AyOt@vi_R`4zw~ z)MvayG8V{0AZLXn3l$WhBt<9&R}2*4q>lxDi9pT@DZ&AR%LfKCV{k)3e|CC)%y$P& z2pP5^0wDr7BEWw>d7wcCGO5Yy@9&oBdhz(z7|F|DwR(*t%aXiKKG`$oO!j!1mvdXR z>~TIirg>wjpx^5_)#G&gP7x@nL0O`5tlHcUv_ zo_X3dva(zhY3#MNabxbzl2WFYshj4bgzsXk#LA_?T*^F?GrhB74mGw#me^Y-bXrcA zqw^=~zC~4I+a>8Z*SBU3YK2-+D|S(U*6Y%$gJo9TBg@R~eUP?OgerUQm1L&(Sz5}l z0#*HfQXLtX5NHO&5fs614T!FXYJ@^Q&!N>3! zd;#CVkMJ}63ctbc@CW>b63VDx0jjta%W)gVaX&U-BQ{|R9>Js7h27YTCvgOmsNpDP z@C;_r!}ItkK8BCullVNojIZFU_!_>6@8G+572n4X@N@hU=fwIV^JMJ`)*A@?o;tyg zk;oc+OpA=%jI7c2`<0IWhOFNfaE2DG-%z}9bNS9aHFXD?7dCO(zFkitpEZIOK3(SN z;BVei4$^L`Wy+>#AF;}qTI8_c^gP4a8qObyb3?r=x+Tgual~+2bVrm$h}&XV5#6n@ zJYufwJ69?3C|gA&71q5{C6hIa&(6x$^V>tm*6s7 zg%9CV;@ns81N;QPz@Nl784Iz5*j9#7+>Cc)1@6L1+=KhDo|xB&2e2IvVFw;2_Vr>v z4&V?DV;T)Sjbmu~+{@u4PT|9N0Usd-K7r5TbHu_Ih=rH%^<|vvT*kR8i=3P2$=a4< zkCJAdp-Y{^(Jh5Qp2((@-~ZcJ{{DYUuGBt-AZqLe%FpsJw=rl z?l&u>A3}|P9Vh8u$4M^yVMzTLx$>AqAZLXn4V8cWLqMq-p8r1b0{-y)Uj*ZJ>irGE Cjn>8h diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index 7b9df9785ffe429ff6989ceea0ab40fc7af0588f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTTC2P82kW${VP;L1B7USCx=2$tOhe2hhMt%sQ!rX(v`$2ZA61 zK?H&b1Q7@#5Jcer5CJ-~SrOJa_qjG`g9ro>xFsXN-VYI~3}Zena`avu)OaZXAxidaiU&o;{%NihhcL+@16hW=bQODCmt&ei6?c zFvc-xg9ro>SRDcO_!K|_Y)~PclfQqINSTJ?Mx$S1C@+6q!FoXy1#zQzvVY2+?RQl- zP{v6{(xlhTvq1i>*^b;BX#u+3)PYN+S>X9)scp1!@`0nlbB(>4%fHnVGhnxLll6&1A+@UA@&b`;BwDGvexVF6)gscG_+C4CAt#arFCivNLA% z4zhMe47wdNlTo}}xFx)!a&NT0>2Sx=#@mWyN!na8JYzUU!qi7qC#hSSVNDLs8k##b zM)9&-Q`0B?u>&ygjW`%f*sXwTB$k0f%PoPqXGOQIws5`)O0TtF-@aL6o&Y zQ%&fmFKRqUqGQ7|Jet0+F1Uv~(!9{otuE3k{4txOD z;6wNXK7()Id-xH4hF{=U_znI*0Y#Ls5Ea~k6}S_lco3Vg8C$Rok6{n?Vjm9RNu0nq zsyK-$JcDU;@jO0^kKm*DI6jLn;!F54zJjmgTlh9!#dq;N{1iXOB|g7Uma@J6e0{)g zsk7q2B+B|9) zN17}tye(YGMA~zuT-q8QByQ<**O|Lod!xXiVUQd3wiAl7nii*#6$fjwN zpSDcfnk0Fatt(xEtD7t8`-Y)c4xVE zgz71(tT4Mpj-CrOUOG Hi#2}&7R=yI diff --git a/app/boards/.DS_Store b/app/boards/.DS_Store deleted file mode 100644 index f1a7fabe09abafc68e9bade17e3a66f1e4d09db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 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 yl$4PR7s5pJN8vcj**^@qo{DwpSWZdF8czTEhXC Date: Fri, 2 Oct 2020 14:16:59 +0100 Subject: [PATCH 09/24] updates as per PR changes (i hope) --- app/boards/shields/cradio/Kconfig.defconfig | 7 +++--- app/boards/shields/cradio/Kconfig.shield | 2 +- app/boards/shields/cradio/cradio.dtsi | 23 ++++++++----------- app/boards/shields/cradio/cradio_left.conf | 3 +++ app/boards/shields/cradio/cradio_left.overlay | 7 +----- app/boards/shields/cradio/cradio_right.conf | 3 +++ .../shields/cradio/cradio_right.overlay | 3 ++- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig index ab38e258..46799b9e 100644 --- a/app/boards/shields/cradio/Kconfig.defconfig +++ b/app/boards/shields/cradio/Kconfig.defconfig @@ -1,10 +1,9 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + config ZMK_KEYBOARD_NAME default "cradio" -# Unable to use interrupts as the same pin number is used -# across A & B controllers, and STM32F303CCT6 can't enable -# interrutps for multiple controllers for the same "line" -# for the external interrupts. config ZMK_KSCAN_GPIO_POLLING default y diff --git a/app/boards/shields/cradio/Kconfig.shield b/app/boards/shields/cradio/Kconfig.shield index 0385d23e..71a439e0 100644 --- a/app/boards/shields/cradio/Kconfig.shield +++ b/app/boards/shields/cradio/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Pete Johanson +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_CRADIO diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index 19225f90..582f58a4 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -1,8 +1,9 @@ /* * Copyright (c) 2020 Pete Johanson * - * SPDX-License-Identifier: MIT + * Copyright (c) 2020 The ZMK Contributors */ + #include / { @@ -16,31 +17,27 @@ columns = <34>; rows = <1>; map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) -RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) -RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) -RC(0,15) RC(0,16) RC(0,33) RC(0,32) ->; + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) + RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) + RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) + RC(0,15) RC(0,16) RC(0,33) RC(0,32) + >; - }; - kscan0: kscan { compatible = "zmk,kscan-gpio-direct"; label = "KSCAN"; }; - - - bt_unpair_combo: bt_unpair_combo { compatible = "zmk,bt-unpair-combo"; }; - }; + }; + }; &kscan0 { input-gpios - = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> + = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> diff --git a/app/boards/shields/cradio/cradio_left.conf b/app/boards/shields/cradio/cradio_left.conf index 1e028a78..405f04db 100644 --- a/app/boards/shields/cradio/cradio_left.conf +++ b/app/boards/shields/cradio/cradio_left.conf @@ -1,2 +1,5 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay index c6600724..6caf8e3d 100644 --- a/app/boards/shields/cradio/cradio_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -1,11 +1,6 @@ /* * Copyright (c) 2020 Pete Johanson * - * SPDX-License-Identifier: MIT + * Copyright (c) 2020 The ZMK Contributors */ -#include "cradio.dtsi" -&bt_unpair_combo { - - key-positions = <0 16>; -}; diff --git a/app/boards/shields/cradio/cradio_right.conf b/app/boards/shields/cradio/cradio_right.conf index 990cf7c0..bd2c93bf 100644 --- a/app/boards/shields/cradio/cradio_right.conf +++ b/app/boards/shields/cradio/cradio_right.conf @@ -1,2 +1,5 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay index 3469199b..09efc53b 100644 --- a/app/boards/shields/cradio/cradio_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -1,8 +1,9 @@ /* * Copyright (c) 2020 Pete Johanson * - * SPDX-License-Identifier: MIT + * Copyright (c) 2020 The ZMK Contributors */ + #include "cradio.dtsi" &default_transform { From 260044ae5e8dfc531ed98d08d0a3c9b9328e2ffe Mon Sep 17 00:00:00 2001 From: David Barr Date: Fri, 2 Oct 2020 14:17:35 +0100 Subject: [PATCH 10/24] Delete default.keymap --- app/boards/shields/cradio/default.keymap | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 app/boards/shields/cradio/default.keymap diff --git a/app/boards/shields/cradio/default.keymap b/app/boards/shields/cradio/default.keymap deleted file mode 100644 index 08210052..00000000 --- a/app/boards/shields/cradio/default.keymap +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include - - -/ { - keymap0: keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp DEL &kp RET &kp RET &kp SPC - - >; - }; - }; -}; From d5d8d79a76a9fbe65981d4f5455097e5258d1564 Mon Sep 17 00:00:00 2001 From: David Barr Date: Wed, 7 Oct 2020 16:23:59 +0100 Subject: [PATCH 11/24] Update cradio_right.overlay --- app/boards/shields/cradio/cradio_right.overlay | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay index 09efc53b..232d7d43 100644 --- a/app/boards/shields/cradio/cradio_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -9,7 +9,3 @@ &default_transform { col-offset = <17>; }; - -&bt_unpair_combo { - key-positions = <21 32>; -}; From 426b25892f2fd6c569b9d0b983fd7fbaff6c9d93 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:09:35 +0100 Subject: [PATCH 12/24] rename gpio to direct polling --- app/boards/shields/cradio/Kconfig.defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig index 46799b9e..43509a47 100644 --- a/app/boards/shields/cradio/Kconfig.defconfig +++ b/app/boards/shields/cradio/Kconfig.defconfig @@ -4,7 +4,7 @@ config ZMK_KEYBOARD_NAME default "cradio" -config ZMK_KSCAN_GPIO_POLLING +config ZMK_KSCAN_DIRECT_POLLING default y From 7d582b6b8e16cf64cadf27dacba050dfb88d543a Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:11:01 +0100 Subject: [PATCH 13/24] remove dupe copyright --- app/boards/shields/cradio/cradio_left.overlay | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay index 6caf8e3d..61fc3bd7 100644 --- a/app/boards/shields/cradio/cradio_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -1,6 +1,4 @@ /* - * Copyright (c) 2020 Pete Johanson - * * Copyright (c) 2020 The ZMK Contributors */ From 95b94009a9b3b9b953220ab48f0276fc5a083499 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:11:40 +0100 Subject: [PATCH 14/24] remove dupe copyright --- app/boards/shields/cradio/cradio_right.overlay | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay index 232d7d43..1c06006f 100644 --- a/app/boards/shields/cradio/cradio_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -1,6 +1,4 @@ /* - * Copyright (c) 2020 Pete Johanson - * * Copyright (c) 2020 The ZMK Contributors */ From 24e73f68610a9a4a1497c6e7737b615d6181836b Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:12:04 +0100 Subject: [PATCH 15/24] Update cradio.dtsi --- app/boards/shields/cradio/cradio.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index 582f58a4..d32d2ed3 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -1,6 +1,4 @@ /* - * Copyright (c) 2020 Pete Johanson - * * Copyright (c) 2020 The ZMK Contributors */ From a3cdab9e9f9940a854ec68e60622443ae376183e Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:14:46 +0100 Subject: [PATCH 16/24] update header --- app/boards/shields/cradio/cradio.keymap | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/boards/shields/cradio/cradio.keymap b/app/boards/shields/cradio/cradio.keymap index c46468dd..1d11cfd6 100644 --- a/app/boards/shields/cradio/cradio.keymap +++ b/app/boards/shields/cradio/cradio.keymap @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include #include From 55c1f51b3147490d994d846907e9fd99039e4e8b Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:16:08 +0100 Subject: [PATCH 17/24] update header --- app/boards/shields/cradio/cradio_right.overlay | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay index 1c06006f..fea59c23 100644 --- a/app/boards/shields/cradio/cradio_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -1,5 +1,7 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT */ #include "cradio.dtsi" From eeac54e9a4f24e5a455cbc52ba0930a10d2bcfc9 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:16:28 +0100 Subject: [PATCH 18/24] Update cradio_left.overlay --- app/boards/shields/cradio/cradio_left.overlay | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay index 61fc3bd7..cac95757 100644 --- a/app/boards/shields/cradio/cradio_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -1,4 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT */ - From a629aa0b42caf6a86152ef5eedc6160b90200627 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:17:53 +0100 Subject: [PATCH 19/24] Update Kconfig.defconfig --- app/boards/shields/cradio/Kconfig.defconfig | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig index 43509a47..1043c7e9 100644 --- a/app/boards/shields/cradio/Kconfig.defconfig +++ b/app/boards/shields/cradio/Kconfig.defconfig @@ -1,8 +1,20 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT +if SHIELD_CRADIO_LEFT + config ZMK_KEYBOARD_NAME - default "cradio" + default "Cradio Left" + +endif + + +if SHIELD_CRADIO_RIGHT + +config ZMK_KEYBOARD_NAME + default "Cradio Right" + +endif config ZMK_KSCAN_DIRECT_POLLING default y From ad77df59897ae973824377373665a4fdc6542d3c Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:20:22 +0100 Subject: [PATCH 20/24] capital C --- app/boards/shields/cradio/Kconfig.defconfig | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig index 1043c7e9..5f8bb80d 100644 --- a/app/boards/shields/cradio/Kconfig.defconfig +++ b/app/boards/shields/cradio/Kconfig.defconfig @@ -1,20 +1,8 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -if SHIELD_CRADIO_LEFT - config ZMK_KEYBOARD_NAME - default "Cradio Left" - -endif - - -if SHIELD_CRADIO_RIGHT - -config ZMK_KEYBOARD_NAME - default "Cradio Right" - -endif + default "Cradio" config ZMK_KSCAN_DIRECT_POLLING default y From 2b09174ec1a171e043018cbe28e47d86025ce1de Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 8 Oct 2020 11:22:34 +0100 Subject: [PATCH 21/24] update header again based on corne --- app/boards/shields/cradio/cradio.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index d32d2ed3..ab22e929 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -1,5 +1,7 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT */ #include From 01b0bad7a246ac9aef7aa170895dab5ae4790525 Mon Sep 17 00:00:00 2001 From: David Barr Date: Fri, 9 Oct 2020 17:05:09 +0100 Subject: [PATCH 22/24] update headers, spruce up keymap, streamline dtsi. --- app/boards/shields/cradio/Kconfig.defconfig | 2 +- app/boards/shields/cradio/cradio.dtsi | 23 +++++--------- app/boards/shields/cradio/cradio.keymap | 30 +++++++++++++++---- app/boards/shields/cradio/cradio_left.overlay | 4 ++- .../shields/cradio/cradio_right.overlay | 2 +- 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig index 5f8bb80d..43509a47 100644 --- a/app/boards/shields/cradio/Kconfig.defconfig +++ b/app/boards/shields/cradio/Kconfig.defconfig @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT config ZMK_KEYBOARD_NAME - default "Cradio" + default "cradio" config ZMK_KSCAN_DIRECT_POLLING default y diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index ab22e929..1f2603c2 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -9,9 +9,9 @@ / { chosen { zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; + //zmk,matrix_transform = &default_transform; }; - + default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; columns = <34>; @@ -19,23 +19,13 @@ map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) - RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) + RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) RC(0,15) RC(0,16) RC(0,33) RC(0,32) >; kscan0: kscan { compatible = "zmk,kscan-gpio-direct"; label = "KSCAN"; - }; - - bt_unpair_combo: bt_unpair_combo { - compatible = "zmk,bt-unpair-combo"; - }; - - }; - }; - - &kscan0 { input-gpios = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> @@ -55,6 +45,7 @@ , <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> ; -}; - - + }; + }; + }; + diff --git a/app/boards/shields/cradio/cradio.keymap b/app/boards/shields/cradio/cradio.keymap index 1d11cfd6..487f6dcf 100644 --- a/app/boards/shields/cradio/cradio.keymap +++ b/app/boards/shields/cradio/cradio.keymap @@ -3,23 +3,41 @@ * * SPDX-License-Identifier: MIT */ - - + #include #include +#include / { keymap { compatible = "zmk,keymap"; - - default_layer { + + default_layer { bindings = < &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH - &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 - >; + &mo 1 &kp LCTL &kp SPC &mo 2 + >; }; + upper_layer { + bindings = < + &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 + &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp H &kp J &kp K &kp L &kp SCLN + &kp LSFT &trans &trans &trans &trans &trans &trans &trans &trans &trans + &mo 1 &kp LCTL &kp SPC &mo 2 + >; + }; + + lower_layer { + bindings = < + &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN + &trans &trans &trans &trans &trans &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp PIPE + &trans &trans &trans &trans &trans &trans &trans &trans &kp BSLH &kp TILD + &mo 1 &kp LCTL &kp SPC &mo 2 + >; + }; + }; }; diff --git a/app/boards/shields/cradio/cradio_left.overlay b/app/boards/shields/cradio/cradio_left.overlay index cac95757..6a3704a7 100644 --- a/app/boards/shields/cradio/cradio_left.overlay +++ b/app/boards/shields/cradio/cradio_left.overlay @@ -1,5 +1,7 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ + +#include "cradio.dtsi" diff --git a/app/boards/shields/cradio/cradio_right.overlay b/app/boards/shields/cradio/cradio_right.overlay index fea59c23..01aa1ab6 100644 --- a/app/boards/shields/cradio/cradio_right.overlay +++ b/app/boards/shields/cradio/cradio_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 59e8c58051298175bc1c77593f1b24d9394aa848 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 13 Oct 2020 00:11:08 -0400 Subject: [PATCH 23/24] fix: Copyright header for cradio.dtsi --- app/boards/shields/cradio/cradio.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi index 1f2603c2..43f90493 100644 --- a/app/boards/shields/cradio/cradio.dtsi +++ b/app/boards/shields/cradio/cradio.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -48,4 +48,3 @@ }; }; }; - From f7912eb9decc2048c204818defc717a71135edc6 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Thu, 15 Oct 2020 17:08:25 -0400 Subject: [PATCH 24/24] fix: Remove conflicting gitignore entry. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index eb4312fd..e02cca0e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ /tools /zephyr /build -**/.DS_Store