summaryrefslogtreecommitdiff
path: root/keyboards/treasure
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/treasure')
-rw-r--r--keyboards/treasure/type9/config.h17
-rw-r--r--keyboards/treasure/type9/info.json5
-rw-r--r--keyboards/treasure/type9/type9.c16
-rw-r--r--keyboards/treasure/type9s2/config.h25
-rw-r--r--keyboards/treasure/type9s2/info.json5
-rw-r--r--keyboards/treasure/type9s2/type9s2.c16
6 files changed, 10 insertions, 74 deletions
diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index 35b03eebfb..d876570c80 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -17,23 +17,6 @@ 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 { E6, D7, C6 }
-#define MATRIX_COL_PINS { D1, D0, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json
index c2ed86346f..95cb977fb0 100644
--- a/keyboards/treasure/type9/info.json
+++ b/keyboards/treasure/type9/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4"],
+ "rows": ["E6", "D7", "C6"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B5",
"levels": 10
diff --git a/keyboards/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c
deleted file mode 100644
index 466f294672..0000000000
--- a/keyboards/treasure/type9/type9.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * 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/>.
- */
-#include "type9.h"
diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h
deleted file mode 100644
index f4e04317ce..0000000000
--- a/keyboards/treasure/type9s2/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Treasure
-
-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*/
-#define MATRIX_ROW_PINS { B4, B5, D2 }
-#define MATRIX_COL_PINS { B2, B3, C5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json
index bcb719c76f..56b6272ccf 100644
--- a/keyboards/treasure/type9s2/info.json
+++ b/keyboards/treasure/type9s2/info.json
@@ -8,6 +8,11 @@
"pid": "0x5492",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "C5"],
+ "rows": ["B4", "B5", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/treasure/type9s2/type9s2.c b/keyboards/treasure/type9s2/type9s2.c
deleted file mode 100644
index f5c86e0006..0000000000
--- a/keyboards/treasure/type9s2/type9s2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Treasure
- *
- * 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/>.
- */
-#include "type9s2.h"