From 893b99d907b85109c8cf8b00f381f36939f5ae3c Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 17 Jul 2020 22:43:19 -0400 Subject: Initial en11 exploration. --- app/boards/shields/kyria/kyria_left.overlay | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index c6305bd..393b9d8 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -6,6 +6,18 @@ #include "kyria.dtsi" +/ { + sensors { + encoder: encoder0 { + compatible = "alps,en11"; + label = "Rotary Encoder"; + a-gpios = <&pro_micro_d 5 GPIO_ACTIVE_HIGH>; + b-gpios = <&pro_micro_d 9 GPIO_ACTIVE_HIGH>; + }; + }; + +}; + &kscan0 { col-gpios = <&pro_micro_a 3 GPIO_ACTIVE_HIGH> -- cgit v1.2.3 From 331bfa70521112759a4b553356a90eee8747644d Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 20 Jul 2020 10:27:44 -0400 Subject: Interrupt fixes. --- app/boards/shields/kyria/kyria_left.overlay | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index 393b9d8..d17548f 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -7,15 +7,12 @@ #include "kyria.dtsi" / { - sensors { encoder: encoder0 { compatible = "alps,en11"; label = "Rotary Encoder"; - a-gpios = <&pro_micro_d 5 GPIO_ACTIVE_HIGH>; - b-gpios = <&pro_micro_d 9 GPIO_ACTIVE_HIGH>; + a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; }; - }; - }; &kscan0 { -- cgit v1.2.3 From 109c69cbab0a417c97b20788b0fd3bcd720178f1 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 20 Jul 2020 20:54:58 -0400 Subject: EN11 is actually EC11, some sample work. --- app/boards/shields/kyria/kyria_left.overlay | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index d17548f..43c9d88 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -8,10 +8,11 @@ / { encoder: encoder0 { - compatible = "alps,en11"; + compatible = "alps,ec11"; label = "Rotary Encoder"; a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; }; }; -- cgit v1.2.3 From f3267e6030822abc594aadd4264508607dc5bb69 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 21 Jul 2020 13:52:03 -0400 Subject: Tweaks for orientation and A/B pins for Kyria left --- app/boards/shields/kyria/kyria_left.overlay | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index 43c9d88..3b3df8c 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -10,8 +10,8 @@ encoder: encoder0 { compatible = "alps,ec11"; label = "Rotary Encoder"; - a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + a-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; resolution = <4>; }; }; -- cgit v1.2.3 From a734d58ffe6147be5e426b8c758da3b2237df7a0 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 21 Jul 2020 14:01:15 -0400 Subject: More consistent DT for the split encoders. --- app/boards/shields/kyria/kyria.dtsi | 19 +++++++++++++++++++ app/boards/shields/kyria/kyria_left.overlay | 13 +++---------- app/boards/shields/kyria/kyria_right.overlay | 4 ++++ 3 files changed, 26 insertions(+), 10 deletions(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi index f96adf0..87d7802 100644 --- a/app/boards/shields/kyria/kyria.dtsi +++ b/app/boards/shields/kyria/kyria.dtsi @@ -10,6 +10,7 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + zmk,encoders = <&left_encoder &right_encoder>; }; default_transform: keymap_transform_0 { @@ -58,6 +59,24 @@ 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) }; + left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + + right_encoder: encoder_right { + compatible = "alps,ec11"; + label = "RIGHT_ENCODER"; + a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + // TODO: Encoder node(s) // TODO: OLED node // TODO: RGB node(s) diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index 3b3df8c..29f648d 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -6,16 +6,6 @@ #include "kyria.dtsi" -/ { - encoder: encoder0 { - compatible = "alps,ec11"; - label = "Rotary Encoder"; - a-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <4>; - }; -}; - &kscan0 { col-gpios = <&pro_micro_a 3 GPIO_ACTIVE_HIGH> @@ -29,3 +19,6 @@ ; }; +&left_encoder { + status = "okay"; +}; \ No newline at end of file diff --git a/app/boards/shields/kyria/kyria_right.overlay b/app/boards/shields/kyria/kyria_right.overlay index b919bb2..8163c95 100644 --- a/app/boards/shields/kyria/kyria_right.overlay +++ b/app/boards/shields/kyria/kyria_right.overlay @@ -23,3 +23,7 @@ ; }; + +&right_encoder { + status = "okay"; +}; -- cgit v1.2.3 From ec74adb3b700572be9b15be2fc297e4c36b8a0bd Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 21 Jul 2020 14:01:48 -0400 Subject: Better chosen name. --- app/boards/shields/kyria/kyria.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi index 87d7802..4efca8e 100644 --- a/app/boards/shields/kyria/kyria.dtsi +++ b/app/boards/shields/kyria/kyria.dtsi @@ -10,7 +10,7 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; - zmk,encoders = <&left_encoder &right_encoder>; + zmk,sensors = <&left_encoder &right_encoder>; }; default_transform: keymap_transform_0 { -- cgit v1.2.3 From b49755b724201de32583e76af77caa6e4c68163b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 21 Jul 2020 14:24:58 -0400 Subject: Skip chosen node for now. --- app/boards/shields/kyria/kyria.dtsi | 1 - 1 file changed, 1 deletion(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi index 4efca8e..59d0c48 100644 --- a/app/boards/shields/kyria/kyria.dtsi +++ b/app/boards/shields/kyria/kyria.dtsi @@ -10,7 +10,6 @@ chosen { zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; - zmk,sensors = <&left_encoder &right_encoder>; }; default_transform: keymap_transform_0 { -- cgit v1.2.3 From 3a508c42d0f408b42e58f119f4f0132a87203ad1 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 21 Jul 2020 14:28:59 -0400 Subject: Trailing newline fix. --- app/boards/shields/kyria/kyria_left.overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/boards/shields/kyria') diff --git a/app/boards/shields/kyria/kyria_left.overlay b/app/boards/shields/kyria/kyria_left.overlay index 29f648d..c8b5be2 100644 --- a/app/boards/shields/kyria/kyria_left.overlay +++ b/app/boards/shields/kyria/kyria_left.overlay @@ -21,4 +21,4 @@ &left_encoder { status = "okay"; -}; \ No newline at end of file +}; -- cgit v1.2.3