Change keyboard level include guards to `pragma once` (#14248)

* Change keyboard level include guards to `pragma once`

And clean up a lot of layout macros

* Oops

* Remove dangling endif

1 files changed, 42 insertions, 43 deletions

diff --git a/keyboards/gskt00/gskt00.h b/keyboards/gskt00/gskt00.h
index 90e9a1ad5a..151155d7f7 100755
--- a/keyboards/gskt00/gskt00.h
+++ b/keyboards/gskt00/gskt00.h
@@ -1,57 +1,56 @@
-#ifndef GSKT00_H
-#define GSKT00_H
+#pragma once
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 #define LAYOUT_all( \
-    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
-    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
-    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
-    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
-    K30, K40, K50,           K60,                          K00, K10, K20  \
+    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \
+    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
+    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
+    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \
+    k30, k40, k50,           k60,                          k00, k10, k20 \
 ) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { KC_NO, K71, K72, K73, K74, K75, K76, K77 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 } \
 }
 
 #define LAYOUT_60_iso_tsangan( \
-    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \
-    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, \
-    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K24, K23, /* enter */ \
-    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \
-    K30, K40, K50,           K60,                     K00, K10,      K20  \
+    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \
+    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, \
+    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k24, k23, \
+    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \
+    k30, k40, k50,           k60,                     k00, k10,      k20 \
 ) { \
-    { K00,   K01, K02,   K03, K04, K05, K06,   K07 }, \
-    { KC_NO, K11, K12,   K13, K14, K15, K16,   K17 }, \
-    { K20,   K21, KC_NO, K23, K24, K25, KC_NO, K27 }, \
-    { K30,   K31, K32,   K33, K34, K35, K36,   K37 }, \
-    { K40,   K41, K42,   K43, K44, K45, K46,   K47 }, \
-    { K50,   K51, K52,   K53, K54, K55, K56,   K57 }, \
-    { K60,   K61, K62,   K63, K64, K65, K66,   K67 }, \
-    { KC_NO,   K71, K72,   K73, K74, K75, K76,   K77 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 } \
 }
 
 #define LAYOUT_60_ansi_tsangan( \
-    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \
-    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
-    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
-    K31,      K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \
-    K30, K40, K50,           K60,                          K00, K10, K20  \
+    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \
+    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
+    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
+    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21,  \
+    k30, k40, k50,           k60,                          k00, k10, k20  \
 ) { \
-    { K00, K01,   K02,   K03, K04, K05, K06,   K07 }, \
-    { K10, K11,   K12,   K13, K14, K15, K16,   K17 }, \
-    { K20, K21,   KC_NO, K23, K24, K25, KC_NO, K27 }, \
-    { K30, K31,   K32,   K33, K34, K35, K36,   K37 }, \
-    { K40, KC_NO, K42,   K43, K44, K45, K46,   K47 }, \
-    { K50, K51,   K52,   K53, K54, K55, K56,   K57 }, \
-    { K60, K61,   K62,   K63, K64, K65, K66,   K67 }, \
-    { KC_NO, K71,   K72,   K73, K74, K75, K76,   K77 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 } \
 }
-
-#endif