hotswap now works bug free

keyboards/mt/ncr80/hotswap/hotswap.h

@@ -20,11 +20,11 @@
 #define XXX KC_NO
 
 
-#define LAYOUT_tkl_ansi_wkl( \
-    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63,      K66, K62, K61, \
+#define LAYOUT( \
+    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,            K76, K72, K71, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94,           K86, K82, K81, \
-      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
+     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,           K86, K82, K81, \
+      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
     K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                           K92, \
     K50,      K52,            K56,                          K57,      K53,          KA6, KA2, KA1  \
 ) { \
@@ -33,11 +33,11 @@
     { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
     { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
     { K40, XXX, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
-    { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+    { K50, XXX, K52, K53, XXX, XXX, K56, K57, XXX }, \
+    { XXX, XXX, XXX, K63, K64, K65, XXX, K67, K68 }, \
     { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
     { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
+    { XXX, XXX, K92, K93, XXX, K95, XXX, K97, K98 }, \
     { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
 }
 

keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c

@@ -17,8 +17,8 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SLCK, KC_PAUS,
+  [0] = LAYOUT(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                KC_ENT,

keyboards/mt/ncr80/soldered/rules.mk

@@ -15,3 +15,5 @@ BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no      # Enable Bluetooth
 AUDIO_ENABLE = no          # Audio output
+
+LAYOUTS = tkl_ansi tkl_iso tkl_ansi_wkl tkl_iso_wkl