Update to drashna keymaps and userspace (#2756)

[qmk_firmware.git] / keyboards / dz60 / dz60.h

diff --git a/keyboards/dz60/dz60.h b/keyboards/dz60/dz60.h
index 664aaaaab6d9d041fa864a82e4b1d0bdd9892aac..0ebf8d212e42281704ccbb72c5f53eb688509ccc 100644 (file)
--- a/keyboards/dz60/dz60.h
+++ b/keyboards/dz60/dz60.h
@@ -3,8 +3,10 @@
 
 #include "quantum.h"
 
+// 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,       \
@@ -18,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,       \
@@ -32,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,       \
@@ -46,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,       \
@@ -61,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,       \