diff options
Diffstat (limited to 'keyboards/tominabox1/le_chiffre/rev1')
-rw-r--r-- | keyboards/tominabox1/le_chiffre/rev1/config.h | 35 | ||||
-rw-r--r-- | keyboards/tominabox1/le_chiffre/rev1/info.json | 60 | ||||
-rw-r--r-- | keyboards/tominabox1/le_chiffre/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/tominabox1/le_chiffre/rev1/rev1.h | 33 | ||||
-rw-r--r-- | keyboards/tominabox1/le_chiffre/rev1/rules.mk | 1 |
5 files changed, 60 insertions, 71 deletions
diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h deleted file mode 100644 index db5d26d665..0000000000 --- a/keyboards/tominabox1/le_chiffre/rev1/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 { B3, D4, F1, C6 } -#define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 } - -/* - * WS2812 Underglow Matrix options - */ -#define RGB_DI_PIN F0 diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json index ce90b22975..5222f4ea51 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/info.json +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -2,11 +2,69 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"], + "rows": ["B3", "D4", "F1", "C6"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "D3"} ] }, + "rgb_matrix": { + "driver": "WS2812" + }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "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": [3, 8], "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": [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": 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": [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": 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": [3, 2], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/tominabox1/le_chiffre/rev1/rev1.c b/keyboards/tominabox1/le_chiffre/rev1/rev1.c index e3b2b014f4..66b0eb2f08 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/rev1.c +++ b/keyboards/tominabox1/le_chiffre/rev1/rev1.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 "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/tominabox1/le_chiffre/rev1/rev1.h b/keyboards/tominabox1/le_chiffre/rev1/rev1.h deleted file mode 100644 index 0277e1b42d..0000000000 --- a/keyboards/tominabox1/le_chiffre/rev1/rev1.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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, K38, 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, \ - K32, K34, K35, K37 \ -) \ -{ \ - { 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 }, \ - { XXX, XXX, K32, XXX, K34, K35, XXX, K37, K38, XXX } \ -} diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk index c1a9ea0595..7d791dd396 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk +++ b/keyboards/tominabox1/le_chiffre/rev1/rules.mk @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes |