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

2 files changed, 43 insertions, 41 deletions

diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h
index 0ff3549ba9..60503a51a5 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/config.h
+++ b/keyboards/crkbd/keymaps/sharkby7e/config.h
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
+
 #define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
index f6d740d6d4..a3d88e2c01 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/keymap.c
+++ b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
@@ -20,54 +20,55 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_split_3x6_3(
-  // \--------------------------------------------------------------------|  |---------------------------------------------------------------------/
-       XXXXXXX,   KC_Q,   KC_W,        KC_F,          KC_P,       KC_B,        KC_J,        KC_L,          KC_U,       KC_Y,    KC_BSPC,  XXXXXXX,
-  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
-       XXXXXXX,   KC_A,   KC_R,   LCTL_T(KC_S),   LGUI_T(KC_T),   KC_G,        KC_M,    RGUI_T(KC_N),   RCTL_T(KC_E),   KC_I,     KC_O,   XXXXXXX,
-  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
-       XXXXXXX,   KC_Z,   KC_X,        KC_C,          KC_D,       KC_V,        KC_K,        KC_H,         KC_COMM,     KC_DOT,  KC_SLSH,  XXXXXXX,
-  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
-                                      KC_ESC,         MO(1),      SC_LSPO,     KC_SPC,      MO(2),        KC_TAB
-//                              \---------------+---------------+---------|  |--------+---------------+---------------/
+
+  [0] = LAYOUT_split_3x5_3(
+  // \-----------------------------------------------------------------|   |--------------------------------------------------------------/
+           KC_Q,      KC_W,    LCTL_T(KC_F),      KC_P,         KC_B,         KC_J,         KC_L,       RCTL_T(KC_U),    KC_Y,    KC_BSPC,  
+  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
+      LALT_T(KC_A),   KC_R,        KC_S,       LGUI_T(KC_T),    KC_G,         KC_M,     RGUI_T(KC_N),      KC_E,           KC_I,     KC_O,   
+  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
+           KC_Z,      KC_X,        KC_C,          KC_D,         KC_V,         KC_K,         KC_H,         KC_COMM,      KC_DOT,   KC_SLSH,  
+  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
+                              RCTL_T(KC_ESC),     MO(1),       SC_LSPO,       KC_SPC,       MO(2),     MEH_T(KC_TAB)
+//                           \---------------+--------------+----------|   |----------+---------------+--------------/
 
   ),
 
-  [1] = LAYOUT_split_3x6_3(
-  //,------------------------------------------------------.         ,-----------------------------------------------------.
-       KC_NO,  KC_GRV,  KC_TILD, KC_PEQL, KC_UNDS, KC_PIPE,            KC_PPLS,    KC_7,    KC_8,    KC_9,    KC_BSPC, KC_NO,
-  //|--------+--------+--------+--------+--------+--------|         |--------+--------+--------+--------+--------+--------|
-      KC_NO , KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_RPRN,           KC_PMNS, RGUI_T(KC_4),   RCTL_T(KC_5), KC_6, KC_QUOT, KC_NO,
-  //|--------+--------+--------+--------+--------+--------|         |--------+--------+--------+--------+--------+--------|
-      KC_NO, KC_NO, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS,               KC_SCLN, KC_1, KC_2, KC_3, KC_DQUO, KC_NO,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_TRNS,     KC_RSFT,   MO(3), KC_0
-                                      //`--------------------------'  `--------------------------'
+  [1] = LAYOUT_split_3x5_3(
+  // \--------------------------------------------------|   |----------------------------------------------------------/
+       KC_GRV,   KC_TILD,  KC_PEQL,  KC_UNDS,  KC_PIPE,       KC_PPLS,     KC_7,          KC_8,       KC_9,    KC_BSPC, 
+  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
+       KC_LBRC,  KC_RBRC,  KC_LCBR,  KC_RCBR,  KC_RPRN,       KC_PMNS,  RGUI_T(KC_4),  RCTL_T(KC_5),  KC_6,    KC_QUOT, 
+  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
+       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSLS,       KC_SCLN,     KC_1,          KC_2,       KC_3,    KC_0, 
+  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
+                   RCTL_T(KC_ESC),  _______,   KC_TRNS,       KC_RSFT,     MO(3),         KC_NO
+  //             \----------------+---------+-----------|   |---------+--------------+-------------/
   ),
 
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.            ,-----------------------------------------------------.
-       KC_NO,   KC_ESC,  KC_NO,   KC_NO,  KC_NO,   KC_NO,                 KC_NO,   KC_NO,  KC_ENT,  KC_NO,   KC_DEL, KC_NO,
-  //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------|
-      KC_NO, KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                KC_LEFT,  KC_DOWN, KC_UP, KC_RIGHT, KC_NO,  KC_NO,
-  //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------|
-      KC_NO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   MO(3),  KC_LSFT,     KC_TRNS, _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
+  [2] = LAYOUT_split_3x5_3(
+  // \----------------------------------------------|   |-----------------------------------------------/
+       KC_ESC,  KC_NO,   KC_COMM,  KC_DOT,  KC_NO,        KC_NO,    KC_NO,    KC_ENT,  KC_NO,   KC_DEL,
+  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
+       KC_TAB,  KC_NO,    KC_NO,   KC_NO,   KC_NO,        KC_LEFT,  KC_DOWN,  KC_UP,  KC_RIGHT, KC_NO,  
+  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
+       XXXXXXX, KC_NO,    KC_NO,   KC_NO,   KC_NO,        KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO, 
+  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
+                         KC_LGUI,  MO(3),   KC_LSFT,      KC_TRNS,  KC_TRNS, KC_RALT
+  //                    \--------+--------+---------|   |---------+---------+-------/
   ),
 
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  )
+  [3] = LAYOUT_split_3x5_3(
+  // \--------------------------------------------.                    ,---------------------------------------------|
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // \--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+---------|
+      RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // \--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+---------|
+      RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // \--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+---------|
+                      KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+  //                 \---------------'  `--------------------------'
+  ),
 };
 
 #ifdef OLED_ENABLE