summaryrefslogtreecommitdiff
path: root/keyboards/handwired/amigopunk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/amigopunk')
-rw-r--r--keyboards/handwired/amigopunk/amigopunk.c17
-rw-r--r--keyboards/handwired/amigopunk/amigopunk.h35
-rw-r--r--keyboards/handwired/amigopunk/config.h8
-rw-r--r--keyboards/handwired/amigopunk/info.json171
4 files changed, 91 insertions, 140 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/amigopunk.h b/keyboards/handwired/amigopunk/amigopunk.h
deleted file mode 100644
index 273cd09e3f..0000000000
--- a/keyboards/handwired/amigopunk/amigopunk.h
+++ /dev/null
@@ -1,35 +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.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
- K51, K53, K57, K5B, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, KC_NO, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO }, \
- { KC_NO, K51, KC_NO, K53, KC_NO, KC_NO, KC_NO, K57, KC_NO, KC_NO, KC_NO, K5B, KC_NO, K5D, K5E, K5F, K5G }, \
-}
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..301c358140 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}
+ {"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": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 16], "x": 16, "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": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 2], "x": 1.5, "y": 2},
+ {"matrix": [2, 3], "x": 2.5, "y": 2},
+ {"matrix": [2, 4], "x": 3.5, "y": 2},
+ {"matrix": [2, 5], "x": 4.5, "y": 2},
+ {"matrix": [2, 6], "x": 5.5, "y": 2},
+ {"matrix": [2, 7], "x": 6.5, "y": 2},
+ {"matrix": [2, 8], "x": 7.5, "y": 2},
+ {"matrix": [2, 9], "x": 8.5, "y": 2},
+ {"matrix": [2, 10], "x": 9.5, "y": 2},
+ {"matrix": [2, 11], "x": 10.5, "y": 2},
+ {"matrix": [2, 12], "x": 11.5, "y": 2},
+ {"matrix": [2, 13], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3},
+ {"matrix": [3, 3], "x": 2.75, "y": 3},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3},
+ {"matrix": [3, 7], "x": 6.75, "y": 3},
+ {"matrix": [3, 8], "x": 7.75, "y": 3},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 7], "x": 4, "y": 5, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5}
]
}
}