diff options
Diffstat (limited to 'keyboards/ada/ada1800mini')
| -rw-r--r-- | keyboards/ada/ada1800mini/ada1800mini.c | 4 | ||||
| -rw-r--r-- | keyboards/ada/ada1800mini/ada1800mini.h | 38 | ||||
| -rw-r--r-- | keyboards/ada/ada1800mini/config.h | 20 | ||||
| -rw-r--r-- | keyboards/ada/ada1800mini/info.json | 161 |
4 files changed, 91 insertions, 132 deletions
diff --git a/keyboards/ada/ada1800mini/ada1800mini.c b/keyboards/ada/ada1800mini/ada1800mini.c deleted file mode 100644 index a7d8ead5df..0000000000 --- a/keyboards/ada/ada1800mini/ada1800mini.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "ada1800mini.h" diff --git a/keyboards/ada/ada1800mini/ada1800mini.h b/keyboards/ada/ada1800mini/ada1800mini.h deleted file mode 100644 index 89ac0beba3..0000000000 --- a/keyboards/ada/ada1800mini/ada1800mini.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 peepeetee - * - * 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, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3C, K3D, K3E, K3B, \ - K40, K41, K42, K43, K46, K47, K48, K4D, K4E, K4A, K4B, K4C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, XXX, XXX, K46, K47, K48, XXX, K4A, K4B, K4C, K4D, K4E }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h index 54da0bdad4..9465ac1b01 100644 --- a/keyboards/ada/ada1800mini/config.h +++ b/keyboards/ada/ada1800mini/config.h @@ -16,26 +16,7 @@ #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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 } - -#define DIODE_DIRECTION COL2ROW - - //TODO: implement RGB matrix when I get the hardware -#define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 100 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index e3f97c6706..780afec336 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -8,81 +8,102 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (D0,F1)", "x": 0, "y": 0 }, - { "label": "K01 (D0,F4)", "x": 1.25, "y": 0 }, - { "label": "K02 (D0,F5)", "x": 2.25, "y": 0 }, - { "label": "K03 (D0,F6)", "x": 3.25, "y": 0 }, - { "label": "K04 (D0,F7)", "x": 4.5, "y": 0 }, - { "label": "K05 (D0,C7)", "x": 5.5, "y": 0 }, - { "label": "K06 (D0,C6)", "x": 6.5, "y": 0 }, - { "label": "K07 (D0,B6)", "x": 7.5, "y": 0 }, - { "label": "K08 (D0,B5)", "x": 8.75, "y": 0 }, - { "label": "K09 (D0,B4)", "x": 9.75, "y": 0 }, - { "label": "K0A (D0,D7)", "x": 10.75, "y": 0 }, - { "label": "K0B (D0,D6)", "x": 12, "y": 0 }, - { "label": "K0C (D0,B3)", "x": 13.5, "y": 0 }, - { "label": "K0D (D0,B2)", "x": 14.5, "y": 0 }, - { "label": "K0E (D0,B1)", "x": 15.5, "y": 0 }, - { "label": "K10 (D1,F1)", "x": 0, "y": 1.25, "w": 1.5 }, - { "label": "K11 (D1,F4)", "x": 1.5, "y": 1.25 }, - { "label": "K12 (D1,F5)", "x": 2.5, "y": 1.25 }, - { "label": "K13 (D1,F6)", "x": 3.5, "y": 1.25 }, - { "label": "K14 (D1,F7)", "x": 4.5, "y": 1.25 }, - { "label": "K15 (D1,C7)", "x": 5.5, "y": 1.25 }, - { "label": "K16 (D1,C6)", "x": 6.5, "y": 1.25 }, - { "label": "K17 (D1,B6)", "x": 7.5, "y": 1.25 }, - { "label": "K18 (D1,B5)", "x": 8.5, "y": 1.25 }, - { "label": "K19 (D1,B4)", "x": 9.5, "y": 1.25 }, - { "label": "K1A (D1,D7)", "x": 10.5, "y": 1.25 }, - { "label": "K1B (D1,D6)", "x": 11.5, "y": 1.25, "w": 1.5 }, - { "label": "K1C (D1,B3)", "x": 13.5, "y": 1.25 }, - { "label": "K1D (D1,B2)", "x": 14.5, "y": 1.25 }, - { "label": "K1E (D1,B1)", "x": 15.5, "y": 1.25 }, - { "label": "K20 (D2,F1)", "x": 0, "y": 2.25, "w": 1.75 }, - { "label": "K21 (D2,F4)", "x": 1.75, "y": 2.25 }, - { "label": "K22 (D2,F5)", "x": 2.75, "y": 2.25 }, - { "label": "K23 (D2,F6)", "x": 3.75, "y": 2.25 }, - { "label": "K24 (D2,F7)", "x": 4.75, "y": 2.25 }, - { "label": "K25 (D2,C7)", "x": 5.75, "y": 2.25 }, - { "label": "K26 (D2,C6)", "x": 6.75, "y": 2.25 }, - { "label": "K27 (D2,B6)", "x": 7.75, "y": 2.25 }, - { "label": "K28 (D2,B5)", "x": 8.75, "y": 2.25 }, - { "label": "K29 (D2,B4)", "x": 9.75, "y": 2.25 }, - { "label": "K2A (D2,D7)", "x": 10.75, "y": 2.25, "w": 2.25 }, - { "label": "K2C (D2,B3)", "x": 13.5, "y": 2.25 }, - { "label": "K2D (D2,B2)", "x": 14.5, "y": 2.25 }, - { "label": "K2E (D2,B1)", "x": 15.5, "y": 2.25 }, - { "label": "K30 (D3,F1)", "x": 0, "y": 3.25, "w": 2.25 }, - { "label": "K31 (D3,F4)", "x": 2.25, "y": 3.25 }, - { "label": "K32 (D3,F5)", "x": 3.25, "y": 3.25 }, - { "label": "K33 (D3,F6)", "x": 4.25, "y": 3.25 }, - { "label": "K34 (D3,F7)", "x": 5.25, "y": 3.25 }, - { "label": "K35 (D3,C7)", "x": 6.25, "y": 3.25 }, - { "label": "K36 (D3,C6)", "x": 7.25, "y": 3.25 }, - { "label": "K37 (D3,B6)", "x": 8.25, "y": 3.25 }, - { "label": "K38 (D3,B5)", "x": 9.25, "y": 3.25 }, - { "label": "K39 (D3,B4)", "x": 10.25, "y": 3.25, "w": 1.75 }, - { "label": "K3C (D3,B3)", "x": 13.5, "y": 3.25 }, - { "label": "K3D (D3,B2)", "x": 14.5, "y": 3.25 }, - { "label": "K3E (D3,B1)", "x": 15.5, "y": 3.25 }, - { "label": "K3B (D3,D6)", "x": 12.25, "y": 3.5 }, - { "label": "K40 (D5,F1)", "x": 0, "y": 4.25, "w": 1.25 }, - { "label": "K41 (D5,F4)", "x": 1.25, "y": 4.25, "w": 1.25 }, - { "label": "K42 (D5,F5)", "x": 2.5, "y": 4.25, "w": 1.25 }, - { "label": "K43 (D5,F6)", "x": 3.75, "y": 4.25, "w": 2.75 }, - { "label": "K46 (D5,C6)", "x": 6.5, "y": 4.25, "w": 2.25 }, - { "label": "K47 (D5,B6)", "x": 8.75, "y": 4.25 }, - { "label": "K48 (D5,B5)", "x": 9.75, "y": 4.25, "w": 1.25 }, - { "label": "K4D (D5,B2)", "x": 14.5, "y": 4.25 }, - { "label": "K4E (D5,B1)", "x": 15.5, "y": 4.25 }, - { "label": "K4A (D5,D7)", "x": 11.25, "y": 4.5 }, - { "label": "K4B (D5,D6)", "x": 12.25, "y": 4.5 }, - { "label": "K4C (D5,B3)", "x": 13.25, "y": 4.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + + {"matrix": [0, 11], "x": 12, "y": 0}, + + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 1.25}, + {"matrix": [1, 4], "x": 4.5, "y": 1.25}, + {"matrix": [1, 5], "x": 5.5, "y": 1.25}, + {"matrix": [1, 6], "x": 6.5, "y": 1.25}, + {"matrix": [1, 7], "x": 7.5, "y": 1.25}, + {"matrix": [1, 8], "x": 8.5, "y": 1.25}, + {"matrix": [1, 9], "x": 9.5, "y": 1.25}, + {"matrix": [1, 10], "x": 10.5, "y": 1.25}, + {"matrix": [1, 11], "x": 11.5, "y": 1.25, "w": 1.5}, + + {"matrix": [1, 12], "x": 13.5, "y": 1.25}, + {"matrix": [1, 13], "x": 14.5, "y": 1.25}, + {"matrix": [1, 14], "x": 15.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.25}, + {"matrix": [2, 2], "x": 2.75, "y": 2.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2.25}, + {"matrix": [2, 4], "x": 4.75, "y": 2.25}, + {"matrix": [2, 5], "x": 5.75, "y": 2.25}, + {"matrix": [2, 6], "x": 6.75, "y": 2.25}, + {"matrix": [2, 7], "x": 7.75, "y": 2.25}, + {"matrix": [2, 8], "x": 8.75, "y": 2.25}, + {"matrix": [2, 9], "x": 9.75, "y": 2.25}, + {"matrix": [2, 10], "x": 10.75, "y": 2.25, "w": 2.25}, + + {"matrix": [2, 12], "x": 13.5, "y": 2.25}, + {"matrix": [2, 13], "x": 14.5, "y": 2.25}, + {"matrix": [2, 14], "x": 15.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3.25}, + {"matrix": [3, 7], "x": 8.25, "y": 3.25}, + {"matrix": [3, 8], "x": 9.25, "y": 3.25}, + {"matrix": [3, 9], "x": 10.25, "y": 3.25, "w": 1.75}, + {"matrix": [3, 12], "x": 13.5, "y": 3.25}, + {"matrix": [3, 13], "x": 14.5, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3.25}, + + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 6], "x": 6.5, "y": 4.25, "w": 2.25}, + {"matrix": [4, 7], "x": 8.75, "y": 4.25}, + {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 1.25}, + {"matrix": [4, 13], "x": 14.5, "y": 4.25}, + {"matrix": [4, 14], "x": 15.5, "y": 4.25}, + + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.5} ] } } |