diff options
author | QMK Bot <hello@qmk.fm> | 2021-07-17 23:26:23 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-07-17 23:26:23 +0000 |
commit | 1374722033df5b3d99d03db51ae1a2ad2e9af6b1 (patch) | |
tree | 43ac37d67c07b6026df9f89436c5e6963f27df80 /keyboards/coseyfannitutti/discipline/discipline.h | |
parent | 2eb8349437321390d146823e363c4564b06fcd03 (diff) | |
parent | 876f8617154000ba5cea02658fe7a693f14dbd88 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/coseyfannitutti/discipline/discipline.h')
-rw-r--r-- | keyboards/coseyfannitutti/discipline/discipline.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/keyboards/coseyfannitutti/discipline/discipline.h b/keyboards/coseyfannitutti/discipline/discipline.h index 61ac086c8c..ebfebfe382 100644 --- 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, \ |