Changed LAYOUT_102key_ansi matrix definition (3) reordered layout macros

[jackhill/qmk/firmware.git] / keyboards / xwhatsit / ibm / f107 / wcass / wcass.h

diff --git a/keyboards/xwhatsit/ibm/f107/wcass/wcass.h b/keyboards/xwhatsit/ibm/f107/wcass/wcass.h
index 3f59d08..6b8ab98 100644 (file)
--- a/keyboards/xwhatsit/ibm/f107/wcass/wcass.h
+++ b/keyboards/xwhatsit/ibm/f107/wcass/wcass.h
@@ -27,21 +27,6 @@
  * represents the switch matrix.
  */
 
-#define LAYOUT_102key_ansi( \
-    k_3_1, k_3_2,   k_2_3, k_1_3, k_1_4, k_2_5, k_1_5, k_2_6, k_1_6, k_2_7, k_1_7, k_2_8, k_1_8, k_2_9, k_1_9,        k_1_10, k_1_11, k_2_12, k_1_12,     k_1_13, k_1_14, k_2_15, k_1_15, \
-    k_4_1, k_4_2,   k_3_3,     k_2_4, k_3_4, k_4_5, k_3_5, k_4_6, k_3_6, k_4_7, k_3_7, k_4_8, k_3_8, k_3_9, k_3_10, k_4_10,   k_3_11, k_4_12, k_3_12,     k_3_13, k_3_14, k_2_14, k_3_15, \
-    k_5_1, k_5_2,   k_4_3,       k_4_4, k_5_4, k_6_5, k_5_5, k_6_6, k_5_6, k_5_7, k_6_7, k_6_8, k_5_8, k_5_9, k_5_10,         k_5_11, k_4_11, k_5_12,     k_5_13, k_4_14, k_5_14,         \
-    k_6_1, k_6_2,   k_5_3,           k_7_4, k_6_4, k_7_5, k_8_5, k_7_6, k_7_7, k_8_7, k_8_8, k_7_8, k_6_9, k_7_10,            k_6_11, k_6_12, k_7_12,     k_7_13, k_6_13, k_6_14, k_7_15, \
-    k_7_1, k_7_2,   k_8_3,       k_7_3,  k_8_4,                     k_8_6,                      k_8_9, k_7_9, k_8_10,         k_8_11, k_7_11, k_8_12,             k_8_14, k_7_14          \
-) \
-LAYOUT_all( \
-    k_3_1, k_3_2,   k_2_3, k_1_3, k_1_4, k_2_5, k_1_5, k_2_6, k_1_6, k_2_7, k_1_7, k_2_8, k_1_8, k_2_9, k_1_9, KC_NO, k_1_10, k_1_11, k_2_12, k_1_12,     k_1_13, k_1_14, k_2_15, k_1_15, \
-    k_4_1, k_4_2,   k_3_3,     k_2_4, k_3_4, k_4_5, k_3_5, k_4_6, k_3_6, k_4_7, k_3_7, k_4_8, k_3_8, k_3_9, k_3_10, k_4_10,   k_3_11, k_4_12, k_3_12,     k_3_13, k_3_14, k_2_14, k_3_15, \
-    k_5_1, k_5_2,   k_4_3,       k_4_4, k_5_4, k_6_5, k_5_5, k_6_6, k_5_6, k_5_7, k_6_7, k_6_8, k_5_8, k_5_9, KC_NO, k_5_10,  k_5_11, k_4_11, k_5_12,     k_5_13, k_4_14, k_5_14, KC_NO,  \
-    k_6_1, k_6_2,   k_5_3,    KC_NO, k_7_4, k_6_4, k_7_5, k_8_5, k_7_6, k_7_7, k_8_7, k_8_8, k_7_8, k_6_9, KC_NO,  k_7_10,    k_6_11, k_6_12, k_7_12,     k_7_13, k_6_13, k_6_14, k_7_15, \
-    k_7_1, k_7_2,   k_8_3,       k_7_3,  k_8_4,                     k_8_6,                      k_8_9, k_7_9, k_8_10,         k_8_11, k_7_11, k_8_12,     KC_NO,  k_8_14, k_7_14, KC_NO   \
-)
-
 // Note:
 // There are a couple of hidden pads, not mentioned in LAYOUT_102key_ansi() or LAYOUT_107key():
 // There is one next to the left shift, on row 3. (columns in probably 3)
@@ -71,6 +56,21 @@ LAYOUT_all( \
     { k_4_1,  k_4_2,  k_4_3,  k_4_4,  k_4_5,  k_4_6,  k_4_7,  k_4_8,  k_4_9, k_4_10, k_4_11, k_4_12,  KC_NO, k_4_14,  KC_NO}  \
 }
 
+#define LAYOUT_102key_ansi( \
+    k_3_1, k_3_2,   k_2_3, k_1_3, k_1_4, k_2_5, k_1_5, k_2_6, k_1_6, k_2_7, k_1_7, k_2_8, k_1_8, k_2_9, k_1_9,        k_1_10, k_1_11, k_2_12, k_1_12,     k_1_13, k_1_14, k_2_15, k_1_15, \
+    k_4_1, k_4_2,   k_3_3,     k_2_4, k_3_4, k_4_5, k_3_5, k_4_6, k_3_6, k_4_7, k_3_7, k_4_8, k_3_8, k_3_9, k_3_10, k_4_10,   k_3_11, k_4_12, k_3_12,     k_3_13, k_3_14, k_2_14, k_3_15, \
+    k_5_1, k_5_2,   k_4_3,       k_4_4, k_5_4, k_6_5, k_5_5, k_6_6, k_5_6, k_5_7, k_6_7, k_6_8, k_5_8, k_5_9, k_5_10,         k_5_11, k_4_11, k_5_12,     k_5_13, k_4_14, k_5_14,         \
+    k_6_1, k_6_2,   k_5_3,           k_7_4, k_6_4, k_7_5, k_8_5, k_7_6, k_7_7, k_8_7, k_8_8, k_7_8, k_6_9, k_7_10,            k_6_11, k_6_12, k_7_12,     k_7_13, k_6_13, k_6_14, k_7_15, \
+    k_7_1, k_7_2,   k_8_3,       k_7_3,  k_8_4,                     k_8_6,                      k_8_9, k_7_9, k_8_10,         k_8_11, k_7_11, k_8_12,             k_8_14, k_7_14          \
+) \
+LAYOUT_all( \
+    k_3_1, k_3_2,   k_2_3, k_1_3, k_1_4, k_2_5, k_1_5, k_2_6, k_1_6, k_2_7, k_1_7, k_2_8, k_1_8, k_2_9, k_1_9, KC_NO, k_1_10, k_1_11, k_2_12, k_1_12,     k_1_13, k_1_14, k_2_15, k_1_15, \
+    k_4_1, k_4_2,   k_3_3,     k_2_4, k_3_4, k_4_5, k_3_5, k_4_6, k_3_6, k_4_7, k_3_7, k_4_8, k_3_8, k_3_9, k_3_10, k_4_10,   k_3_11, k_4_12, k_3_12,     k_3_13, k_3_14, k_2_14, k_3_15, \
+    k_5_1, k_5_2,   k_4_3,       k_4_4, k_5_4, k_6_5, k_5_5, k_6_6, k_5_6, k_5_7, k_6_7, k_6_8, k_5_8, k_5_9, KC_NO, k_5_10,  k_5_11, k_4_11, k_5_12,     k_5_13, k_4_14, k_5_14, KC_NO,  \
+    k_6_1, k_6_2,   k_5_3,    KC_NO, k_7_4, k_6_4, k_7_5, k_8_5, k_7_6, k_7_7, k_8_7, k_8_8, k_7_8, k_6_9, KC_NO,  k_7_10,    k_6_11, k_6_12, k_7_12,     k_7_13, k_6_13, k_6_14, k_7_15, \
+    k_7_1, k_7_2,   k_8_3,       k_7_3,  k_8_4,                     k_8_6,                      k_8_9, k_7_9, k_8_10,         k_8_11, k_7_11, k_8_12,     KC_NO,  k_8_14, k_7_14, KC_NO   \
+)
+
 // layout 107key, is in the configuration shown by kishy.ca, the difference from _all, is that the backspace, and right shift are not split.
 #define LAYOUT_107key( \
     k_3_1, k_3_2,   k_2_3, k_1_3, k_1_4, k_2_5, k_1_5, k_2_6, k_1_6, k_2_7, k_1_7, k_2_8, k_1_8, k_2_9, k_1_9,         k_1_10, k_1_11, k_2_12, k_1_12,     k_1_13, k_1_14, k_2_15, k_1_15, \