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

3 files changed, 38 insertions, 38 deletions

diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
index 512c04a296..5625e07568 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap (Base Layer) Default Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Hom|
      * |---------------------------------------------------------------|
      * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PUp|
      * |---------------------------------------------------------------|
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------'
      */
     [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -41,23 +41,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap Fn Layer
      * ,---------------------------------------------------------------.
-     * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |Ins|
+     * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |   |
      * |---------------------------------------------------------------|
-     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |Caps |   |Up |   |   |   |   |   |Ins|   |PSc|SLk|Pau|     |   |
      * |---------------------------------------------------------------|
-     * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|  Reset |   |
+     * |      |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PUp|        |   |
      * |---------------------------------------------------------------|
-     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |PUp|   |
+     * |        |   |   |   |   |   |Vo-|Vo+|Mut|End|PDn|      |   |   |
      * |---------------------------------------------------------------|
-     * |    |    |    |                        |    |    | |Hom|PDn|End|
+     * |    |    |    |                        |    |    | |   |   |   |
      * `---------------------------------------------------------------'
      */
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   _______,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
index f6101815ac..7899762838 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Base layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PUp│
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
@@ -42,23 +42,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Function layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│
+     * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │   │
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │Prv│Pau│Nxt│   │   │   │   │   │   │   │   │   │Reset│Ins│
+     * │Caps │   │Up │   │   │   │   │   │Ins│   │PSc│SLk│Pau│     │   │
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-     * │      │Vl-│V0 │Vl+│   │   │   │   │   │   │   │   │   │    │Hom│
+     * │      │Lef│Dow│Rig│   │   │   │   │   │   │Hom│PUp│   │    │   │
      * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │        │BL-│BLT│BL+│BLS│BLM│   │   │   │   │   │LClick│MUp│End│
+     * │        │   │   │   │   │   │Vo-│Vo+│Mut│End│PDn│      │   │   │
      * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │    │    │ │MLt│MDw│MRt│
+     * │    │    │    │                        │    │    │ │   │   │   │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [1] = LAYOUT_65_ansi_blocker_isoenter(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_HOME,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
-        _______, _______, _______,                   _______,                            _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
     ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
index 0cbb5040ea..db56fae442 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
@@ -20,44 +20,44 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap (Base Layer) Default Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Del|Hom|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Bsp|Hom|
      * |---------------------------------------------------------------|
      * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  \  |PUp|
      * |---------------------------------------------------------------|
      * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PDn|
      * |---------------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|Hom|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|End|
      * |---------------------------------------------------------------|
-     * |Ctrl|LGUI|Alt |          Space         |GUI |Fn  | |Lef|Dow|Rig|
+     * |Ctrl|LGUI|Alt |          Space         |Alt |Fn  | |Lef|Dow|Rig|
      * `---------------------------------------------------------------'
      */
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     /* Keymap Fn Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |   |Del|Ins|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Del|Del|   |
      * |---------------------------------------------------------------|
-     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |Caps |   |Up |   |   |   |   |   |Ins|   |PSc|SLk|Pau|     |   |
      * |---------------------------------------------------------------|
-     * |       |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig| Reset |Vl+|
+     * |       |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PUp|       |   |
      * |---------------------------------------------------------------|
-     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |   |Vl-|
+     * |        |   |   |   |   |   |Vo-|Vo+|Mut|End|PDn|      |   |   |
      * |---------------------------------------------------------------|
-     * |    |    |    |                        |    |    | |Prv|Ply|Nxt|
+     * |    |    |    |                        |    |    | |   |   |   |
      * `---------------------------------------------------------------'
      */
     [1] = LAYOUT_all(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_INS,
-        _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   KC_VOLU,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN,          _______, _______, KC_VOLD,
-        _______, _______, _______,                            _______,                            _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        _______,          _______, KC_UP,   _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,
+        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
     ),
 
 };