Fix layout macro keys with no matrix position (#20033)

1 files changed, 91 insertions, 89 deletions

diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
index cf692f960d..b8c9f7a14f 100644
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ b/keyboards/keebio/sinc/rev1/rev1.h
@@ -3,6 +3,8 @@
 #include "sinc.h"
 #include "quantum.h"
 
+#define XXX KC_NO
+
 #define LAYOUT_75( \
   LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
   LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
@@ -12,18 +14,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80( \
@@ -35,18 +37,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_with_macro( \
@@ -59,17 +61,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_with_macro( \
@@ -82,17 +84,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso( \
@@ -104,18 +106,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso( \
@@ -127,18 +129,18 @@
   LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
   ) \
   { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso_with_macro( \
@@ -151,17 +153,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso_with_macro( \
@@ -174,17 +176,17 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_all( \
@@ -197,15 +199,15 @@
   ) \
   { \
     { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
     { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
     { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
     { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }