summaryrefslogtreecommitdiffstats
path: root/keyboards/mechlovin/olly
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:39:56 +1100
committerGitHub <noreply@github.com>2023-03-11 00:39:56 +1100
commitcaa8c81086a806ea048c91ba142d424dc6a49f50 (patch)
tree824de64449d9cfaeba176288d379a282c733ae1a /keyboards/mechlovin/olly
parentace372d90de13dafc815df5d8049497cb351b69b (diff)
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/mechlovin/olly')
-rw-r--r--keyboards/mechlovin/olly/octagon/config.h8
-rw-r--r--keyboards/mechlovin/olly/octagon/info.json5
-rw-r--r--keyboards/mechlovin/olly/orion/config.h17
-rw-r--r--keyboards/mechlovin/olly/orion/info.json5
4 files changed, 10 insertions, 25 deletions
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 89e8a32d4f..a193206552 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B12, A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 }
-
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN A7
#define RGBLED_NUM 26
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 9adec5281c..117239c476 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,11 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+ "rows": ["B0", "B12", "A6", "A5", "A4", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 225795d3c0..44e13fa7f2 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/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 { A8, A9, A10, B11, C13, C14 }
-#define MATRIX_COL_PINS { B14, B13, B12, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, A15, B3, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
#ifdef RGBLIGHT_ENABLE
# define RGB_DI_PIN B15
# define RGBLED_NUM 24
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 89433dfd1b..de4ed5e986 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,6 +8,11 @@
"pid": "0xD870",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"],
+ "rows": ["A8", "A9", "A10", "B11", "C13", "C14"]
+ },
+ "diode_direction": "ROW2COL",
"indicators": {
"caps_lock": "B10",
"num_lock": "A13",