diff options
Diffstat (limited to 'keyboards/ocean')
32 files changed, 439 insertions, 945 deletions
diff --git a/keyboards/ocean/addon/addon.c b/keyboards/ocean/addon/addon.c deleted file mode 100644 index 01a815a279..0000000000 --- a/keyboards/ocean/addon/addon.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2022 Ocean - * 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 "addon.h" diff --git a/keyboards/ocean/addon/addon.h b/keyboards/ocean/addon/addon.h deleted file mode 100644 index 82bc2eee27..0000000000 --- a/keyboards/ocean/addon/addon.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 Ocean - * - * 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" - -#define XXX KC_NO - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, K26, \ - K30, K31, K32, K33, K34, K35, K36, \ - K40, K41, K42, K43, K44, K45, K46 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, K33, K34, K35, K36 }, \ - { K40, K41, K42, K43, K44, K45, K46 } \ -} diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h deleted file mode 100644 index abca0558eb..0000000000 --- a/keyboards/ocean/addon/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2022 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json index fa7d1ab7fa..6fbd4c1b07 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/info.json @@ -8,46 +8,61 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.25, "y":0}, - {"x":6.25, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3.25, "y":4}, - {"x":4.25, "y":4}, - {"x":5.25, "y":4}, - {"x":6.25, "y":4}] + {"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.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "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": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4} + ] } } -}
\ No newline at end of file +} diff --git a/keyboards/ocean/gin_v2/config.h b/keyboards/ocean/gin_v2/config.h deleted file mode 100644 index d19f0bce23..0000000000 --- a/keyboards/ocean/gin_v2/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/gin_v2/gin_v2.c b/keyboards/ocean/gin_v2/gin_v2.c deleted file mode 100644 index 3a8a328817..0000000000 --- a/keyboards/ocean/gin_v2/gin_v2.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "gin_v2.h" diff --git a/keyboards/ocean/gin_v2/gin_v2.h b/keyboards/ocean/gin_v2/gin_v2.h deleted file mode 100644 index dd457dcc92..0000000000 --- a/keyboards/ocean/gin_v2/gin_v2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define XXX KC_NO - -#define LAYOUT(\ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K27, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K47, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K67, \ - K60, K70, K61, K71, K62, K72, K63, K74, K65, K75, K66, K76 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, XXX }, \ - { K60, K61, K62, K63, XXX, K65, K66, K67 }, \ - { K70, K71, K72, XXX, K74, K75, K76, XXX } \ -} diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json index 4a6b259909..b5e7cdddd7 100644 --- a/keyboards/ocean/gin_v2/info.json +++ b/keyboards/ocean/gin_v2/info.json @@ -8,72 +8,81 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.25, "y": 0}, - {"x": 8.25, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + {"matrix": [1, 2], "x": 5.25, "y": 0}, + {"matrix": [0, 3], "x": 6.25, "y": 0}, + {"matrix": [1, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [1, 4], "x": 9.25, "y": 0}, + {"matrix": [0, 5], "x": 10.25, "y": 0}, + {"matrix": [1, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [1, 6], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [2, 7], "x": 15.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + + {"matrix": [3, 1], "x": 3.25, "y": 1, "w": 1.25}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1}, + {"matrix": [4, 7], "x": 14.5, "y": 1, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3.25, "y": 1, "w": 1.25}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1}, - {"x": 14.5, "y": 1, "w": 1.75}, + {"matrix": [5, 1], "x": 3.25, "y": 2, "w": 1.75}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [5, 5], "x": 12, "y": 2}, + {"matrix": [4, 6], "x": 13, "y": 2}, + {"matrix": [5, 6], "x": 14, "y": 2}, + {"matrix": [6, 7], "x": 15, "y": 2, "w": 1.25}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3.25, "y": 2, "w": 1.75}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2, "w": 1.25}, + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3.25, "y": 3, "w": 1.25}, - {"x": 4.5, "y": 3, "w": 1.25}, - {"x": 5.75, "y": 3, "w": 1.25}, - {"x": 7, "y": 3, "w": 2.25}, - {"x": 9.25, "y": 3, "w": 2.75}, - {"x": 12, "y": 3, "w": 1.25}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3} + {"matrix": [7, 1], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3, "w": 1.25}, + {"matrix": [6, 3], "x": 7, "y": 3, "w": 2.25}, + {"matrix": [7, 4], "x": 9.25, "y": 3, "w": 2.75}, + {"matrix": [6, 5], "x": 12, "y": 3, "w": 1.25}, + {"matrix": [7, 5], "x": 13.25, "y": 3}, + {"matrix": [6, 6], "x": 14.25, "y": 3}, + {"matrix": [7, 6], "x": 15.25, "y": 3} ] } } diff --git a/keyboards/ocean/slamz/config.h b/keyboards/ocean/slamz/config.h deleted file mode 100644 index 61a8050d05..0000000000 --- a/keyboards/ocean/slamz/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { D2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json index d15f271b1c..a1a95aca60 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/info.json @@ -1,18 +1,71 @@ { - "keyboard_name": "Slamz", + "keyboard_name": "Slamz", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7"], + "rows": ["D2", "D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [2, 5], "x": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 9, "y": 3}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 9], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/ocean/slamz/slamz.c b/keyboards/ocean/slamz/slamz.c deleted file mode 100644 index fbfca8831a..0000000000 --- a/keyboards/ocean/slamz/slamz.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "slamz.h" diff --git a/keyboards/ocean/slamz/slamz.h b/keyboards/ocean/slamz/slamz.h deleted file mode 100644 index da990b0f56..0000000000 --- a/keyboards/ocean/slamz/slamz.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 } \ -} diff --git a/keyboards/ocean/stealth/config.h b/keyboards/ocean/stealth/config.h deleted file mode 100644 index 3cc4f01a37..0000000000 --- a/keyboards/ocean/stealth/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { D1 } -#define MATRIX_COL_PINS { D0, D4, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json index 4e17ba36a7..fcb08b0ca6 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/info.json @@ -1,18 +1,27 @@ { - "keyboard_name": "Stealth", + "keyboard_name": "Stealth", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D4", "C6"], + "rows": ["D1"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2.25}, + {"matrix": [0, 1], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [0, 2], "x": 1.25, "y": 1} + ] } } } diff --git a/keyboards/ocean/stealth/stealth.c b/keyboards/ocean/stealth/stealth.c deleted file mode 100644 index 656701cfd2..0000000000 --- a/keyboards/ocean/stealth/stealth.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "stealth.h" diff --git a/keyboards/ocean/stealth/stealth.h b/keyboards/ocean/stealth/stealth.h deleted file mode 100644 index b86cd2f05f..0000000000 --- a/keyboards/ocean/stealth/stealth.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define LAYOUT(\ - K00, K01, K02 \ -) \ -{ \ - { K00, K01, K02 }, \ -} diff --git a/keyboards/ocean/sus/config.h b/keyboards/ocean/sus/config.h deleted file mode 100644 index 78ce643e07..0000000000 --- a/keyboards/ocean/sus/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { B5, B4, E6, D7 } -#define MATRIX_COL_PINS { C6, D4, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json index 61ef3a50db..bb9b8c501c 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/info.json @@ -1,33 +1,38 @@ { - "keyboard_name": "Sus", + "keyboard_name": "Sus", "manufacturer": "Ocean", - "url": " ", - "maintainer": "Ocean", + "url": " ", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D4", "D0"], + "rows": ["B5", "B4", "E6", "D7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3} ] } } diff --git a/keyboards/ocean/sus/sus.c b/keyboards/ocean/sus/sus.c deleted file mode 100644 index d04a12bfba..0000000000 --- a/keyboards/ocean/sus/sus.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "sus.h" diff --git a/keyboards/ocean/sus/sus.h b/keyboards/ocean/sus/sus.h deleted file mode 100644 index cba5f3cbc8..0000000000 --- a/keyboards/ocean/sus/sus.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define LAYOUT_ortho_4x3(\ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ -} diff --git a/keyboards/ocean/wang_ergo/config.h b/keyboards/ocean/wang_ergo/config.h deleted file mode 100644 index 2d9e95facd..0000000000 --- a/keyboards/ocean/wang_ergo/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json index 904d622338..c09340a92f 100644 --- a/keyboards/ocean/wang_ergo/info.json +++ b/keyboards/ocean/wang_ergo/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { @@ -16,106 +21,114 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":1, "y":0}, - {"label":"Q", "x":2, "y":0}, - {"label":"W", "x":3, "y":0}, - {"label":"E", "x":4, "y":0}, - {"label":"R", "x":5, "y":0}, - {"label":"T", "x":6, "y":0}, - {"label":"Y", "x":8, "y":0}, - {"label":"U", "x":9, "y":0}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0}, - {"label":"P", "x":12, "y":0}, - {"label":"Del", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [3, 10], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, - {"label":"Tab", "x":0.75, "y":1, "w":1.25}, - {"label":"A", "x":2, "y":1}, - {"label":"S", "x":3, "y":1}, - {"label":"D", "x":4, "y":1}, - {"label":"F", "x":5, "y":1}, - {"label":"G", "x":6, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":";:", "x":12, "y":1}, - {"label":"Enter", "x":13, "y":1, "w":1.75}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2, "w": 1.25}, - {"label":"Shift", "x":0.25, "y":2, "w":1.75}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"/?", "x":12, "y":2}, - {"label":"Fn", "x":13, "y":2, "w":1.25}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"GUI", "x":1, "y":3}, - {"label":"Alt", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"Space", "x":8, "y":3}, - {"label":"Space", "x":9, "y":3}, - {"label":"Alt", "x":10, "y":3}, - {"label":"Ctrl", "x":13, "y":3} + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 9, "y": 3}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 13, "y": 3} ] }, "LAYOUT_2x2u": { "layout": [ - {"label":"Esc", "x":1, "y":0}, - {"label":"Q", "x":2, "y":0}, - {"label":"W", "x":3, "y":0}, - {"label":"E", "x":4, "y":0}, - {"label":"R", "x":5, "y":0}, - {"label":"T", "x":6, "y":0}, - {"label":"Y", "x":8, "y":0}, - {"label":"U", "x":9, "y":0}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0}, - {"label":"P", "x":12, "y":0}, - {"label":"Del", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [3, 10], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, - {"label":"Tab", "x":0.75, "y":1, "w":1.25}, - {"label":"A", "x":2, "y":1}, - {"label":"S", "x":3, "y":1}, - {"label":"D", "x":4, "y":1}, - {"label":"F", "x":5, "y":1}, - {"label":"G", "x":6, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":";:", "x":12, "y":1}, - {"label":"Enter", "x":13, "y":1, "w":1.75}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2, "w": 1.25}, - {"label":"Shift", "x":0.25, "y":2, "w":1.75}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"/?", "x":12, "y":2}, - {"label":"Fn", "x":13, "y":2, "w":1.25}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"GUI", "x":1, "y":3}, - {"label":"Alt", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3, "w":2}, - {"label":"Space", "x":8, "y":3, "w":2}, - {"label":"Alt", "x":10, "y":3}, - {"label":"Ctrl", "x":13, "y":3} + {"matrix": [3, 6], "x": 8, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 13, "y": 3} ] } } diff --git a/keyboards/ocean/wang_ergo/wang_ergo.c b/keyboards/ocean/wang_ergo/wang_ergo.c deleted file mode 100644 index 339c8465ec..0000000000 --- a/keyboards/ocean/wang_ergo/wang_ergo.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "wang_ergo.h" diff --git a/keyboards/ocean/wang_ergo/wang_ergo.h b/keyboards/ocean/wang_ergo/wang_ergo.h deleted file mode 100644 index 68074c2998..0000000000 --- a/keyboards/ocean/wang_ergo/wang_ergo.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define XXX KC_NO - -/* - * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │3A │ - * ┌┴───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┴──┬┘ - * │10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │ - * ┌─┴────┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼────┬─┘ - * │20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │ - * ┌┴──┬───┼───┴───┼───┼───┼───┤ ├───┼───┼───┼───┴───┼───┬┘ - * │30 │31 │ │33 │34 │35 │ │36 │37 │38 │ │3B │ - * └───┴───┘ └───┴───┴───┘ └───┴───┴───┘ └───┘ - * ┌───────┐ ┌───────┐ - * │35 │ │36 │ - * └───────┘ └───────┘ - */ - -#define LAYOUT_all(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K3A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K33, K34, K35, K36, K37, K38, K3B \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, XXX, K33, K34, K35, K36, K37, K38, XXX, K3A, K3B }, \ -} - -#define LAYOUT_2x2u(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K3A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K33, K35, K36, K38, K3B \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, XXX, K33, XXX, K35, K36, XXX, K38, XXX, K3A, K3B }, \ -} diff --git a/keyboards/ocean/wang_v2/config.h b/keyboards/ocean/wang_v2/config.h deleted file mode 100644 index 5002ee22e5..0000000000 --- a/keyboards/ocean/wang_v2/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2021 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json index cfa68f7cb4..93591d28c3 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/info.json @@ -1,18 +1,74 @@ { - "keyboard_name": "Wang V2", + "keyboard_name": "Wang V2", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "D3"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 7, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3} + ] } } } diff --git a/keyboards/ocean/wang_v2/wang_v2.c b/keyboards/ocean/wang_v2/wang_v2.c deleted file mode 100644 index b04df65bae..0000000000 --- a/keyboards/ocean/wang_v2/wang_v2.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Ocean - * 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 "wang_v2.h" diff --git a/keyboards/ocean/wang_v2/wang_v2.h b/keyboards/ocean/wang_v2/wang_v2.h deleted file mode 100644 index bcac9dd690..0000000000 --- a/keyboards/ocean/wang_v2/wang_v2.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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" - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K35, K36, K38, K39, K3A, K3B \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO }, \ - { K30, K31, K32, K33, KC_NO, K35, K36, KC_NO, K38, K39, K3A, K3B, KC_NO }, \ -} diff --git a/keyboards/ocean/yuri/config.h b/keyboards/ocean/yuri/config.h deleted file mode 100644 index 4c8aacdc0e..0000000000 --- a/keyboards/ocean/yuri/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2022 Ocean - -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 - - -/* - * 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) - * - */ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ -#define MATRIX_ROW_PINS {F4, F5, F6, F7} -#define MATRIX_COL_PINS {D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json index 149434d76a..3ed5df8746 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/info.json @@ -1,66 +1,82 @@ { - "keyboard_name": "Yuri", + "keyboard_name": "Yuri", "manufacturer": "Ocean", - "url": "tokopedia.com/strat0s", - "maintainer": "Ocean", + "url": "tokopedia.com/strat0s", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.25, "y":0}, - {"x":6.25, "y":0}, - {"x":9.25, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":0, "y":1}, - {"x":1.25, "y":1, "w":1.25}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1, "w":1.75}, - {"x":0, "y":2}, - {"x":1.25, "y":2, "w":1.75}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2, "w":1.25}, - {"x":1.25, "y":3, "w":1.5}, - {"x":2.75, "y":3, "w":1.25}, - {"x":4, "y":3, "w":1.5}, - {"x":5.5, "y":3, "w":2.25}, - {"x":9.5, "y":3, "w":2.75}, - {"x":12.25, "y":3, "w":1.25}, - {"x":13.5, "y":3, "w":1.25}, - {"x":14.75, "y":3, "w":1.5} + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [0, 7], "x": 9.25, "y": 0}, + {"matrix": [0, 8], "x": 10.25, "y": 0}, + {"matrix": [0, 9], "x": 11.25, "y": 0}, + {"matrix": [0, 10], "x": 12.25, "y": 0}, + {"matrix": [0, 11], "x": 13.25, "y": 0}, + {"matrix": [0, 12], "x": 14.25, "y": 0}, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"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": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + {"matrix": [2, 12], "x": 14, "y": 2}, + {"matrix": [2, 13], "x": 15, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 5.5, "y": 3, "w": 2.25}, + + {"matrix": [3, 4], "x": 9.5, "y": 3, "w": 2.75}, + {"matrix": [3, 5], "x": 12.25, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 13.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 14.75, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/ocean/yuri/yuri.c b/keyboards/ocean/yuri/yuri.c deleted file mode 100644 index f02e35dce7..0000000000 --- a/keyboards/ocean/yuri/yuri.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2022 Ocean - * 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 "yuri.h" diff --git a/keyboards/ocean/yuri/yuri.h b/keyboards/ocean/yuri/yuri.h deleted file mode 100644 index 3f8c2b17da..0000000000 --- a/keyboards/ocean/yuri/yuri.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2022 Ocean - * - * 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" - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K35, K38, K3A, K3C, K3D \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K31, K32, K33, K35, K38, K3A, K3C, K3D }, \ -} |