summaryrefslogtreecommitdiff
path: root/keyboards/nightly_boards/n60_s
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:34:34 +1100
committerGitHub <noreply@github.com>2023-03-11 00:34:34 +1100
commitace372d90de13dafc815df5d8049497cb351b69b (patch)
tree0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/nightly_boards/n60_s
parent76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff)
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/nightly_boards/n60_s')
-rw-r--r--keyboards/nightly_boards/n60_s/config.h17
-rw-r--r--keyboards/nightly_boards/n60_s/info.json5
2 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 7ec0b48079..0c240b4a47 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/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 { B4, D7, D6, D0, E6, NO_PIN }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Encoders */
#define ENCODERS_CW_KEY { { 1, 5 } }
#define ENCODERS_CCW_KEY { { 0, 5 } }
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 519f31cf28..1ab1fbedf4 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -8,6 +8,11 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
+ "rows": ["B4", "D7", "D6", "D0", "E6", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D5"}