diff options
Diffstat (limited to 'keyboards/tunks/ergo33')
-rw-r--r-- | keyboards/tunks/ergo33/config.h | 12 | ||||
-rw-r--r-- | keyboards/tunks/ergo33/ergo33.c | 17 | ||||
-rw-r--r-- | keyboards/tunks/ergo33/ergo33.h | 57 | ||||
-rw-r--r-- | keyboards/tunks/ergo33/info.json | 53 |
4 files changed, 47 insertions, 92 deletions
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h index 04db2f1665..5ab6f8a347 100644 --- a/keyboards/tunks/ergo33/config.h +++ b/keyboards/tunks/ergo33/config.h @@ -16,19 +16,7 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom -*/ -#define MATRIX_ROW_PINS { F0, F1, B5, B4, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6 } - -#define DIODE_DIRECTION COL2ROW - /* Underglow + top RGB configuration */ -#define RGB_DI_PIN D4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tunks/ergo33/ergo33.c b/keyboards/tunks/ergo33/ergo33.c deleted file mode 100644 index 9426558167..0000000000 --- a/keyboards/tunks/ergo33/ergo33.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Mika Kuitunen - * - * 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 "ergo33.h" diff --git a/keyboards/tunks/ergo33/ergo33.h b/keyboards/tunks/ergo33/ergo33.h deleted file mode 100644 index d3deb97485..0000000000 --- a/keyboards/tunks/ergo33/ergo33.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 Mika Kuitunen - * - * 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" - -/* 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. - */ - -/* Matrix layout - * ,---------. - * | 00 | 01 |------------------------. - * |----|----| 02 | 03 | 04 | 05 | 06 | - * | 10 | 11 |----|----|----|----|----| - * |----|----| 12 | 13 | 14 | 14 | 16 | - * | 20 | 21 |----|----|----|----|----| - * |----|----| 22 | 23 | 24 | 25 | 26 | - * | 30 | 31 |----|----|----|----|----| ,----. - * |----|----| 32 | 33 | 34 | 35 | 36 | | 46 | - * | 40 | 41 |---------------------------|----' - * `---------' | 43 | 44 | 45 | - * `--------------' - */ - -#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, k46, \ - k43, k44, k45 \ -) \ -{ \ - { 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, KC_NO, k43, k44, k45, k46 } \ -} diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json index 1495d5137a..afca170abd 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/info.json @@ -7,6 +7,14 @@ "pid": "0xA0A1", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6"], + "rows": ["F0", "F1", "B5", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "D3"} @@ -17,12 +25,45 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, {"x": 1, "y": 0}, {"x": 2, "y": 0.4}, {"x": 3, "y": 0.3}, {"x": 4, "y": 0.4}, {"x": 5, "y": 0.5}, {"x": 6, "y": 0.5}, - {"x": 0, "y": 1}, {"x": 1, "y": 1}, {"x": 2, "y": 1.4}, {"x": 3, "y": 1.3}, {"x": 4, "y": 1.4}, {"x": 5, "y": 1.5}, {"x": 6, "y": 1.5}, - {"x": 0, "y": 2}, {"x": 1, "y": 2}, {"x": 2, "y": 2.4}, {"x": 3, "y": 2.3}, {"x": 4, "y": 2.4}, {"x": 5, "y": 2.5}, {"x": 6, "y": 2.5}, - {"x": 0, "y": 3}, {"x": 1, "y": 3}, {"x": 2, "y": 3.4}, {"x": 3, "y": 3.3}, {"x": 4, "y": 3.4}, {"x": 5, "y": 3.5}, {"x": 6, "y": 3.5}, - {"x": 0, "y": 4}, {"x": 1, "y": 4}, {"x": 8, "y": 3.5}, - {"x": 4.7, "y": 4.7}, {"x": 5.8, "y": 4.7}, {"x": 6.8, "y": 4.8} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0.4}, + {"matrix": [0, 3], "x": 3, "y": 0.3}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1.4}, + {"matrix": [1, 3], "x": 3, "y": 1.3}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2.4}, + {"matrix": [2, 3], "x": 3, "y": 2.3}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3.4}, + {"matrix": [3, 3], "x": 3, "y": 3.3}, + {"matrix": [3, 4], "x": 4, "y": 3.4}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 6], "x": 8, "y": 3.5}, + + {"matrix": [4, 3], "x": 4.7, "y": 4.7}, + {"matrix": [4, 4], "x": 5.8, "y": 4.7}, + {"matrix": [4, 5], "x": 6.8, "y": 4.8} ] } } |