1 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/dz60/dz60.h b/keyboards/dz60/dz60.h
index ad0026846..0ebf8d212 100644
--- a/keyboards/dz60/dz60.h
+++ b/keyboards/dz60/dz60.h
@@ -6,7 +6,7 @@
 // Corresponding changes to the layout names and/or definitions must also be made to info.json
 // 标准配列
-#define KEYMAP( \
+#define LAYOUT( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
@@ -20,7 +20,7 @@
        { K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414 }  \
 }
-#define KEYMAP_HHKB( \
+#define LAYOUT_hhkb( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
@@ -34,7 +34,7 @@
        { KC_NO, K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  KC_NO }  \
 }
-#define KEYMAP_TRUE_HHKB( \
+#define LAYOUT_true_hhkb( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
@@ -48,7 +48,7 @@
        { KC_NO, K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, KC_NO, KC_NO }  \
 }
-#define KEYMAP_2_SHIFTS( \
+#define LAYOUT_2_shifts( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
@@ -63,7 +63,7 @@
 }
 // 带方向配列
-#define KEYMAP_DIRECTIONAL( \
+#define LAYOUT_directional( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \

diff --git a/keyboards/dz60/dz60.h b/keyboards/dz60/dz60.h index ad0026846..0ebf8d212 100644 --- a/keyboards/dz60/dz60.h +++ b/keyboards/dz60/dz60.h
@@ -6,7 +6,7 @@
6	// Corresponding changes to the layout names and/or definitions must also be made to info.json	6	// Corresponding changes to the layout names and/or definitions must also be made to info.json
7		7
8	// 标准配列	8	// 标准配列
9	#define KEYMAP( \	9	#define LAYOUT( \
10	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \	10	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
11	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \	11	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
12	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \	12	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
@@ -20,7 +20,7 @@
20	{ K400, K401, KC_NO, K403, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414 } \	20	{ K400, K401, KC_NO, K403, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414 } \
21	}	21	}
22		22
23	#define KEYMAP_HHKB( \	23	#define LAYOUT_hhkb( \
24	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \	24	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
25	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \	25	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
26	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \	26	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
@@ -34,7 +34,7 @@
34	{ KC_NO, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO } \	34	{ KC_NO, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO } \
35	}	35	}
36		36
37	#define KEYMAP_TRUE_HHKB( \	37	#define LAYOUT_true_hhkb( \
38	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \	38	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
39	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \	39	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
40	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \	40	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
@@ -48,7 +48,7 @@
48	{ KC_NO, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, KC_NO, KC_NO } \	48	{ KC_NO, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, KC_NO, KC_NO } \
49	}	49	}
50		50
51	#define KEYMAP_2_SHIFTS( \	51	#define LAYOUT_2_shifts( \
52	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \	52	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
53	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \	53	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
54	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \	54	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
@@ -63,7 +63,7 @@
63	}	63	}
64		64
65	// 带方向配列	65	// 带方向配列
66	#define KEYMAP_DIRECTIONAL( \	66	#define LAYOUT_directional( \
67	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \	67	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
68	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \	68	K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
69	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \	69	K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \