From a734d58ffe6147be5e426b8c758da3b2237df7a0 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Tue, 21 Jul 2020 14:01:15 -0400
Subject: [PATCH] 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(-)

diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi
index f96adf0f..87d78020 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 3b3df8c8..29f648d7 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 b919bb2a..8163c95e 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";
+};