summaryrefslogtreecommitdiff
path: root/keyboards/org60
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-10 22:16:56 +1100
committerGitHub <noreply@github.com>2023-03-10 22:16:56 +1100
commitdd086a51d82a574a55eb3b89e8943301d72296f3 (patch)
treedb49e94d90e9f3a8a6cf72a9da0d5549dd2a9bcb /keyboards/org60
parent80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff)
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/org60')
-rw-r--r--keyboards/org60/config.h17
-rw-r--r--keyboards/org60/info.json5
2 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index 44701c7e17..6382a3b398 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow
* F6 PIN for Org60 that has pre-soldered WS2812 LEDs
*/
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index 83da161e31..ccb05c66ce 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "F5",
"levels": 6