From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/nacly/sodium42/config.h | 7 ------- keyboards/nacly/sodium42/info.json | 5 +++++ keyboards/nacly/sodium50/config.h | 7 ------- keyboards/nacly/sodium50/info.json | 5 +++++ keyboards/nacly/sodium62/config.h | 7 ------- keyboards/nacly/sodium62/info.json | 5 +++++ keyboards/nacly/splitreus62/config.h | 7 ------- keyboards/nacly/splitreus62/info.json | 5 +++++ keyboards/nacly/ua62/config.h | 17 ----------------- keyboards/nacly/ua62/info.json | 5 +++++ 10 files changed, 25 insertions(+), 45 deletions(-) (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h index 690f7c96f9..1bbaec44c6 100644 --- a/keyboards/nacly/sodium42/config.h +++ b/keyboards/nacly/sodium42/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4 } -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 752f5c5372..255d4e85e2 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3"], + "rows": ["F7", "D4", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h index 55abbac4d1..1bbaec44c6 100644 --- a/keyboards/nacly/sodium50/config.h +++ b/keyboards/nacly/sodium50/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4} -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 6e2e6d5aef..182162e39f 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], + "rows": ["F7", "D4", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h index 5e24b062cf..c526c9c9c5 100644 --- a/keyboards/nacly/sodium62/config.h +++ b/keyboards/nacly/sodium62/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 } -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index bf9a50ded2..07e380569b 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], + "rows": ["F7", "D4", "D7", "B4", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h index b7b0ec0d30..64f60becf3 100644 --- a/keyboards/nacly/splitreus62/config.h +++ b/keyboards/nacly/splitreus62/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 } -#define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 } - -#define DIODE_DIRECTION ROW2COL - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index a3a3c88e0b..07ccd770c1 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "B6", "B2", "B3"], + "rows": ["D3", "D2", "D1", "D4", "C6", "D7"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h index 882bda8ccf..0391f174c9 100644 --- a/keyboards/nacly/ua62/config.h +++ b/keyboards/nacly/ua62/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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, D2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index d7bbd11265..82e284ebe7 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -8,6 +8,11 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/nacly/sodium42/sodium42.c | 16 ---------------- keyboards/nacly/sodium50/sodium50.c | 16 ---------------- keyboards/nacly/splitreus62/splitreus62.c | 1 - keyboards/nacly/ua62/ua62.c | 17 ----------------- 4 files changed, 50 deletions(-) delete mode 100644 keyboards/nacly/sodium42/sodium42.c delete mode 100644 keyboards/nacly/sodium50/sodium50.c delete mode 100644 keyboards/nacly/splitreus62/splitreus62.c delete mode 100644 keyboards/nacly/ua62/ua62.c (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/sodium42/sodium42.c b/keyboards/nacly/sodium42/sodium42.c deleted file mode 100644 index 980b123bac..0000000000 --- a/keyboards/nacly/sodium42/sodium42.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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 . - */ -#include "sodium42.h" diff --git a/keyboards/nacly/sodium50/sodium50.c b/keyboards/nacly/sodium50/sodium50.c deleted file mode 100644 index 74b2b5e16c..0000000000 --- a/keyboards/nacly/sodium50/sodium50.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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 . - */ -#include "sodium50.h" diff --git a/keyboards/nacly/splitreus62/splitreus62.c b/keyboards/nacly/splitreus62/splitreus62.c deleted file mode 100644 index d6ea3f9135..0000000000 --- a/keyboards/nacly/splitreus62/splitreus62.c +++ /dev/null @@ -1 +0,0 @@ -#include "splitreus62.h" diff --git a/keyboards/nacly/ua62/ua62.c b/keyboards/nacly/ua62/ua62.c deleted file mode 100644 index cac45f3fbf..0000000000 --- a/keyboards/nacly/ua62/ua62.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 NaCly - * - * 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 . - */ -#include "ua62.h" - -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/nacly/splitreus62/config.h | 3 --- keyboards/nacly/splitreus62/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h index 64f60becf3..9c6773547e 100644 --- a/keyboards/nacly/splitreus62/config.h +++ b/keyboards/nacly/splitreus62/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN B1 - #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index 07ccd770c1..e8361decda 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/nacly/sodium42/info.json | 84 ++++++++++---------- keyboards/nacly/sodium42/sodium42.h | 36 --------- keyboards/nacly/sodium50/info.json | 100 ++++++++++++------------ keyboards/nacly/sodium50/sodium50.h | 36 --------- keyboards/nacly/sodium62/info.json | 124 +++++++++++++++--------------- keyboards/nacly/sodium62/sodium62.c | 2 +- keyboards/nacly/sodium62/sodium62.h | 39 ---------- keyboards/nacly/splitreus62/info.json | 76 +++++++++++++++++- keyboards/nacly/splitreus62/splitreus62.h | 26 ------- keyboards/nacly/ua62/info.json | 76 +++++++++++++++++- keyboards/nacly/ua62/ua62.h | 41 ---------- 11 files changed, 303 insertions(+), 337 deletions(-) delete mode 100644 keyboards/nacly/sodium42/sodium42.h delete mode 100644 keyboards/nacly/sodium50/sodium50.h delete mode 100644 keyboards/nacly/sodium62/sodium62.h delete mode 100644 keyboards/nacly/splitreus62/splitreus62.h delete mode 100644 keyboards/nacly/ua62/ua62.h (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 255d4e85e2..0c92f469ae 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -21,55 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.25}, - {"x": 4, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 1}, - {"x": 8.75, "y": 1}, - {"x": 9.75, "y": 0.5}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0.5}, - {"x": 12.75, "y": 0.75}, + {"matrix": [4, 4], "x": 8.75, "y": 1}, + {"matrix": [4, 3], "x": 9.75, "y": 0.5}, + {"matrix": [4, 2], "x": 10.75, "y": 0}, + {"matrix": [4, 1], "x": 11.75, "y": 0.5}, + {"matrix": [4, 0], "x": 12.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 1.5}, - {"x": 10.75, "y": 1}, - {"x": 11.75, "y": 1.5}, - {"x": 12.75, "y": 1.75}, + {"matrix": [5, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 1.5}, + {"matrix": [5, 2], "x": 10.75, "y": 1}, + {"matrix": [5, 1], "x": 11.75, "y": 1.5}, + {"matrix": [5, 0], "x": 12.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.25}, - {"x": 4, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 2.5}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2.5}, - {"x": 12.75, "y": 2.75}, + {"matrix": [6, 4], "x": 8.75, "y": 3}, + {"matrix": [6, 3], "x": 9.75, "y": 2.5}, + {"matrix": [6, 2], "x": 10.75, "y": 2}, + {"matrix": [6, 1], "x": 11.75, "y": 2.5}, + {"matrix": [6, 0], "x": 12.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.5}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3.25}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4.5}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.75} + {"matrix": [7, 5], "x": 7.75, "y": 4.5}, + {"matrix": [7, 4], "x": 8.75, "y": 4}, + {"matrix": [7, 3], "x": 9.75, "y": 3.5}, + {"matrix": [7, 2], "x": 10.75, "y": 3}, + {"matrix": [7, 1], "x": 11.75, "y": 3.5}, + {"matrix": [7, 0], "x": 12.75, "y": 3.75} ] } } diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h deleted file mode 100644 index 427b6f4d43..0000000000 --- a/keyboards/nacly/sodium42/sodium42.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT(\ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30 \ -)\ - {\ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, L31, L32, L33, L34, L35 }, \ -\ - { R00, R01, R02, R03, R04, KC_NO }, \ - { R10, R11, R12, R13, R14, KC_NO }, \ - { R20, R21, R22, R23, R24, KC_NO }, \ - { R30, R31, R32, R33, R34, R35 } \ -} diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 182162e39f..920a2f946f 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -21,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.75}, - {"x": 2, "y": 0.5}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.25}, - {"x": 5, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 0.5}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0.5}, - {"x": 13.75, "y": 0.75}, - {"x": 14.75, "y": 0.75}, + {"matrix": [4, 5], "x": 9.75, "y": 1}, + {"matrix": [4, 4], "x": 10.75, "y": 0.5}, + {"matrix": [4, 3], "x": 11.75, "y": 0}, + {"matrix": [4, 2], "x": 12.75, "y": 0.5}, + {"matrix": [4, 1], "x": 13.75, "y": 0.75}, + {"matrix": [4, 0], "x": 14.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.75}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 1.5}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1.5}, - {"x": 13.75, "y": 1.75}, - {"x": 14.75, "y": 1.75}, + {"matrix": [5, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 1.5}, + {"matrix": [5, 3], "x": 11.75, "y": 1}, + {"matrix": [5, 2], "x": 12.75, "y": 1.5}, + {"matrix": [5, 1], "x": 13.75, "y": 1.75}, + {"matrix": [5, 0], "x": 14.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.75}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 2.5}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2.5}, - {"x": 13.75, "y": 2.75}, - {"x": 14.75, "y": 2.75}, + {"matrix": [6, 5], "x": 9.75, "y": 3}, + {"matrix": [6, 4], "x": 10.75, "y": 2.5}, + {"matrix": [6, 3], "x": 11.75, "y": 2}, + {"matrix": [6, 2], "x": 12.75, "y": 2.5}, + {"matrix": [6, 1], "x": 13.75, "y": 2.75}, + {"matrix": [6, 0], "x": 14.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.75}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.25}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4.5}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 4}, + {"matrix": [3, 6], "x": 6, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 3.75}, - {"x": 14.75, "y": 3.75} + {"matrix": [7, 6], "x": 8.75, "y": 4.5}, + {"matrix": [7, 5], "x": 9.75, "y": 4}, + {"matrix": [7, 4], "x": 10.75, "y": 3.5}, + {"matrix": [7, 3], "x": 11.75, "y": 3}, + {"matrix": [7, 2], "x": 12.75, "y": 3.5}, + {"matrix": [7, 1], "x": 13.75, "y": 3.75}, + {"matrix": [7, 0], "x": 14.75, "y": 3.75} ] } } diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h deleted file mode 100644 index 384867f193..0000000000 --- a/keyboards/nacly/sodium50/sodium50.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36 } \ -} diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 07e380569b..8632bfabdf 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -21,77 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.75}, - {"x": 2, "y": 0.5}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.25}, - {"x": 5, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 0.5}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0.5}, - {"x": 13.75, "y": 0.75}, - {"x": 14.75, "y": 0.75}, + {"matrix": [5, 5], "x": 9.75, "y": 1}, + {"matrix": [5, 4], "x": 10.75, "y": 0.5}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0.5}, + {"matrix": [5, 1], "x": 13.75, "y": 0.75}, + {"matrix": [5, 0], "x": 14.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.75}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 1.5}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1.5}, - {"x": 13.75, "y": 1.75}, - {"x": 14.75, "y": 1.75}, + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 1.5}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 2], "x": 12.75, "y": 1.5}, + {"matrix": [6, 1], "x": 13.75, "y": 1.75}, + {"matrix": [6, 0], "x": 14.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.75}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 2.5}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2.5}, - {"x": 13.75, "y": 2.75}, - {"x": 14.75, "y": 2.75}, + {"matrix": [7, 5], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 2.5}, + {"matrix": [7, 3], "x": 11.75, "y": 2}, + {"matrix": [7, 2], "x": 12.75, "y": 2.5}, + {"matrix": [7, 1], "x": 13.75, "y": 2.75}, + {"matrix": [7, 0], "x": 14.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.75}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.25}, - {"x": 5, "y": 4}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 4}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 3.75}, - {"x": 14.75, "y": 3.75}, + {"matrix": [8, 5], "x": 9.75, "y": 4}, + {"matrix": [8, 4], "x": 10.75, "y": 3.5}, + {"matrix": [8, 3], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3.5}, + {"matrix": [8, 1], "x": 13.75, "y": 3.75}, + {"matrix": [8, 0], "x": 14.75, "y": 3.75}, - {"x": 0, "y": 4.75}, - {"x": 1, "y": 4.75}, - {"x": 2, "y": 4.5}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4.25}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5.5}, + {"matrix": [4, 0], "x": 0, "y": 4.75}, + {"matrix": [4, 1], "x": 1, "y": 4.75}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5.5}, - {"x": 8.75, "y": 5.5}, - {"x": 9.75, "y": 5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.75}, - {"x": 14.75, "y": 4.75} + {"matrix": [9, 6], "x": 8.75, "y": 5.5}, + {"matrix": [9, 5], "x": 9.75, "y": 5}, + {"matrix": [9, 4], "x": 10.75, "y": 4.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4}, + {"matrix": [9, 2], "x": 12.75, "y": 4.5}, + {"matrix": [9, 1], "x": 13.75, "y": 4.75}, + {"matrix": [9, 0], "x": 14.75, "y": 4.75} ] } } diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c index d418313374..55d8c3c558 100644 --- a/keyboards/nacly/sodium62/sodium62.c +++ b/keyboards/nacly/sodium62/sodium62.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "sodium62.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h deleted file mode 100644 index 7db1002333..0000000000 --- a/keyboards/nacly/sodium62/sodium62.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, KC_NO }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index e8361decda..5c61b6f5fe 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -23,7 +23,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.7}, + + {"matrix": [6, 5], "x": 9, "y": 0.7}, + {"matrix": [6, 4], "x": 10, "y": 0.35}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0.35}, + {"matrix": [6, 1], "x": 13, "y": 0.6}, + {"matrix": [6, 0], "x": 14, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.7}, + + {"matrix": [7, 5], "x": 9, "y": 1.7}, + {"matrix": [7, 4], "x": 10, "y": 1.35}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1.35}, + {"matrix": [7, 1], "x": 13, "y": 1.6}, + {"matrix": [7, 0], "x": 14, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.7}, + + {"matrix": [8, 5], "x": 9, "y": 2.7}, + {"matrix": [8, 4], "x": 10, "y": 2.35}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2.35}, + {"matrix": [8, 1], "x": 13, "y": 2.6}, + {"matrix": [8, 0], "x": 14, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.35}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.7}, + + {"matrix": [9, 5], "x": 9, "y": 3.7}, + {"matrix": [9, 4], "x": 10, "y": 3.35}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3.35}, + {"matrix": [9, 1], "x": 13, "y": 3.6}, + {"matrix": [9, 0], "x": 14, "y": 3.6}, + + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.35}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.35}, + {"matrix": [4, 5], "x": 5, "y": 4.7}, + {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5}, + + {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5}, + {"matrix": [10, 5], "x": 9, "y": 4.7}, + {"matrix": [10, 4], "x": 10, "y": 4.35}, + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 12, "y": 4.35}, + {"matrix": [10, 1], "x": 13, "y": 4.6}, + {"matrix": [10, 0], "x": 14, "y": 4.6} + ] } } - } +} diff --git a/keyboards/nacly/splitreus62/splitreus62.h b/keyboards/nacly/splitreus62/splitreus62.h deleted file mode 100644 index bc6c2a9131..0000000000 --- a/keyboards/nacly/splitreus62/splitreus62.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L55, R55, R45, R44, R43, R42, R41, R40 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R55 } \ -} diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index 82e284ebe7..383825414b 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -17,7 +17,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.7}, + + {"matrix": [0, 7], "x": 9, "y": 0.7}, + {"matrix": [0, 8], "x": 10, "y": 0.35}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.35}, + {"matrix": [0, 11], "x": 13, "y": 0.6}, + {"matrix": [0, 12], "x": 14, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.7}, + + {"matrix": [1, 7], "x": 9, "y": 1.7}, + {"matrix": [1, 8], "x": 10, "y": 1.35}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.35}, + {"matrix": [1, 11], "x": 13, "y": 1.6}, + {"matrix": [1, 12], "x": 14, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.7}, + + {"matrix": [2, 7], "x": 9, "y": 2.7}, + {"matrix": [2, 8], "x": 10, "y": 2.35}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.35}, + {"matrix": [2, 11], "x": 13, "y": 2.6}, + {"matrix": [2, 12], "x": 14, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.35}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.7}, + + {"matrix": [3, 7], "x": 9, "y": 3.7}, + {"matrix": [3, 8], "x": 10, "y": 3.35}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.35}, + {"matrix": [3, 11], "x": 13, "y": 3.6}, + {"matrix": [3, 12], "x": 14, "y": 3.6}, + + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.35}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.35}, + {"matrix": [4, 5], "x": 5, "y": 4.7}, + {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5}, + + {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5}, + {"matrix": [4, 7], "x": 9, "y": 4.7}, + {"matrix": [4, 8], "x": 10, "y": 4.35}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4.35}, + {"matrix": [4, 11], "x": 13, "y": 4.6}, + {"matrix": [4, 12], "x": 14, "y": 4.6} + ] } } - } +} diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h deleted file mode 100644 index 4509bbff3d..0000000000 --- a/keyboards/nacly/ua62/ua62.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 NaCly - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -/* This 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( \ - 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, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k47, k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d }, \ -} -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/nacly/sodium50/info.json | 2 +- keyboards/nacly/sodium62/info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 920a2f946f..aa60255b0d 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -81,4 +81,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 8632bfabdf..94c812dd95 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -95,4 +95,4 @@ ] } } -} \ No newline at end of file +} -- cgit v1.2.3