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

3 files changed, 7 insertions, 105 deletions

diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index 72c3fee6f3..a0f4f2895c 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 
   [_LOWER] =  LAYOUT_ortho_4x12(
-   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
+   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, RCMD(RALT(KC_O)), RCMD(RALT(KC_L)), _______,
    _______, KC_LT, KC_GT, KC_LPRN, KC_RPRN, KC_GRV,       KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
    KC_LALT, _______, _______, _______, KC_EQL, KC_QUES,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
    _______, _______, _______, _______, _______, KC_TRNS,  KC_TRNS, KC_RGUI, _______, _______, _______, _______
diff --git a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
deleted file mode 100644
index 77242596d2..0000000000
--- a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    LGUI(KC_LCTL),
-        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-        KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    LGUI(KC_LALT),
-        _______, _______, _______, _______, LOWER,
-                                                       KC_LGUI, _______,
-                                                                _______,
-                                         KC_ENT, RGUI(KC_RCTL), _______,
-        // right hand
-        _______,       _______, _______, _______, _______, _______, _______,
-        RGUI(KC_RCTL), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-                       KC_H,    KC_J,    KC_K,    KC_L,    KC_RSFT, KC_RGUI,
-        RGUI(KC_RALT), KC_N,    KC_M,    KC_RCTL, KC_DOT,  KC_RALT, RGUI(KC_RSFT),
-                                RAISE,   _______, _______, _______, _______,
-             _______, KC_RGUI,
-             _______,
-             _______, KC_BSPC, KC_ENT
-    ),
-
-    [_LOWER] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-        _______, KC_LT,   KC_GT,   KC_LPRN, KC_RPRN, KC_GRV,
-        KC_LALT, _______, _______, _______, KC_EQL,  KC_QUES, _______,
-        _______, _______, _______, _______, _______,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_NO,   KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
-                 KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
-        KC_NO,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
-                          KC_RGUI, _______, _______, _______, _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    ),
-
-    [_RAISE] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,
-        KC_NO,   KC_COLN, KC_SCLN, KC_DQT,  KC_QUOT, KC_BSLS,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, KC_LGUI,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______, KC_NO,
-        KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-                 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_NO,
-        _______, ADJUST,  _______, _______, _______, _______, _______,
-                          _______, _______, _______, _______, _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    ),
-
-    [_ADJUST] = LAYOUT_ergodox(
-        // left hand
-        _______,  _______,     _______,   _______, _______, _______, _______,
-        _______,  _______,     _______,   _______, _______, _______,
-        _______,  _______,     _______,   _______, _______, _______, _______,
-        KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, RESET,   _______,
-        _______, _______, _______, _______, KC_LGUI,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______,  _______,
-        KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    _______,
-                 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,
-        _______, _______, _______, _______, _______, KC_LANG1, KC_LANG2,
-                          _______, _______, _______, _______,  _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    )
-};
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
index f2586086c2..8079b48f52 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
@@ -35,9 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LOWER] = LAYOUT_reviung39(
-   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
+   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, RCMD(RALT(KC_I)), RCMD(RALT(KC_O)), _______,
    _______, KC_LT, KC_GT, KC_LPRN, KC_RPRN, KC_GRV,       KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
-   KC_LALT, _______, _______, _______, KC_EQL, KC_QUES,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
+   KC_LALT, _______, _______, ADJUST, KC_EQL, KC_QUES,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
                                       _______,  _______,  KC_RGUI
   ),
 
@@ -49,9 +49,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT_reviung39(
-    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,   RGB_TOG,    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  XXXXXXX,
-    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,   XXXXXXX,    KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LANG1,  KC_LANG2,
-                                                   KC_LGUI,  XXXXXXX,  _______
+    _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), _______, _______, RCMD(LALT(KC_0)), _______,
+    RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
+    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  RESET,    _______,  _______,  _______,  _______,  _______,  _______,
+                                                   KC_LGUI,  _______,  _______
   ),
 };