summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/mechlovin9
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:39:56 +1100
committerGitHub <noreply@github.com>2023-03-11 00:39:56 +1100
commitcaa8c81086a806ea048c91ba142d424dc6a49f50 (patch)
tree824de64449d9cfaeba176288d379a282c733ae1a /keyboards/mechlovin/mechlovin9
parentace372d90de13dafc815df5d8049497cb351b69b (diff)
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/mechlovin/mechlovin9')
-rw-r--r--keyboards/mechlovin/mechlovin9/config.h21
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/config.h13
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/info.json5
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/config.h31
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/info.json5
5 files changed, 10 insertions, 65 deletions
diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h
deleted file mode 100644
index 94a281c2f8..0000000000
--- a/keyboards/mechlovin/mechlovin9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
-Copyright 2021 Mechlovin' Studio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h
index c5e997d425..3686536dfb 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev1/config.h
@@ -17,18 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index 66b4a3c2ed..14fd177986 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -4,6 +4,11 @@
"pid": "0x6509",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B8",
"breathing": true
diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h
deleted file mode 100644
index f550a2e39a..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 }
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index c0e94e7638..52ac4d0c29 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,11 @@
"pid": "0x6509",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"],
+ "rows": ["A0", "A1", "A2", "A3", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4",
"breathing": true