summaryrefslogtreecommitdiffstats
path: root/keyboards/ai03
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ai03')
-rw-r--r--keyboards/ai03/andromeda/andromeda.c17
-rw-r--r--keyboards/ai03/andromeda/config.h4
-rw-r--r--keyboards/ai03/andromeda/info.json5
-rw-r--r--keyboards/ai03/equinox/config.h17
-rw-r--r--keyboards/ai03/equinox/equinox.c17
-rw-r--r--keyboards/ai03/equinox/rev0/config.h22
-rw-r--r--keyboards/ai03/equinox/rev0/info.json5
-rw-r--r--keyboards/ai03/equinox/rev1/info.json5
-rw-r--r--keyboards/ai03/jp60/config.h17
-rw-r--r--keyboards/ai03/jp60/info.json5
-rw-r--r--keyboards/ai03/jp60/jp60.c17
-rw-r--r--keyboards/ai03/lunar/config.h17
-rw-r--r--keyboards/ai03/lunar/info.json5
-rw-r--r--keyboards/ai03/lunar/lunar.c16
-rw-r--r--keyboards/ai03/lunar_ii/info.json122
-rw-r--r--keyboards/ai03/orbit/config.h19
-rw-r--r--keyboards/ai03/orbit/info.json13
-rw-r--r--keyboards/ai03/orbit_x/config.h19
-rw-r--r--keyboards/ai03/orbit_x/info.json17
-rw-r--r--keyboards/ai03/orbit_x/orbit_x.c18
-rw-r--r--keyboards/ai03/polaris/config.h19
-rw-r--r--keyboards/ai03/polaris/info.json5
-rw-r--r--keyboards/ai03/polaris/polaris.c16
-rw-r--r--keyboards/ai03/quasar/config.h17
-rw-r--r--keyboards/ai03/quasar/info.json5
-rw-r--r--keyboards/ai03/quasar/quasar.c16
-rw-r--r--keyboards/ai03/soyuz/config.h17
-rw-r--r--keyboards/ai03/soyuz/info.json5
-rw-r--r--keyboards/ai03/soyuz/soyuz.c16
-rw-r--r--keyboards/ai03/vega/config.h4
-rw-r--r--keyboards/ai03/vega/info.json5
-rw-r--r--keyboards/ai03/voyager60_alps/config.h8
-rw-r--r--keyboards/ai03/voyager60_alps/info.json5
-rw-r--r--keyboards/ai03/voyager60_alps/voyager60_alps.c15
34 files changed, 137 insertions, 393 deletions
diff --git a/keyboards/ai03/andromeda/andromeda.c b/keyboards/ai03/andromeda/andromeda.c
deleted file mode 100644
index 5dd580effd..0000000000
--- a/keyboards/ai03/andromeda/andromeda.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Andrew Kannan
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "andromeda.h"
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index 1fb163a652..056f54d521 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 }
-#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 }
-#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/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json
index ade4938b82..e29bb3e121 100644
--- a/keyboards/ai03/andromeda/info.json
+++ b/keyboards/ai03/andromeda/info.json
@@ -8,6 +8,11 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"],
+ "rows": ["B4", "B3", "A15", "A3", "A4", "A5"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A2",
"scroll_lock": "A1",
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 32065a4740..50001e978c 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/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 { D3, C5, D4, D5 }
-#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
-
-/* 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/ai03/equinox/equinox.c b/keyboards/ai03/equinox/equinox.c
deleted file mode 100644
index a8ea38ecd1..0000000000
--- a/keyboards/ai03/equinox/equinox.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "equinox.h"
-
diff --git a/keyboards/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h
deleted file mode 100644
index 78c6fb8fcd..0000000000
--- a/keyboards/ai03/equinox/rev0/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json
index d76623777e..f5dd365564 100644
--- a/keyboards/ai03/equinox/rev0/info.json
+++ b/keyboards/ai03/equinox/rev0/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+ "rows": ["D3", "C5", "D4", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D1",
"levels": 5,
diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json
index 19cd40d140..9c0727f7ba 100644
--- a/keyboards/ai03/equinox/rev1/info.json
+++ b/keyboards/ai03/equinox/rev1/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+ "rows": ["D3", "C5", "D4", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index 76e81dc2aa..9fe6627ecc 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/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 { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 }
-
-/* 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/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json
index 3a07c7224c..c7b55c53be 100644
--- a/keyboards/ai03/jp60/info.json
+++ b/keyboards/ai03/jp60/info.json
@@ -8,6 +8,11 @@
"pid": "0x0024",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["B6", "B5", "B4", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/ai03/jp60/jp60.c b/keyboards/ai03/jp60/jp60.c
deleted file mode 100644
index c18a99c6a6..0000000000
--- a/keyboards/ai03/jp60/jp60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ai03
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jp60.h"
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index 10c8ab70ab..50001e978c 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/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 { B3, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* 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/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json
index 6c069207e1..2b97d0042c 100644
--- a/keyboards/ai03/lunar/info.json
+++ b/keyboards/ai03/lunar/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B3", "D0", "D1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/ai03/lunar/lunar.c b/keyboards/ai03/lunar/lunar.c
deleted file mode 100644
index 9c7bf23a62..0000000000
--- a/keyboards/ai03/lunar/lunar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "lunar.h"
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
index 6eed934739..a810ad4cc7 100644
--- a/keyboards/ai03/lunar_ii/info.json
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -25,67 +25,67 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
- { "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4.0 },
- { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4.0 },
- { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4.0 },
- { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4.0 },
- { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4.0 },
- { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+ { "matrix": [0, 10], "x": 10, "y": 0 },
+ { "matrix": [0, 11], "x": 11, "y": 0 },
+ { "matrix": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "y": 0 },
+ { "matrix": [2, 12], "x": 14, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+ { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4 },
+ { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4 },
+ { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4 },
+ { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4 },
+ { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
+ { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 85d4ae5bfe..f4157a1729 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -17,25 +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 { F7, F6, F5, F4, D3 }
-#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 }
-#define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define SELECT_SOFT_SERIAL_SPEED 1
#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
index 840fb1fc20..981f3cd685 100644
--- a/keyboards/ai03/orbit/info.json
+++ b/keyboards/ai03/orbit/info.json
@@ -8,11 +8,22 @@
"pid": "0x0003",
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
+ "rows": ["F7", "F6", "F5", "F4", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
+ "rows": ["B6", "B5", "B4", "D7", "E6"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 27a383f7bb..05d319d030 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -17,25 +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 { D7, D6, D4, F0 }
-#define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 }
-#define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 }
-#define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN D5
#define SPLIT_USB_DETECT
#define SPLIT_USB_TIMEOUT 2500
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
index fdb26bddf4..dbc9f40d19 100644
--- a/keyboards/ai03/orbit_x/info.json
+++ b/keyboards/ai03/orbit_x/info.json
@@ -8,8 +8,19 @@
"pid": "0x0014",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
+ "rows": ["D7", "D6", "D4", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
+ "rows": ["B5", "D7", "B4", "D4"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
@@ -31,12 +42,12 @@
{"x":0, "y":1.38},
{"x":1, "y":1.38},
{"x":2, "y":1.13},
- {"x":3, "y":1.0},
+ {"x":3, "y":1},
{"x":4, "y":1.13},
{"x":5, "y":1.25},
{"x":7.5, "y":1.25},
{"x":8.5, "y":1.13},
- {"x":9.5, "y":1.0},
+ {"x":9.5, "y":1},
{"x":10.5, "y":1.13},
{"x":11.5, "y":1.38},
{"x":12.5, "y":1.38},
diff --git a/keyboards/ai03/orbit_x/orbit_x.c b/keyboards/ai03/orbit_x/orbit_x.c
deleted file mode 100644
index 3327261add..0000000000
--- a/keyboards/ai03/orbit_x/orbit_x.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "orbit_x.h"
-
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 871f4bc8db..88099b805b 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -17,25 +17,7 @@ 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 { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index ae0fcb927d..ee2f32ffae 100644
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+ "rows": ["B1", "B2", "B3", "F0", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
diff --git a/keyboards/ai03/polaris/polaris.c b/keyboards/ai03/polaris/polaris.c
deleted file mode 100644
index 256dcb930a..0000000000
--- a/keyboards/ai03/polaris/polaris.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "polaris.h"
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 04765c0788..50001e978c 100644