summaryrefslogtreecommitdiff
path: root/keyboards/handwired/daishi
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:32:05 +1100
committerGitHub <noreply@github.com>2023-03-11 00:32:05 +1100
commit76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (patch)
treef25535b5a7d7d489b5bb77b5c8c57b24ba78a849 /keyboards/handwired/daishi
parent9e64300e67720a5468c2585391250ca5579b311b (diff)
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/handwired/daishi')
-rw-r--r--keyboards/handwired/daishi/config.h17
-rw-r--r--keyboards/handwired/daishi/info.json5
2 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h
index 1fefa56fc6..2e6498ab5d 100644
--- a/keyboards/handwired/daishi/config.h
+++ b/keyboards/handwired/daishi/config.h
@@ -17,22 +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 { D6, D7, E0, E1, C0, C1, C2 }
-#define MATRIX_COL_PINS { E6, E7, E3, B0, B1, B2, A6, A5, A4, A3, A2, A1, A0, F7, F6, F5, F4, F3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Set delay for tap_code on rotary encoder */
#define TAP_CODE_DELAY 10
diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json
index 27671cc28a..7bd1c6dd8d 100644
--- a/keyboards/handwired/daishi/info.json
+++ b/keyboards/handwired/daishi/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"],
+ "rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F1", "pin_b": "F0", "resolution": 2}