neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266)

1 files changed, 46 insertions, 25 deletions

diff --git a/keyboards/neson_design/n6/n6.h b/keyboards/neson_design/n6/n6.h
index 0015f8570a..b8f2f2e53b 100644
--- a/keyboards/neson_design/n6/n6.h
+++ b/keyboards/neson_design/n6/n6.h
@@ -1,7 +1,7 @@
 /**
   * @file n6.h
   *
-    Copyright 2021 astro 
+    Copyright 2021 astro
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,35 +20,56 @@
 
 #include "quantum.h"
 
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
+#define ___ KC_NO
+
+/*                                                     ┌───────┐
+ *                                        2u Backspace │0E     │
+ *                                                     └───────┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40  │41  │42  │48                      │49  │4A  │ │4B │4C │4D │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬─┬───┬───┬───┐
+ * │40   │41 │42   │48                         │4A   │ │4B │4C │4D │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
+ * ┌─────┬──┬─────┬───────────────────────────┬─────┬──┬───┬───┬───┐
+ * │40   │  │42   │48                         │4A   │  │4B │4C │4D │ WKL
+ * └─────┘  └─────┴───────────────────────────┴─────┘  └───┴───┴───┘
+ */
+
 #define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K48,           K49, K4A,      K4B, K4C, K4D  \
 ) \
 { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C, KC_NO, K0E }, \
-    { K10, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, KC_NO,   K2D, K2F }, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B,   K3D,   K3E, K3F }, \
-    { K40, K41,   K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   K46,   K4A, K4B, K4D,   K4E,   K4F, K0F }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
 }
 
-#define LAYOUT_65_ansi_blocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D,      K2F, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
+#define LAYOUT_65_ansi_blocker_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K48,           K49, K4A,      K4B, K4C, K4D  \
 ) \
 { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C, K0E, K0E }, \
-    { K10, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C,   K1D, K1E, K1F }, \
-    { K20, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, KC_NO, K2D, K2F }, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B,   K3D, K3E, K3F }, \
-    { K40, K41,   K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   K46,   K4A, K4B, K4D,   K4E, K4F, K0F }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
 }