Merge remote-tracking branch 'origin/master' into develop

6 files changed, 40 insertions, 0 deletions

diff --git a/keyboards/crkbd/keymaps/curry/config.h b/keyboards/crkbd/keymaps/curry/config.h
index a7c4ed7403..ba9c69ed26 100644
--- a/keyboards/crkbd/keymaps/curry/config.h
+++ b/keyboards/crkbd/keymaps/curry/config.h
@@ -13,3 +13,9 @@
 #    define RGB_MATRIX_VAL_STEP 5
 #    define RGB_MATRIX_SPD_STEP 10
 #endif
+
+//  comment out unnecessary layouts
+#define ENABLE_QWERTY
+#define ENABLE_COLEMAK
+#define ENABLE_DVORAK
+#define ENABLE_WORKMAN
diff --git a/keyboards/crkbd/keymaps/curry/keymap.c b/keyboards/crkbd/keymaps/curry/keymap.c
index e56f77ebeb..43a3147619 100644
--- a/keyboards/crkbd/keymaps/curry/keymap.c
+++ b/keyboards/crkbd/keymaps/curry/keymap.c
@@ -14,29 +14,37 @@
 #define LAYOUT_crkbd_base_wrapper(...)       LAYOUT_crkbd_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+#if defined(ENABLE_QWERTY)
     [_QWERTY] = LAYOUT_crkbd_base_wrapper(
         _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
         _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
         _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
     ),
+#endif
 
+#if defined(ENABLE_COLEMAK)
     [_COLEMAK] = LAYOUT_crkbd_base_wrapper(
         _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
         _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
         _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
     ),
+#endif
 
+#if defined(ENABLE_DVORAK)
     [_DVORAK] = LAYOUT_crkbd_base_wrapper(
         _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
         _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
         _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
     ),
+#endif
 
+#if defined(ENABLE_WORKMAN)
     [_WORKMAN] = LAYOUT_crkbd_base_wrapper(
         _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
         _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
         _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
     ),
+#endif
 
     [_MODS] = LAYOUT_wrapper(
         _______, ___________________BLANK___________________,       ___________________BLANK___________________, _______,
diff --git a/keyboards/lily58/keymaps/curry/config.h b/keyboards/lily58/keymaps/curry/config.h
index a4c697df42..b3e82389d8 100644
--- a/keyboards/lily58/keymaps/curry/config.h
+++ b/keyboards/lily58/keymaps/curry/config.h
@@ -15,3 +15,8 @@
 #    define RGBLIGHT_VAL_STEP 5
 #    define RGBLIGHT_LIMIT_VAL 120
 #endif
+
+//  comment out unnecessary layouts
+#define ENABLE_QWERTY
+#define ENABLE_COLEMAK
+#define ENABLE_DVORAK
diff --git a/keyboards/lily58/keymaps/curry/keymap.c b/keyboards/lily58/keymaps/curry/keymap.c
index bc779305a2..12dde22578 100644
--- a/keyboards/lily58/keymaps/curry/keymap.c
+++ b/keyboards/lily58/keymaps/curry/keymap.c
@@ -16,26 +16,32 @@
 #define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+#if defined(ENABLE_QWERTY)
     [_QWERTY] = LAYOUT_lily58_base_wrapper(
         ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
         _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
         _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
         _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
     ),
+#endif
 
+#if defined(ENABLE_COLEMAK)
     [_COLEMAK] = LAYOUT_lily58_base_wrapper(
         ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
         _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
         _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
         _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
     ),
+#endif
 
+#if defined(ENABLE_DVORAK)
     [_DVORAK] = LAYOUT_lily58_base_wrapper(
         ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
         _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
         _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
         _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
     ),
+#endif
 
     [_MODS] = LAYOUT_wrapper(
         _______, ___________________BLANK___________________,                    ___________________BLANK___________________, _______,
diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/config.h b/keyboards/montsinger/rebound/rev1/keymaps/curry/config.h
new file mode 100644
index 0000000000..2c9f97d587
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev1/keymaps/curry/config.h
@@ -0,0 +1,7 @@
+#pragma once
+
+//  comment out unnecessary layouts
+#define ENABLE_QWERTY
+#define ENABLE_COLEMAK
+#define ENABLE_DVORAK
+#define ENABLE_WORKMAN
diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c b/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
index 1b8f4f4ac9..49b328271d 100644
--- a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
+++ b/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
@@ -14,29 +14,37 @@
 #define LAYOUT_rebound_base_wrapper(...)       LAYOUT_rebound_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+#if defined(ENABLE_QWERTY)
     [_QWERTY] = LAYOUT_rebound_base_wrapper(
         _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
         _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
         _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
     ),
+#endif
 
+#if defined(ENABLE_COLEMAK)
     [_COLEMAK] = LAYOUT_rebound_base_wrapper(
         _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
         _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
         _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
     ),
+#endif
 
+#if defined(ENABLE_DVORAK)
     [_DVORAK] = LAYOUT_rebound_base_wrapper(
         _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
         _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
         _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
     ),
+#endif
 
+#if defined(ENABLE_WORKMAN)
     [_WORKMAN] = LAYOUT_rebound_base_wrapper(
         _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
         _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
         _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
     ),
+#endif
 
     [_LOWER] = LAYOUT_ortho_4x12_wrapper(
         KC_F11,  _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F12,