summaryrefslogtreecommitdiff
path: root/keyboards/jian
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-06 09:53:52 +1100
committerGitHub <noreply@github.com>2023-03-05 22:53:52 +0000
commit23c365b023e409885e6f201f12df56e5145dde47 (patch)
tree062e72be726939d5f6ddda944facb423bbf386cf /keyboards/jian
parentb34d51d08d7083fc790db2562a4d39890f34886f (diff)
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards/jian')
-rw-r--r--keyboards/jian/handwired/config.h25
-rw-r--r--keyboards/jian/handwired/info.json5
-rw-r--r--keyboards/jian/nsrev2/config.h8
-rw-r--r--keyboards/jian/nsrev2/info.json5
-rw-r--r--keyboards/jian/rev1/config.h7
-rw-r--r--keyboards/jian/rev1/info.json5
-rw-r--r--keyboards/jian/rev2/config.h7
-rw-r--r--keyboards/jian/rev2/info.json5
8 files changed, 20 insertions, 47 deletions
diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h
deleted file mode 100644
index d968a5bf93..0000000000
--- a/keyboards/jian/handwired/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, B5, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json
index 712c3d9b01..bd76da9e96 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.1.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+ "rows": ["D3", "D2", "B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 3e2fa93f31..5eda1a6724 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
#define PHYSICAL_LEDS_ENABLE
/* ws2812 RGB LED */
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 74121b2fda..e51b65c501 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.1.0"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+ "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "C6",
"levels": 5,
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 083b235a2e..a00830b7f7 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index fc65cb13b8..9ca0a41785 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D3", "D2", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 37e8f0458d..92b15fab65 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
//#define EE_HANDS
#define SPLIT_HAND_PIN E6
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 642bf83efc..6cae5556e2 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+ "rows": ["F4", "F5", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "C6",
"levels": 5