diff options
Diffstat (limited to 'keyboards/latincompass/latin6rgb')
-rw-r--r-- | keyboards/latincompass/latin6rgb/config.h | 18 | ||||
-rw-r--r-- | keyboards/latincompass/latin6rgb/info.json | 21 | ||||
-rw-r--r-- | keyboards/latincompass/latin6rgb/latin6rgb.c | 2 | ||||
-rw-r--r-- | keyboards/latincompass/latin6rgb/latin6rgb.h | 30 | ||||
-rw-r--r-- | keyboards/latincompass/latin6rgb/rules.mk | 1 |
5 files changed, 16 insertions, 56 deletions
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h index 3d04d581ce..1a6518c897 100644 --- a/keyboards/latincompass/latin6rgb/config.h +++ b/keyboards/latincompass/latin6rgb/config.h @@ -17,24 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ - -/* - * 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 {C7, C6 } -#define MATRIX_COL_PINS {F7, F6, F5} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json index 2ab390e119..dd7cfc232d 100644 --- a/keyboards/latincompass/latin6rgb/info.json +++ b/keyboards/latincompass/latin6rgb/info.json @@ -8,18 +8,27 @@ "pid": "0x7C96", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5"], + "rows": ["C7", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, "layouts": { "LAYOUT_numpad_2x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} ] } } diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c index cc10a7b334..b7c05dd4ad 100644 --- a/keyboards/latincompass/latin6rgb/latin6rgb.c +++ b/keyboards/latincompass/latin6rgb/latin6rgb.c @@ -13,7 +13,7 @@ * 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 "latin6rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.h b/keyboards/latincompass/latin6rgb/latin6rgb.h deleted file mode 100644 index 6feae9493a..0000000000 --- a/keyboards/latincompass/latin6rgb/latin6rgb.h +++ /dev/null @@ -1,30 +0,0 @@ - /* Copyright 2021 18438880 - * - * 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_numpad_2x3( \ - K00, K01, K02,\ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 } \ -} - -#define LAYOUT_pad numpad_2x3 diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk index dc0e116999..f3108efe8b 100644 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ b/keyboards/latincompass/latin6rgb/rules.mk @@ -14,6 +14,5 @@ AUDIO_ENABLE = no # Audio output NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 RGB_MATRIX_SUPPORTED = yes |