JD45: layout macro refactor

The macro that was LAYOUT prepended KC_ to all the keycode arguments, preventing the Configurator from working with the JD45. This macro is now LAYOUT_kc.

The macro LAYOUT is a more-standard macro.

Switch identifiers have changed throughout. Format is k<row><column>.

diff --git a/keyboards/jd45/jd45.h b/keyboards/jd45/jd45.h
index 48641c199ad1b1fbca088ef7e4d554a1e72074b8..105a8acb60638bd7577cde4264428037958ba367 100644 (file)
--- a/keyboards/jd45/jd45.h
+++ b/keyboards/jd45/jd45.h
@@ -6,15 +6,27 @@
 /* JD45 keymap definition macro
  */
 #define LAYOUT( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \
-       K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, \
-       K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, \
-       K38, K39, K40, K41, K42, K43, K44, K45, K46, K47 \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+    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,     k36,       k38, k39, k3a, k3b  \
 ) { \
-    { KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K10, KC_##K11, KC_##K12, KC_##K13 }, \
-    { KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_NO    }, \
-    { KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_NO    }, \
-    { KC_##K38, KC_##K39, KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_##K43, KC_NO,    KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_NO    }  \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,   k0b,   k0c   }, \
+    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,   k1b,   KC_NO }, \
+    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2b,   KC_NO }, \
+    { k30,   k31,   k32,   k33,   k34,   KC_NO, k36,   KC_NO, k38,   k39,   k3a,   k3b,   KC_NO }  \
+}
+
+#define LAYOUT_kc( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+    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,     k36,       k38, k39, k3a, k3b  \
+) { \
+    { KC_##k00,   KC_##k01,   KC_##k02,   KC_##k03,   KC_##k04,   KC_##k05,   KC_##k06,   KC_##k07,   KC_##k08,   KC_##k09,   KC_##k0a,   KC_##k0b,   KC_##k0c }, \
+    { KC_##k10,   KC_##k11,   KC_##k12,   KC_##k13,   KC_##k14,   KC_##k15,   KC_##k16,   KC_##k17,   KC_##k18,   KC_##k19,   KC_##k1a,   KC_##k1b,   KC_NO    }, \
+    { KC_##k20,   KC_##k21,   KC_##k22,   KC_##k23,   KC_##k24,   KC_##k25,   KC_##k26,   KC_##k27,   KC_##k28,   KC_##k29,   KC_##k2a,   KC_##k2b,   KC_NO    }, \
+    { KC_##k30,   KC_##k31,   KC_##k32,   KC_##k33,   KC_##k34,   KC_NO,      KC_##k36,   KC_NO,      KC_##k38,   KC_##k39,   KC_##k3a,   KC_##k3b,   KC_NO    }  \
 }
 
 #endif