From caa8c81086a806ea048c91ba142d424dc6a49f50 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 11 Mar 2023 00:39:56 +1100
Subject: Move matrix config to info.json, part 7 (#20020)

---
 keyboards/mechllama/g35/config.h     | 3 ---
 keyboards/mechllama/g35/v1/config.h  | 3 ---
 keyboards/mechllama/g35/v1/info.json | 7 ++++++-
 keyboards/mechllama/g35/v2/config.h  | 3 ---
 keyboards/mechllama/g35/v2/info.json | 7 ++++++-
 5 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'keyboards/mechllama')

diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h
index e7f24e3985..4eeeb96c19 100644
--- a/keyboards/mechllama/g35/config.h
+++ b/keyboards/mechllama/g35/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F7
 
 #define FORCE_NKRO
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
index fbda4b7db2..1aee08380c 100644
--- a/keyboards/mechllama/g35/v1/config.h
+++ b/keyboards/mechllama/g35/v1/config.h
@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }
-
 #define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json
index 90ac25f360..c5d4c69e7b 100644
--- a/keyboards/mechllama/g35/v1/info.json
+++ b/keyboards/mechllama/g35/v1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"],
+        "rows": ["F5", "F6", "F4", "F1", "D4"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
index cd4d6e991c..7c15560a1a 100644
--- a/keyboards/mechllama/g35/v2/config.h
+++ b/keyboards/mechllama/g35/v2/config.h
@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }
-
 #define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json
index e557e4d307..563625f428 100644
--- a/keyboards/mechllama/g35/v2/info.json
+++ b/keyboards/mechllama/g35/v2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"],
+        "rows": ["F5", "F4", "F1", "F0", "D4"]
+    },
+    "diode_direction": "COL2ROW"
 }
-- 
cgit v1.2.3