diff options
Diffstat (limited to 'keyboards/handwired/amigopunk')
| -rw-r--r-- | keyboards/handwired/amigopunk/amigopunk.c | 17 | ||||
| -rw-r--r-- | keyboards/handwired/amigopunk/config.h | 8 | ||||
| -rw-r--r-- | keyboards/handwired/amigopunk/info.json | 171 |
3 files changed, 91 insertions, 105 deletions
diff --git a/keyboards/handwired/amigopunk/amigopunk.c b/keyboards/handwired/amigopunk/amigopunk.c deleted file mode 100644 index dbb70415ac..0000000000 --- a/keyboards/handwired/amigopunk/amigopunk.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "amigopunk.h" diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h index 2cbbb3152a..bcdca4920c 100644 --- a/keyboards/handwired/amigopunk/config.h +++ b/keyboards/handwired/amigopunk/config.h @@ -16,14 +16,6 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 } -#define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json index e79911a676..c3d96e0771 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/info.json @@ -8,6 +8,11 @@ "pid": "0x1805", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], + "rows": ["C0", "C1", "C2", "C3", "C4", "C5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E0", "pin_b": "E1"} @@ -18,86 +23,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C0,B6)", "x":0, "y":0.25}, - {"label":"K01 (C0,B5)", "x":1, "y":0.25}, - {"label":"K02 (C0,B4)", "x":2, "y":0.25}, - {"label":"K03 (C0,B3)", "x":3, "y":0.25}, - {"label":"K04 (C0,B2)", "x":4, "y":0.25}, - {"label":"K05 (C0,B1)", "x":5, "y":0.25}, - {"label":"K06 (C0,B0)", "x":6, "y":0.25}, - {"label":"K07 (C0,E7)", "x":7, "y":0.25}, - {"label":"K08 (C0,E6)", "x":8, "y":0.25}, - {"label":"K09 (C0,F0)", "x":9, "y":0.25}, - {"label":"K0A (C0,F1)", "x":10, "y":0.25}, - {"label":"K0B (C0,F2)", "x":11, "y":0.25}, - {"label":"K0C (C0,F3)", "x":12, "y":0.25}, - {"label":"K0D (C0,F4)", "x":13, "y":0.25}, - {"label":"K0E (C0,F5)", "x":14, "y":0.25}, - {"label":"K0G (C0,F7)", "x":16, "y":0.25}, - {"label":"K10 (C1,B6)", "x":0, "y":1.25}, - {"label":"K11 (C1,B5)", "x":1, "y":1.25}, - {"label":"K12 (C1,B4)", "x":2, "y":1.25}, - {"label":"K13 (C1,B3)", "x":3, "y":1.25}, - {"label":"K14 (C1,B2)", "x":4, "y":1.25}, - {"label":"K15 (C1,B1)", "x":5, "y":1.25}, - {"label":"K16 (C1,B0)", "x":6, "y":1.25}, - {"label":"K17 (C1,E7)", "x":7, "y":1.25}, - {"label":"K18 (C1,E6)", "x":8, "y":1.25}, - {"label":"K19 (C1,F0)", "x":9, "y":1.25}, - {"label":"K1A (C1,F1)", "x":10, "y":1.25}, - {"label":"K1B (C1,F2)", "x":11, "y":1.25}, - {"label":"K1C (C1,F3)", "x":12, "y":1.25}, - {"label":"K1E (C1,F5)", "x":13, "y":1.25, "w":2}, - {"label":"K1F (C1,F6)", "x":15, "y":1.25}, - {"label":"K20 (C2,B6)", "x":0, "y":2.25, "w":1.5}, - {"label":"K22 (C2,B4)", "x":1.5, "y":2.25}, - {"label":"K23 (C2,B3)", "x":2.5, "y":2.25}, - {"label":"K24 (C2,B2)", "x":3.5, "y":2.25}, - {"label":"K25 (C2,B1)", "x":4.5, "y":2.25}, - {"label":"K26 (C2,B0)", "x":5.5, "y":2.25}, - {"label":"K27 (C2,E7)", "x":6.5, "y":2.25}, - {"label":"K28 (C2,E6)", "x":7.5, "y":2.25}, - {"label":"K29 (C2,F0)", "x":8.5, "y":2.25}, - {"label":"K2A (C2,F1)", "x":9.5, "y":2.25}, - {"label":"K2B (C2,F2)", "x":10.5, "y":2.25}, - {"label":"K2C (C2,F3)", "x":11.5, "y":2.25}, - {"label":"K2D (C2,F4)", "x":12.5, "y":2.25}, - {"label":"K2E (C2,F5)", "x":13.5, "y":2.25, "w":1.5}, - {"label":"K2F (C2,F6)", "x":15, "y":2.25}, - {"label":"K30 (C3,B6)", "x":0, "y":3.25, "w":1.75}, - {"label":"K32 (C3,B4)", "x":1.75, "y":3.25}, - {"label":"K33 (C3,B3)", "x":2.75, "y":3.25}, - {"label":"K34 (C3,B2)", "x":3.75, "y":3.25}, - {"label":"K35 (C3,B1)", "x":4.75, "y":3.25}, - {"label":"K36 (C3,B0)", "x":5.75, "y":3.25}, - {"label":"K37 (C3,E7)", "x":6.75, "y":3.25}, - {"label":"K38 (C3,E6)", "x":7.75, "y":3.25}, - {"label":"K39 (C3,F0)", "x":8.75, "y":3.25}, - {"label":"K3A (C3,F1)", "x":9.75, "y":3.25}, - {"label":"K3B (C3,F2)", "x":10.75, "y":3.25}, - {"label":"K3C (C3,F3)", "x":11.75, "y":3.25}, - {"label":"K3D (C3,F4)", "x":12.75, "y":3.25, "w":2.25}, - {"label":"K41 (C4,B5)", "x":0, "y":4.25, "w":2.25}, - {"label":"K42 (C4,B4)", "x":2.25, "y":4.25}, - {"label":"K43 (C4,B3)", "x":3.25, "y":4.25}, - {"label":"K44 (C4,B2)", "x":4.25, "y":4.25}, - {"label":"K45 (C4,B1)", "x":5.25, "y":4.25}, - {"label":"K46 (C4,B0)", "x":6.25, "y":4.25}, - {"label":"K47 (C4,E7)", "x":7.25, "y":4.25}, - {"label":"K48 (C4,E6)", "x":8.25, "y":4.25}, - {"label":"K49 (C4,F0)", "x":9.25, "y":4.25}, - {"label":"K4A (C4,F1)", "x":10.25, "y":4.25}, - {"label":"K4B (C4,F2)", "x":11.25, "y":4.25}, - {"label":"K4D (C4,F4)", "x":12.25, "y":4.25, "w":2.75}, - {"label":"K4F (C4,F6)", "x":15, "y":4.25}, - {"label":"K51 (C5,B5)", "x":1, "y":5.25, "w":1.5}, - {"label":"K53 (C5,B3)", "x":2.5, "y":5.25, "w":1.5}, - {"label":"K57 (C5,E7)", "x":4, "y":5.25, "w":7}, - {"label":"K5B (C5,F2)", "x":11, "y":5.25, "w":1.5}, - {"label":"K5D (C5,F4)", "x":12.5, "y":5.25, "w":1.5}, - {"label":"K5E (C5,F5)", "x":14, "y":5.25}, - {"label":"K5F (C5,F6)", "x":15, "y":5.25}, - {"label":"K5G (C5,F7)", "x":16, "y":5.25} + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":16, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + {"x":10, "y":1}, + {"x":11, "y":1}, + {"x":12, "y":1}, + {"x":13, "y":1, "w":2}, + {"x":15, "y":1}, + + {"x":0, "y":2, "w":1.5}, + {"x":1.5, "y":2}, + {"x":2.5, "y":2}, + {"x":3.5, "y":2}, + {"x":4.5, "y":2}, + {"x":5.5, "y":2}, + {"x":6.5, "y":2}, + {"x":7.5, "y":2}, + {"x":8.5, "y":2}, + {"x":9.5, "y":2}, + {"x":10.5, "y":2}, + {"x":11.5, "y":2}, + {"x":12.5, "y":2}, + {"x":13.5, "y":2, "w":1.5}, + {"x":15, "y":2}, + + {"x":0, "y":3, "w":1.75}, + {"x":1.75, "y":3}, + {"x":2.75, "y":3}, + {"x":3.75, "y":3}, + {"x":4.75, "y":3}, + {"x":5.75, "y":3}, + {"x":6.75, "y":3}, + {"x":7.75, "y":3}, + {"x":8.75, "y":3}, + {"x":9.75, "y":3}, + {"x":10.75, "y":3}, + {"x":11.75, "y":3}, + {"x":12.75, "y":3, "w":2.25}, + + {"x":0, "y":4, "w":2.25}, + {"x":2.25, "y":4}, + {"x":3.25, "y":4}, + {"x":4.25, "y":4}, + {"x":5.25, "y":4}, + {"x":6.25, "y":4}, + {"x":7.25, "y":4}, + {"x":8.25, "y":4}, + {"x":9.25, "y":4}, + {"x":10.25, "y":4}, + {"x":11.25, "y":4}, + {"x":12.25, "y":4, "w":2.75}, + {"x":15, "y":4}, + + {"x":1, "y":5, "w":1.5}, + {"x":2.5, "y":5, "w":1.5}, + {"x":4, "y":5, "w":7}, + {"x":11, "y":5, "w":1.5}, + {"x":12.5, "y":5, "w":1.5}, + {"x":14, "y":5}, + {"x":15, "y":5}, + {"x":16, "y":5} ] } } |