summaryrefslogtreecommitdiff
path: root/keyboards/40percentclub/4x4
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/40percentclub/4x4')
-rw-r--r--keyboards/40percentclub/4x4/4x4.c1
-rw-r--r--keyboards/40percentclub/4x4/4x4.h58
-rw-r--r--keyboards/40percentclub/4x4/config.h17
-rw-r--r--keyboards/40percentclub/4x4/info.json325
4 files changed, 165 insertions, 236 deletions
diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
deleted file mode 100644
index 8510b358f5..0000000000
--- a/keyboards/40percentclub/4x4/4x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x4.h"
diff --git a/keyboards/40percentclub/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
deleted file mode 100644
index 8cc5a150aa..0000000000
--- a/keyboards/40percentclub/4x4/4x4.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) \
-{ \
- { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x8( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, K17, \
- K20, K21, K22, K23, K24, K25, K26, K27, \
- K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, K34, K35, K35, K37, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x12( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_4x16( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
-}
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index ac308220e4..7caa265c1a 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -2,23 +2,6 @@
#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 { B2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 7864832484..389aad3619 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -8,196 +8,201 @@
"pid": "0x0A0C",
"device_version": "44.4.4"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+ "rows": ["B2", "D1", "D0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]}
]
},
"LAYOUT_ortho_4x8": {
"layout": [
- {"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":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"x":5, "y":0, "matrix": [0, 5]},
+ {"x":6, "y":0, "matrix": [0, 6]},
+ {"x":7, "y":0, "matrix": [0, 7]},
- {"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":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "y":1, "matrix": [1, 5]},
+ {"x":6, "y":1, "matrix": [1, 6]},
+ {"x":7, "y":1, "matrix": [1, 7]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "y":2, "matrix": [2, 5]},
+ {"x":6, "y":2, "matrix": [2, 6]},
+ {"x":7, "y":2, "matrix": [2, 7]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]}
]
},
"LAYOUT_ortho_4x12": {
"layout": [
- {"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":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"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": [0, 10]},
+ {"x":11, "y":0, "matrix": [0, 11]},
- {"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":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "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": [1, 10]},
+ {"x":11, "y":1, "matrix": [1, 11]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "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": [2, 10]},
+ {"x":11, "y":2, "matrix": [2, 11]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]},
+ {"x":8, "y":3, "matrix": [3, 8]},
+ {"x":9, "y":3, "matrix": [3, 9]},
+ {"x":10, "y":3, "matrix": [3, 10]},
+ {"x":11, "y":3, "matrix": [3, 11]}
]
},
"LAYOUT_ortho_4x16": {
"layout": [
- {"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":15, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"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": [0, 10]},
+ {"x":11, "y":0, "matrix": [0, 11]},
+ {"x":12, "y":0, "matrix": [0, 12]},
+ {"x":13, "y":0, "matrix": [0, 13]},
+ {"x":14, "y":0, "matrix": [0, 14]},
+ {"x":15, "y":0, "matrix": [0, 15]},
- {"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},
- {"x":14, "y":1},
- {"x":15, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "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": [1, 10]},
+ {"x":11, "y":1, "matrix": [1, 11]},
+ {"x":12, "y":1, "matrix": [1, 12]},
+ {"x":13, "y":1, "matrix": [1, 13]},
+ {"x":14, "y":1, "matrix": [1, 14]},
+ {"x":15, "y":1, "matrix": [1, 15]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "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": [2, 10]},
+ {"x":11, "y":2, "matrix": [2, 11]},
+ {"x":12, "y":2, "matrix": [2, 12]},
+ {"x":13, "y":2, "matrix": [2, 13]},
+ {"x":14, "y":2, "matrix": [2, 14]},
+ {"x":15, "y":2, "matrix": [2, 15]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
- {"x":15, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]},
+ {"x":8, "y":3, "matrix": [3, 8]},
+ {"x":9, "y":3, "matrix": [3, 9]},
+ {"x":10, "y":3, "matrix": [3, 10]},
+ {"x":11, "y":3, "matrix": [3, 11]},
+ {"x":12, "y":3, "matrix": [3, 12]},
+ {"x":13, "y":3, "matrix": [3, 13]},
+ {"x":14, "y":3, "matrix": [3, 14]},
+ {"x":15, "y":3, "matrix": [3, 15]}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 02:27:38 +0000