diff options
Diffstat (limited to 'keyboards/ai03/orbit_x')
-rw-r--r-- | keyboards/ai03/orbit_x/config.h | 19 | ||||
-rw-r--r-- | keyboards/ai03/orbit_x/info.json | 122 | ||||
-rw-r--r-- | keyboards/ai03/orbit_x/orbit_x.c | 18 | ||||
-rw-r--r-- | keyboards/ai03/orbit_x/orbit_x.h | 44 |
4 files changed, 70 insertions, 133 deletions
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..ebb11624fe 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -1,69 +1,87 @@ { - "keyboard_name": "OrbitX", + "keyboard_name": "OrbitX", "manufacturer": "ai03 Design Studio", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { "vid": "0xA103", "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", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.38}, - {"x":1, "y":0.38}, - {"x":2, "y":0.13}, - {"x":3, "y":0}, - {"x":4, "y":0.13}, - {"x":5, "y":0.25}, - {"x":7.5, "y":0.25}, - {"x":8.5, "y":0.13}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0.13}, - {"x":11.5, "y":0.38}, - {"x":12.5, "y":0.38}, - {"x":0, "y":1.38}, - {"x":1, "y":1.38}, - {"x":2, "y":1.13}, - {"x":3, "y":1.0}, - {"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":10.5, "y":1.13}, - {"x":11.5, "y":1.38}, - {"x":12.5, "y":1.38}, - {"x":0, "y":2.38}, - {"x":1, "y":2.38}, - {"x":2, "y":2.13}, - {"x":3, "y":2}, - {"x":4, "y":2.13}, - {"x":5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.13}, - {"x":9.5, "y":2}, - {"x":10.5, "y":2.13}, - {"x":11.5, "y":2.38}, - {"x":12.5, "y":2.38}, - {"x":0, "y":3.38}, - {"x":1, "y":3.38}, - {"x":2, "y":3.13}, - {"x":3, "y":3}, - {"x":4.25, "y":3.38}, - {"x":5.25, "y":3.25, "h":1.5}, - {"x":7.25, "y":3.25, "h":1.5}, - {"x":8.25, "y":3.38}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3.13}, - {"x":11.5, "y":3.38}, - {"x":12.5, "y":3.38} + {"matrix": [0, 0], "x": 0, "y": 0.38}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.13}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.13}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 0], "x": 7.5, "y": 0.25}, + {"matrix": [4, 1], "x": 8.5, "y": 0.13}, + {"matrix": [4, 2], "x": 9.5, "y": 0}, + {"matrix": [4, 3], "x": 10.5, "y": 0.13}, + {"matrix": [4, 4], "x": 11.5, "y": 0.38}, + {"matrix": [4, 5], "x": 12.5, "y": 0.38}, + + {"matrix": [1, 0], "x": 0, "y": 1.38}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.13}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.13}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 0], "x": 7.5, "y": 1.25}, + {"matrix": [5, 1], "x": 8.5, "y": 1.13}, + {"matrix": [5, 2], "x": 9.5, "y": 1}, + {"matrix": [5, 3], "x": 10.5, "y": 1.13}, + {"matrix": [5, 4], "x": 11.5, "y": 1.38}, + {"matrix": [5, 5], "x": 12.5, "y": 1.38}, + + {"matrix": [2, 0], "x": 0, "y": 2.38}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.13}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.13}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 1], "x": 8.5, "y": 2.13}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 3], "x": 10.5, "y": 2.13}, + {"matrix": [6, 4], "x": 11.5, "y": 2.38}, + {"matrix": [6, 5], "x": 12.5, "y": 2.38}, + + {"matrix": [3, 0], "x": 0, "y": 3.38}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.13}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3.38}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5}, + + {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5}, + {"matrix": [7, 1], "x": 8.25, "y": 3.38}, + {"matrix": [7, 2], "x": 9.5, "y": 3}, + {"matrix": [7, 3], "x": 10.5, "y": 3.13}, + {"matrix": [7, 4], "x": 11.5, "y": 3.38}, + {"matrix": [7, 5], "x": 12.5, "y": 3.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/orbit_x/orbit_x.h b/keyboards/ai03/orbit_x/orbit_x.h deleted file mode 100644 index a1ae8304b2..0000000000 --- a/keyboards/ai03/orbit_x/orbit_x.h +++ /dev/null @@ -1,44 +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 - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ -} |