summaryrefslogtreecommitdiff
path: root/keyboards/handwired/d48
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/d48')
-rw-r--r--keyboards/handwired/d48/config.h10
-rw-r--r--keyboards/handwired/d48/d48.c1
-rw-r--r--keyboards/handwired/d48/d48.h19
-rw-r--r--keyboards/handwired/d48/info.json109
-rw-r--r--keyboards/handwired/d48/taphold.h2
5 files changed, 61 insertions, 80 deletions
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 23dbfa831c..64364451ff 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -1,17 +1,7 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 }
-
-#define MATRIX_COL_PINS { A2, B0, A7, A8, A13, A14, B12, B11, B10, B15, B14, B13 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow */
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A15
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/d48/d48.c b/keyboards/handwired/d48/d48.c
deleted file mode 100644
index 3cc2097bf8..0000000000
--- a/keyboards/handwired/d48/d48.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "d48.h"
diff --git a/keyboards/handwired/d48/d48.h b/keyboards/handwired/d48/d48.h
deleted file mode 100644
index b698ca187f..0000000000
--- a/keyboards/handwired/d48/d48.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- K08, 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, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B \
-) { \
- { ___, ___, ___, ___, ___, ___, ___, ___, K08, ___, ___, 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 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B } \
-}
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index c607f21937..db3f2bbacc 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A15"
+ },
+ "matrix_pins": {
+ "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
+ "rows": ["B8", "B9", "B1", "B2", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "A6"},
@@ -20,60 +28,61 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":8, "y":0},
- {"x":11, "y":0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "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},
+ {"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},
- {"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},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":7, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h
index 3bc5ca0275..2a691aa63f 100644
--- a/keyboards/handwired/d48/taphold.h
+++ b/keyboards/handwired/d48/taphold.h
@@ -1,3 +1,5 @@
+#pragma once
+
#include "quantum.h"
typedef enum taphold_mode_t {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 01:49:07 +0000