Discipline layout macro/Configurator fixes (qmk#13574)

* use human-friendly formatting in info.json * move layout macro aliases to info.json * correct and complete layout data Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros. - rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl - rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl - rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl - rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
Oh-My-Mechanical-Keyboard · Jul 17, 2021 · 876f861 · 876f861
1 parent 26e64f4
commit 876f861
Show file tree

Hide file tree

Showing 2 changed files with 608 additions and 18 deletions.
diff --git a/keyboards/coseyfannitutti/discipline/discipline.h b/keyboards/coseyfannitutti/discipline/discipline.h
@@ -48,9 +48,7 @@
 { K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
 }
 
-#define LAYOUT_65_ansi_2_right_mods LAYOUT_65_ansi_blocker
-
-#define LAYOUT_wkl_ansi_2_right_mods( \
+#define LAYOUT_65_ansi_wkl( \
   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, \
@@ -64,7 +62,7 @@
 { K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
 }
 
-#define LAYOUT_wkl_ansi_3_right_mods( \
+#define LAYOUT_65_ansi_lwkl( \
   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, \
@@ -106,9 +104,7 @@
 { K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
 }
 
-#define LAYOUT_65_iso_2_right_mods LAYOUT_65_iso_blocker
-
-#define LAYOUT_wkl_iso_2_right_mods( \
+#define LAYOUT_65_iso_wkl( \
   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,      K1E, \
   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
@@ -122,7 +118,7 @@
 { K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
 }
 
-#define LAYOUT_wkl_iso_3_right_mods( \
+#define LAYOUT_65_iso_lwkl( \
   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,      K1E, \
   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \