summaryrefslogtreecommitdiff
path: root/keyboards/handwired/skakunm_dactyl
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/skakunm_dactyl')
-rw-r--r--keyboards/handwired/skakunm_dactyl/config.h12
-rw-r--r--keyboards/handwired/skakunm_dactyl/info.json93
-rw-r--r--keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c4
-rw-r--r--keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h25
4 files changed, 53 insertions, 81 deletions
diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h
index 2e01a71d28..8b04fcdc71 100644
--- a/keyboards/handwired/skakunm_dactyl/config.h
+++ b/keyboards/handwired/skakunm_dactyl/config.h
@@ -4,13 +4,6 @@
#pragma once
-
-// wiring of each half
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* mouse config */
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
@@ -26,11 +19,6 @@
/* Enables This makes it easier for fast typists to use dual-function keys */
#define PERMISSIVE_HOLD
-/* ws2812 RGB LED */
-//#define RGB_DI_PIN D3
-
-//#define RGBLED_NUM 12 // Number of LEDs
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
index a38c564091..d36024c67c 100644
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ b/keyboards/handwired/skakunm_dactyl/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -16,46 +21,54 @@
"layouts": {
"LAYOUT_3x5_5": {
"layout": [
- {"label":"L10", "x":0, "y":0},
- {"label":"L11", "x":1, "y":0},
- {"label":"L12", "x":2, "y":0},
- {"label":"L13", "x":3, "y":0},
- {"label":"L14", "x":4, "y":0},
- {"label":"R13", "x":9, "y":0},
- {"label":"R13", "x":10, "y":0},
- {"label":"R12", "x":11, "y":0},
- {"label":"R11", "x":12, "y":0},
- {"label":"R10", "x":13, "y":0},
- {"label":"L20", "x":0, "y":1},
- {"label":"L21", "x":1, "y":1},
- {"label":"L22", "x":2, "y":1},
- {"label":"L23", "x":3, "y":1},
- {"label":"L24", "x":4, "y":1},
- {"label":"R23", "x":9, "y":1},
- {"label":"R23", "x":10, "y":1},
- {"label":"R22", "x":11, "y":1},
- {"label":"R21", "x":12, "y":1},
- {"label":"R20", "x":13, "y":1},
- {"label":"L30", "x":0, "y":2},
- {"label":"L31", "x":1, "y":2},
- {"label":"L32", "x":2, "y":2},
- {"label":"L33", "x":3, "y":2},
- {"label":"L34", "x":4, "y":2},
- {"label":"R33", "x":9, "y":2},
- {"label":"R33", "x":10, "y":2},
- {"label":"R32", "x":11, "y":2},
- {"label":"R31", "x":12, "y":2},
- {"label":"R30", "x":13, "y":2},
- {"label":"L00", "x":4, "y":3},
- {"label":"L01", "x":5, "y":3},
- {"label":"R01", "x":8, "y":3},
- {"label":"R00", "x":9, "y":3},
- {"label":"L02", "x":4, "y":4},
- {"label":"L03", "x":5, "y":4},
- {"label":"L04", "x":6, "y":4},
- {"label":"R04", "x":7, "y":4},
- {"label":"R03", "x":8, "y":4},
- {"label":"R02", "x":9, "y":4}
+ {"matrix": [2, 4], "x": 0, "y": 0},
+ {"matrix": [2, 3], "x": 1, "y": 0},
+ {"matrix": [2, 2], "x": 2, "y": 0},
+ {"matrix": [2, 1], "x": 3, "y": 0},
+ {"matrix": [2, 0], "x": 4, "y": 0},
+
+ {"matrix": [6, 0], "x": 9, "y": 0},
+ {"matrix": [6, 1], "x": 10, "y": 0},
+ {"matrix": [6, 2], "x": 11, "y": 0},
+ {"matrix": [6, 3], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 3], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 0], "x": 4, "y": 1},
+
+ {"matrix": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1},
+
+ {"matrix": [0, 4], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+ {"matrix": [0, 2], "x": 2, "y": 2},
+ {"matrix": [0, 1], "x": 3, "y": 2},
+ {"matrix": [0, 0], "x": 4, "y": 2},
+
+ {"matrix": [4, 0], "x": 9, "y": 2},
+ {"matrix": [4, 1], "x": 10, "y": 2},
+ {"matrix": [4, 2], "x": 11, "y": 2},
+ {"matrix": [4, 3], "x": 12, "y": 2},
+ {"matrix": [4, 4], "x": 13, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+ {"matrix": [7, 2], "x": 7, "y": 4},
+ {"matrix": [7, 1], "x": 8, "y": 4},
+ {"matrix": [7, 0], "x": 9, "y": 4}
]
}
}
diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c
deleted file mode 100644
index 4105eea751..0000000000
--- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Marko Skakun <skakun.marko@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "skakunm_dactyl.h" \ No newline at end of file
diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h
deleted file mode 100644
index fa08dd3bb0..0000000000
--- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 Marko Skakun <skakun.marko@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_3x5_5(\
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, R34, R33, R32, R31, R30, \
- L00, L01, R01, R00, \
- L04, L03, L02, R02, R03, R04 \
- )\
- {\
- { L34, L33, L32, L31, L30 }, \
- { L24, L23, L22, L21, L20 }, \
- { L14, L13, L12, L11, L10 }, \
- { L04, L03, L02, L01, L00 }, \
-\
- { R34, R33, R32, R31, R30 }, \
- { R24, R23, R22, R21, R20 }, \
- { R14, R13, R12, R11, R10 }, \
- { R04, R03, R02, R01, R00 }, \
-}