From 7fc28328d04ced9ff419c5cead6f1a971cb94e9d Mon Sep 17 00:00:00 2001
From: innovaker <66737976+innovaker@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:34:04 +0000
Subject: [PATCH] refactor(tg4x): Cleanup tg4x overlay

Tidies pin definitions and map.
---
 app/boards/shields/tg4x/tg4x.overlay | 71 ++++++++++++++--------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/app/boards/shields/tg4x/tg4x.overlay b/app/boards/shields/tg4x/tg4x.overlay
index 4de960a3..38e4faa7 100644
--- a/app/boards/shields/tg4x/tg4x.overlay
+++ b/app/boards/shields/tg4x/tg4x.overlay
@@ -7,50 +7,49 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
-		zmk,kscan = &kscan0;
-        zmk,matrix_transform = &default_transform;
-	};
-
-	default_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <7>;
-        rows = <8>;
-        map = <
-    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,5)
-	RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4)
-	RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4)
-	RC(3,0) RC(3,1) RC(3,2) RC(3,4) RC(3,5) RC(7,1) RC(7,2) RC(7,3) RC(7,4)
-	        >;
-    };
-
 	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
 		label = "KSCAN";
-		diode-direction = "col2row";
 		
-		col-gpios
-			= <&pro_micro_d  1 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_a  0 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_a  1 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_a  2 GPIO_ACTIVE_HIGH>
-			, <&pro_micro_a  3 GPIO_ACTIVE_HIGH>
-			;
+		diode-direction = "col2row";
 
 		row-gpios
-			= <&pro_micro_a  9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_a  8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_d  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_a  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_d  5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_a  6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_d  3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro_d  2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			= <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			;
 
+		col-gpios
+			= <&pro_micro_d 1 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 2 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 3 GPIO_ACTIVE_HIGH>
+			;
 	};
 
-};
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		rows = <8>;
+		columns = <7>;
 
+		map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(5,0) RC(5,1) RC(5,2) RC(5,3)         RC(5,4)
+RC(2,0)         RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(6,0) RC(6,1) RC(6,2)         RC(6,4)
+RC(3,0) RC(3,1) RC(3,2) RC(3,4)                                 RC(3,5) RC(7,1) RC(7,2) RC(7,3) RC(7,4)
+		>;
+	};
+
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+};