From 7f7c7037b04c78d8a3b74557197e0a2996eb980e Mon Sep 17 00:00:00 2001 From: Noah Thornton Date: Sat, 26 Sep 2020 11:59:12 -0700 Subject: Add quefrency shield --- .../shields/quefrency/quefrency_left.overlay | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app/boards/shields/quefrency/quefrency_left.overlay (limited to 'app/boards/shields/quefrency/quefrency_left.overlay') diff --git a/app/boards/shields/quefrency/quefrency_left.overlay b/app/boards/shields/quefrency/quefrency_left.overlay new file mode 100644 index 0000000..a62ac8f --- /dev/null +++ b/app/boards/shields/quefrency/quefrency_left.overlay @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2020 Noah Thornton + * + * SPDX-License-Identifier: MIT + */ + +#include "quefrency.dtsi" + +/ { + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "col2row"; + + + col-gpios + = <&pro_micro_a 2 GPIO_ACTIVE_HIGH> + , <&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> + ; + + row-gpios + = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; +}; -- cgit v1.3.1 From 24b638dfa37211fc5f0c09844d38760bae5eda5f Mon Sep 17 00:00:00 2001 From: Noah Thornton Date: Sat, 26 Sep 2020 21:09:19 -0500 Subject: Apply suggestions from code review Revise copyright header Co-authored-by: Pete Johanson --- app/boards/shields/quefrency/Kconfig.defconfig | 2 +- app/boards/shields/quefrency/Kconfig.shield | 2 +- app/boards/shields/quefrency/quefrency.dtsi | 3 +-- app/boards/shields/quefrency/quefrency.keymap | 2 +- app/boards/shields/quefrency/quefrency_left.overlay | 2 +- app/boards/shields/quefrency/quefrency_right.overlay | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'app/boards/shields/quefrency/quefrency_left.overlay') diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig index c383340..2b00cb6 100644 --- a/app/boards/shields/quefrency/Kconfig.defconfig +++ b/app/boards/shields/quefrency/Kconfig.defconfig @@ -1,4 +1,4 @@ -#Copyright (c) 2020 Noah Thornton +#Copyright (c) 2020 The ZMK Contributors #SPDX-License-Identifier: MIT diff --git a/app/boards/shields/quefrency/Kconfig.shield b/app/boards/shields/quefrency/Kconfig.shield index d56a1b2..d205e58 100644 --- a/app/boards/shields/quefrency/Kconfig.shield +++ b/app/boards/shields/quefrency/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Noah Thornton +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_QUEFRENCY_LEFT diff --git a/app/boards/shields/quefrency/quefrency.dtsi b/app/boards/shields/quefrency/quefrency.dtsi index 76f9b2e..74ddc33 100644 --- a/app/boards/shields/quefrency/quefrency.dtsi +++ b/app/boards/shields/quefrency/quefrency.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Noah Thornton + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -26,4 +26,3 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,4) RC(4,6) /**/ RC(4,7) >; }; }; - diff --git a/app/boards/shields/quefrency/quefrency.keymap b/app/boards/shields/quefrency/quefrency.keymap index 1eb7caa..21c5ed4 100644 --- a/app/boards/shields/quefrency/quefrency.keymap +++ b/app/boards/shields/quefrency/quefrency.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Noah Thornton + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/quefrency/quefrency_left.overlay b/app/boards/shields/quefrency/quefrency_left.overlay index a62ac8f..a1d205e 100644 --- a/app/boards/shields/quefrency/quefrency_left.overlay +++ b/app/boards/shields/quefrency/quefrency_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Noah Thornton + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/quefrency/quefrency_right.overlay b/app/boards/shields/quefrency/quefrency_right.overlay index f4037ce..3876144 100644 --- a/app/boards/shields/quefrency/quefrency_right.overlay +++ b/app/boards/shields/quefrency/quefrency_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Noah Thornton + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ -- cgit v1.3.1 From 9afd44b9d4a6790d315f2824ca6d21953804b1af Mon Sep 17 00:00:00 2001 From: Noah Thornton Date: Sat, 26 Sep 2020 22:10:14 -0500 Subject: Provide context on Quefrency physical PCB layouts The Quefrency board has two options for each left and right half, resulting in 4 unique combinations. This has been noted in the overlay and dtsi files. --- app/boards/shields/quefrency/quefrency.dtsi | 4 ++++ app/boards/shields/quefrency/quefrency_left.overlay | 3 +++ app/boards/shields/quefrency/quefrency_right.overlay | 3 +++ 3 files changed, 10 insertions(+) (limited to 'app/boards/shields/quefrency/quefrency_left.overlay') diff --git a/app/boards/shields/quefrency/quefrency.dtsi b/app/boards/shields/quefrency/quefrency.dtsi index 74ddc33..5f1e908 100644 --- a/app/boards/shields/quefrency/quefrency.dtsi +++ b/app/boards/shields/quefrency/quefrency.dtsi @@ -13,6 +13,10 @@ zmk,matrix_transform = &default_transform; }; + /* + * This transform correspondsto the 60% left without macro keypad and 65% right, even this + * combination of PCBs can have keys in different locations based on configuration. + */ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; columns = <15>; diff --git a/app/boards/shields/quefrency/quefrency_left.overlay b/app/boards/shields/quefrency/quefrency_left.overlay index a1d205e..a385cc5 100644 --- a/app/boards/shields/quefrency/quefrency_left.overlay +++ b/app/boards/shields/quefrency/quefrency_left.overlay @@ -7,6 +7,9 @@ #include "quefrency.dtsi" / { + /* This kscan is for the 60% left half without macro keys the + * macro pad layout may require different column and row pins + */ kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; diff --git a/app/boards/shields/quefrency/quefrency_right.overlay b/app/boards/shields/quefrency/quefrency_right.overlay index 3876144..53e0f77 100644 --- a/app/boards/shields/quefrency/quefrency_right.overlay +++ b/app/boards/shields/quefrency/quefrency_right.overlay @@ -12,6 +12,9 @@ / { + /* This kscan is for the 65% right half the 60% right half + * may require different column and row pins + */ kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; -- cgit v1.3.1