summaryrefslogtreecommitdiffstats
path: root/keyboards/fr4
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-10 22:16:56 +1100
committerGitHub <noreply@github.com>2023-03-10 22:16:56 +1100
commitdd086a51d82a574a55eb3b89e8943301d72296f3 (patch)
treedb49e94d90e9f3a8a6cf72a9da0d5549dd2a9bcb /keyboards/fr4
parent80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff)
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/fr4')
-rw-r--r--keyboards/fr4/southpaw75/config.h8
-rw-r--r--keyboards/fr4/southpaw75/info.json5
-rw-r--r--keyboards/fr4/unix60/config.h26
-rw-r--r--keyboards/fr4/unix60/info.json5
4 files changed, 10 insertions, 34 deletions
diff --git a/keyboards/fr4/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h
index 88d4df0941..bbb0ecc339 100644
--- a/keyboards/fr4/southpaw75/config.h
+++ b/keyboards/fr4/southpaw75/config.h
@@ -16,14 +16,6 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B5, F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json
index 466e0edab5..77949825fb 100644
--- a/keyboards/fr4/southpaw75/info.json
+++ b/keyboards/fr4/southpaw75/info.json
@@ -8,6 +8,11 @@
"pid": "0x350C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/fr4/unix60/config.h b/keyboards/fr4/unix60/config.h
deleted file mode 100644
index c661d4b038..0000000000
--- a/keyboards/fr4/unix60/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
- /*
- Copyright 2020 Lasse Küchenmeister
-
- 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
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json
index 2356702b48..8703ebd5e2 100644
--- a/keyboards/fr4/unix60/info.json
+++ b/keyboards/fr4/unix60/info.json
@@ -8,6 +8,11 @@
"pid": "0x5558",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {