summaryrefslogtreecommitdiff
path: root/keyboards/xiaomi/mk02
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xiaomi/mk02')
-rw-r--r--keyboards/xiaomi/mk02/info.json174
-rw-r--r--keyboards/xiaomi/mk02/mk02.c2
-rw-r--r--keyboards/xiaomi/mk02/mk02.h20
3 files changed, 88 insertions, 108 deletions
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
index 97baa39f5f..16cbfd1703 100644
--- a/keyboards/xiaomi/mk02/info.json
+++ b/keyboards/xiaomi/mk02/info.json
@@ -16,106 +16,106 @@
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
- {"x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "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},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
- {"x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
- {"x": 0, "y": 1.5},
- {"x": 1, "y": 1.5},
- {"x": 2, "y": 1.5},
- {"x": 3, "y": 1.5},
- {"x": 4, "y": 1.5},
- {"x": 5, "y": 1.5},
- {"x": 6, "y": 1.5},
- {"x": 7, "y": 1.5},
- {"x": 8, "y": 1.5},
- {"x": 9, "y": 1.5},
- {"x": 10, "y": 1.5},
- {"x": 11, "y": 1.5},
- {"x": 12, "y": 1.5},
- {"x": 13, "y": 1.5, "w": 2},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
- {"x": 15.25, "y": 1.5},
- {"x": 16.25, "y": 1.5},
- {"x": 17.25, "y": 1.5},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
- {"x": 0, "y": 2.5, "w": 1.5},
- {"x": 1.5, "y": 2.5},
- {"x": 2.5, "y": 2.5},
- {"x": 3.5, "y": 2.5},
- {"x": 4.5, "y": 2.5},
- {"x": 5.5, "y": 2.5},
- {"x": 6.5, "y": 2.5},
- {"x": 7.5, "y": 2.5},
- {"x": 8.5, "y": 2.5},
- {"x": 9.5, "y": 2.5},
- {"x": 10.5, "y": 2.5},
- {"x": 11.5, "y": 2.5},
- {"x": 12.5, "y": 2.5},
- {"x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
- {"x": 15.25, "y": 2.5},
- {"x": 16.25, "y": 2.5},
- {"x": 17.25, "y": 2.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
- {"x": 0, "y": 3.5, "w": 1.75},
- {"x": 1.75, "y": 3.5},
- {"x": 2.75, "y": 3.5},
- {"x": 3.75, "y": 3.5},
- {"x": 4.75, "y": 3.5},
- {"x": 5.75, "y": 3.5},
- {"x": 6.75, "y": 3.5},
- {"x": 7.75, "y": 3.5},
- {"x": 8.75, "y": 3.5},
- {"x": 9.75, "y": 3.5},
- {"x": 10.75, "y": 3.5},
- {"x": 11.75, "y": 3.5},
- {"x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
- {"x": 0, "y": 4.5, "w": 2.25},
- {"x": 2.25, "y": 4.5},
- {"x": 3.25, "y": 4.5},
- {"x": 4.25, "y": 4.5},
- {"x": 5.25, "y": 4.5},
- {"x": 6.25, "y": 4.5},
- {"x": 7.25, "y": 4.5},
- {"x": 8.25, "y": 4.5},
- {"x": 9.25, "y": 4.5},
- {"x": 10.25, "y": 4.5},
- {"x": 11.25, "y": 4.5},
- {"x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
- {"x": 16.25, "y": 4.5},
+ {"matrix": [4, 14], "x": 16.25, "y": 4.5},
- {"x": 0, "y": 5.5, "w": 1.25},
- {"x": 1.25, "y": 5.5, "w": 1.25},
- {"x": 2.5, "y": 5.5, "w": 1.25},
- {"x": 3.75, "y": 5.5, "w": 6.25},
- {"x": 10, "y": 5.5, "w": 1.25},
- {"x": 11.25, "y": 5.5, "w": 1.25},
- {"x": 12.5, "y": 5.5, "w": 1.25},
- {"x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
- {"x": 15.25, "y": 5.5},
- {"x": 16.25, "y": 5.5},
- {"x": 17.25, "y": 5.5}
+ {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/xiaomi/mk02/mk02.c b/keyboards/xiaomi/mk02/mk02.c
index d3ecc155f1..19d8e67e19 100644
--- a/keyboards/xiaomi/mk02/mk02.c
+++ b/keyboards/xiaomi/mk02/mk02.c
@@ -1,4 +1,4 @@
-#include "mk02.h"
+#include "quantum.h"
void bootloader_jump(void) {
uint32_t *magic_address = (void*)0x20000FFC;
diff --git a/keyboards/xiaomi/mk02/mk02.h b/keyboards/xiaomi/mk02/mk02.h
deleted file mode 100644
index 12a7c8e1ad..0000000000
--- a/keyboards/xiaomi/mk02/mk02.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K414, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K514, K515 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014, K015, K016 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, K414, KC_NO, KC_NO }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, K514, K515, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 02:20:22 +0000