summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired/juliet
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/juliet
parent9e64300e67720a5468c2585391250ca5579b311b (diff)
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/handwired/juliet')
-rw-r--r--keyboards/handwired/juliet/config.h20
-rw-r--r--keyboards/handwired/juliet/info.json5
2 files changed, 5 insertions, 20 deletions
diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h
index df5d4248ca..4570cdb18e 100644
--- a/keyboards/handwired/juliet/config.h
+++ b/keyboards/handwired/juliet/config.h
@@ -17,26 +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)
- *
- */
-
-/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
-/* 0 1 2 3 4 5 6 7 8 9 10 11*/
-#define MATRIX_ROW_PINS { F5, D2, D3, F4 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B1, B3, B2, B6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* 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/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json
index 0fc7f4726f..c2acd0ad73 100644
--- a/keyboards/handwired/juliet/info.json
+++ b/keyboards/handwired/juliet/info.json
@@ -8,6 +8,11 @@
"pid": "0x4069",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"],
+ "rows": ["F5", "D2", "D3", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {