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

4 files changed, 59 insertions, 117 deletions

diff --git a/keyboards/crkbd/keymaps/ericgebhart/keymap.c b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
index e893ec596b..c534fe3c6d 100755..100644
--- a/keyboards/crkbd/keymaps/ericgebhart/keymap.c
+++ b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,47 +14,5 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "ericgebhart.h"
 
-#define Crkbd_base(...)        Base_3x6_3(__VA_ARGS__)
-#define Crkbd_bepo(...)        Base_bepo_3x6_3(__VA_ARGS__)
-#define Crkbd_bepo6(...)       Base_bepo6_3x6_3(__VA_ARGS__)
-#define Crkbd_transient(...)   Transient6_3x6_3(__VA_ARGS__)
-
-/*
- * The `Crkbd_base` macro is a template to allow the use of identical
- * modifiers for the default layouts (eg QWERTY, Colemak, Dvorak, etc), so
- * that there is no need to set them up for each layout, and modify all of
- * them if I want to change them.  This helps to keep consistency and ease
- * of use. K## is a placeholder to pass through the individual keycodes
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Qwerty based Base layers
-    [_DVORAK]  = Crkbd_base(___DVORAK___),
-    [_BEAKL]   = Crkbd_base(___BEAKL15___),
-    [_COLEMAK] = Crkbd_base(___COLEMAK_DH___),
-    [_QWERTY]  = Crkbd_base(___QWERTY___),
-
-    // Bepo base layers
-    [_BEAKL_BP]  = Crkbd_bepo(___BEAKL15_FR___),
-    [_DVORAK_BP] = Crkbd_bepo(___DVORAK_FR___),
-    [_BEPO]      = Crkbd_bepo6(___BEPO6___),
-
-    // Transient layers.
-    [_SYMB]    = Crkbd_transient(___SYMB_BEAKLB_3x12___),
-    [_SYMB_BP] = Crkbd_transient(___SYMB_BEAKLB_BP_3x12___),
-
-    [_KEYPAD]    = Crkbd_transient(___KP_C_3x12___),
-    [_KEYPAD_BP] = Crkbd_transient(___KP_C_BP_3x12___),
-
-    [_TOPROWS]    = Crkbd_transient(___TOPROWS_3x12___),
-    [_TOPROWS_BP] = Crkbd_transient(___TOPROWS_BP_3x12___),
-
-    [_NAV] = Crkbd_transient(___NAV_3x12___),
-
-    [_LAYERS] = Crkbd_transient(___LAYERS_3x12___),
-    //[_RGB] = Crkbd_transient(___RGB_3x12___),
-    [_ADJUST] = Crkbd_transient(___ADJUST_3x12___),
-    ///HPT_TOG, KC_NUKE, ___,        ___, TG_MODS, HPT_FBK
-};
+// See: users/ericgebhart.
diff --git a/keyboards/crkbd/keymaps/rmeli/config.h b/keyboards/crkbd/keymaps/rmeli/config.h
index 007e4bc45b..2f06b82cc1 100644
--- a/keyboards/crkbd/keymaps/rmeli/config.h
+++ b/keyboards/crkbd/keymaps/rmeli/config.h
@@ -21,32 +21,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MASTER_LEFT  // Left side is the master
+#define MASTER_LEFT // Left side is the master
 #define SPLIT_LED_STATE_ENABLE
 
-#define TAPPING_TERM 200
-
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
-
-#define AUTO_SHIFT_REPEAT
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
 // RGB matrix options
-#    define RGB_MATRIX_KEYPRESSES  // enable keypress effects
+#    define RGB_MATRIX_KEYPRESSES // enable keypress effects
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 // Disable unwanted R2G effects (from r2g/config.h)
 #    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 #    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BREATHING
 #    undef ENABLE_RGB_MATRIX_BAND_SAT
 #    undef ENABLE_RGB_MATRIX_BAND_VAL
 #    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
@@ -57,8 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef ENABLE_RGB_MATRIX_RAINDROPS
 #    undef ENABLE_RGB_MATRIX_HUE_BREATHING
 #    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-//#   undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 #    undef ENABLE_RGB_MATRIX_SPLASH
@@ -77,4 +64,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 #define NO_MUSIC_MODE
-#define LAYER_STATE_8BIT  // Limit to 8 layers
+#define LAYER_STATE_8BIT // Limit to 8 layers
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index 04528fda8c..5a04e8150f 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
 Copyright 2021 Rocco Meli <@RMeli>
 
 This program is free software: you can redistribute it and/or modify
@@ -69,64 +69,61 @@ enum layer_names {
 #define _CMK 1
 #define _CFG 4
 
+#define ______THUMB_LEFT_x3______ KC_LGUI, MO(_DWN), KC_SPC
+#define ______THUMB_RIGHT_x3_____ KC_ENT, MO(_UP), KC_RCTL
+
+// LAYOUT
+//
+// |-----------------------------|            |-----------------------------|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----|            |----+----+----+----+----+----|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----|            |----+----+----+----+----+----|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----+----|  |----+----+----+----+----+----+----|
+//                     |    |    |    |  |    |    |    |
+//                     |--------------|  |--------------|
+
+// Define wrapper for standard CRKB layout
+#define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
+
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        TD_ED,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
-                                      //|--------------------------|  |--------------------------|
+
+  [_QWERTY] = LAYOUT_wrapper(
+    // clang-format off
+    ___________________QWERTY_L1_x6_____________________,                      ___________________QWERTY_R1_x6_____________________,
+    ___________________QWERTY_L2_x6_____________________,                      ___________________QWERTY_R2_x6_____________________,
+    ___________________QWERTY_L3_x6_____________________,                      ___________________QWERTY_R3_x6_____________________,
+                                        ______THUMB_LEFT_x3______,     ______THUMB_RIGHT_x3_____
   ),
 
-  [_COLEMAK_DH] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U, KC_SCLN,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        TD_ED,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
-                                      //|--------------------------|  |--------------------------|
+  [_COLEMAK_DH] = LAYOUT_wrapper(
+    ________________COLEMAK_MOD_DH_L1_x6________________,                      ________________COLEMAK_MOD_DH_R1_x6________________,
+    ________________COLEMAK_MOD_DH_L2_x6________________,                      ________________COLEMAK_MOD_DH_R2_x6________________,
+    ________________COLEMAK_MOD_DH_L3_x6________________,                      ________________COLEMAK_MOD_DH_R3_x6________________,
+                                        ______THUMB_LEFT_x3______,     ______THUMB_RIGHT_x3_____
   ),
 
-  [_DWN] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,   A_GRV,   E_GRV,   I_GRV,   O_GRV,   U_GRV,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,   A_UML,   E_ACT,   I_CIR,   O_UML,   U_UML,                      XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_PGDN, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______, _______,    _______,MO(_CFG), _______
-                                      //|--------------------------|  |--------------------------|
+  [_DWN] = LAYOUT_wrapper(
+    _______, ______________NUMBER_LEFT_x5_______________,                      ______________NUMBER_RIGHT_x5______________, _______,
+    _______, ______________UNICODE_L2_x5________________,                      ________________NAV_R2_x5__________________, XXXXXXX,
+    _______, ______________UNICODE_L3_x5________________,                      ________________NAV_R3_x5__________________, _______,
+                                        KC_LGUI, _______, _______,     _______,MO(_CFG), _______
   ),
 
-  [_UP] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,MO(_CFG), _______,   _______, _______, _______
-                                      //|--------------------------|  |--------------------------|
+  [_UP] = LAYOUT_wrapper(
+    ___________________SYMBOL_LEFT_x6___________________,                      ___________________SYMBOL_RIGHT_x6__________________,
+    _______, ____________NAV_VIM_x4____________, XXXXXXX,                      ____________________SYMBOL_R2_x6____________________,
+    _______, _________________NONE_5x___________________,                      ____________________SYMBOL_R3_x6____________________,
+                                        _______,MO(_CFG), _______,    _______, _______, _______
   ),
 
-  [_CONFIG] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_NEXT,   AS_UP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, AS_TOGG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_PREV, AS_DOWN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,   _______, _______, _______
-                                      //|--------------------------|  |--------------------------|
+  [_CONFIG] = LAYOUT_wrapper(
+    QK_BOOT, _________________NONE_5x___________________,                      _______________CONFIG_R1_x5________________,DF(_QWY),
+    RGB_TOG, ________________RGB_L2_x5__________________,                      _______________CONFIG_R2_x5________________, XXXXXXX,
+    XXXXXXX, ________________RGB_L3_x5__________________,                      _______________CONFIG_R3_x5________________,DF(_CMK),
+                                        _______, _______, _______,   _______, _______, _______
   )
 };
+// clang-format on
diff --git a/keyboards/crkbd/keymaps/rmeli/rules.mk b/keyboards/crkbd/keymaps/rmeli/rules.mk
index 8e9dbbf8cf..58a00ed6ba 100644
--- a/keyboards/crkbd/keymaps/rmeli/rules.mk
+++ b/keyboards/crkbd/keymaps/rmeli/rules.mk
@@ -2,11 +2,11 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
 TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
+AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
 
 UNICODEMAP_ENABLE = yes
+NKRO_ENABLE = yes
+MAGIC_ENABLE = yes
 
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-
-NKRO_ENABLE = yes