diff options
Diffstat (limited to 'keyboards/nix_studio')
| -rw-r--r-- | keyboards/nix_studio/n60_a/config.h | 32 | ||||
| -rw-r--r-- | keyboards/nix_studio/n60_a/info.json | 5 | ||||
| -rw-r--r-- | keyboards/nix_studio/n60_a/n60_a.c | 16 | ||||
| -rw-r--r-- | keyboards/nix_studio/oxalys80/config.h | 17 | ||||
| -rw-r--r-- | keyboards/nix_studio/oxalys80/info.json | 5 | 
5 files changed, 10 insertions, 65 deletions
| diff --git a/keyboards/nix_studio/n60_a/config.h b/keyboards/nix_studio/n60_a/config.h deleted file mode 100644 index 871856ed65..0000000000 --- a/keyboards/nix_studio/n60_a/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright Nix Studio & Valdiieee -  *  -  * 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) - * - */ -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json index 73fe121551..7d8f44b432 100644 --- a/keyboards/nix_studio/n60_a/info.json +++ b/keyboards/nix_studio/n60_a/info.json @@ -8,6 +8,11 @@          "pid": "0x3630",          "device_version": "0.0.1"      }, +    "matrix_pins": { +        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], +        "rows": ["E6", "B7", "F7", "F4", "F5"] +    }, +    "diode_direction": "COL2ROW",      "processor": "atmega32u4",      "bootloader": "atmel-dfu",      "layouts": { diff --git a/keyboards/nix_studio/n60_a/n60_a.c b/keyboards/nix_studio/n60_a/n60_a.c deleted file mode 100644 index 9a5563cb89..0000000000 --- a/keyboards/nix_studio/n60_a/n60_a.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright Nix Studio & Valdiieee -  *  -  * 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 "n60_a.h" diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h index fa337fe426..fe3a23e110 100644 --- a/keyboards/nix_studio/oxalys80/config.h +++ b/keyboards/nix_studio/oxalys80/config.h @@ -16,23 +16,6 @@  #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 { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW -  /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */  #define LOCKING_SUPPORT_ENABLE  /* Locking resynchronize hack */ diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json index 64e491cc41..ae8c7cae00 100644 --- a/keyboards/nix_studio/oxalys80/info.json +++ b/keyboards/nix_studio/oxalys80/info.json @@ -8,6 +8,11 @@          "pid": "0x3830",          "device_version": "0.0.1"      }, +    "matrix_pins": { +        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], +        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] +    }, +    "diode_direction": "COL2ROW",      "backlight": {          "pin": "B7"      }, | 
