diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-12-19 12:07:10 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-19 12:07:10 -0800 |
commit | 98a82225aa82a5f9d4a2db80883661d3f34c9e7c (patch) | |
tree | 3529b8738218326f839e540c1c4409f0ecc2d27c | |
parent | f79e1ab7481525cfa2b63e6bc062fb7d8250c8db (diff) | |
download | qmk_firmware-98a82225aa82a5f9d4a2db80883661d3f34c9e7c.tar.gz qmk_firmware-98a82225aa82a5f9d4a2db80883661d3f34c9e7c.zip |
MechBrewery MB65S Refactor (#15515)
-rw-r--r-- | keyboards/mechbrewery/mb65s/info.json | 86 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/default/keymap.c | 79 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/default/readme.md | 2 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c | 46 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/iso/readme.md | 40 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c | 80 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md | 2 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/mb65s.h | 54 | ||||
-rw-r--r-- | keyboards/mechbrewery/mb65s/rules.mk | 8 |
10 files changed, 169 insertions, 229 deletions
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json index 51a1e2194..45145001c 100644 --- a/keyboards/mechbrewery/mb65s/info.json +++ b/keyboards/mechbrewery/mb65s/info.json | |||
@@ -1,85 +1,9 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "mb65s", | 2 | "keyboard_name": "mb65s", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "tuananhnguyen204", | 4 | "maintainer": "AnthonyNguyen168", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT_all": { | 6 | "LAYOUT_65_ansi_blocker": { |
7 | "layout": [ | ||
8 | {"x":0, "y":0}, | ||
9 | {"x":1, "y":0}, | ||
10 | {"x":2, "y":0}, | ||
11 | {"x":3, "y":0}, | ||
12 | {"x":4, "y":0}, | ||
13 | {"x":5, "y":0}, | ||
14 | {"x":6, "y":0}, | ||
15 | {"x":7, "y":0}, | ||
16 | {"x":8, "y":0}, | ||
17 | {"x":9, "y":0}, | ||
18 | {"x":10, "y":0}, | ||
19 | {"x":11, "y":0}, | ||
20 | {"x":12, "y":0}, | ||
21 | {"x":13, "y":0}, | ||
22 | {"x":14, "y":0}, | ||
23 | {"x":15, "y":0}, | ||
24 | |||
25 | {"x":0, "y":1, "w":1.5}, | ||
26 | {"x":1.5, "y":1}, | ||
27 | {"x":2.5, "y":1}, | ||
28 | {"x":3.5, "y":1}, | ||
29 | {"x":4.5, "y":1}, | ||
30 | {"x":5.5, "y":1}, | ||
31 | {"x":6.5, "y":1}, | ||
32 | {"x":7.5, "y":1}, | ||
33 | {"x":8.5, "y":1}, | ||
34 | {"x":9.5, "y":1}, | ||
35 | {"x":10.5, "y":1}, | ||
36 | {"x":11.5, "y":1}, | ||
37 | {"x":12.5, "y":1}, | ||
38 | {"x":13.5, "y":1, "w":1.5}, | ||
39 | {"x":15, "y":1}, | ||
40 | |||
41 | {"x":0, "y":2, "w":1.75}, | ||
42 | {"x":1.75, "y":2}, | ||
43 | {"x":2.75, "y":2}, | ||
44 | {"x":3.75, "y":2}, | ||
45 | {"x":4.75, "y":2}, | ||
46 | {"x":5.75, "y":2}, | ||
47 | {"x":6.75, "y":2}, | ||
48 | {"x":7.75, "y":2}, | ||
49 | {"x":8.75, "y":2}, | ||
50 | {"x":9.75, "y":2}, | ||
51 | {"x":10.75, "y":2}, | ||
52 | {"x":11.75, "y":2}, | ||
53 | {"x":12.75, "y":2, "w":2.25}, | ||
54 | {"x":15, "y":2}, | ||
55 | |||
56 | {"x":0, "y":3, "w":2.25}, | ||
57 | {"x":2.25, "y":3}, | ||
58 | {"x":3.25, "y":3}, | ||
59 | {"x":4.25, "y":3}, | ||
60 | {"x":5.25, "y":3}, | ||
61 | {"x":6.25, "y":3}, | ||
62 | {"x":7.25, "y":3}, | ||
63 | {"x":8.25, "y":3}, | ||
64 | {"x":9.25, "y":3}, | ||
65 | {"x":10.25, "y":3}, | ||
66 | {"x":11.25, "y":3}, | ||
67 | {"x":12.25, "y":3, "w":1.75}, | ||
68 | {"x":14, "y":3}, | ||
69 | {"x":15, "y":3}, | ||
70 | |||
71 | {"x":0, "y":4, "w":1.25}, | ||
72 | {"x":1.25, "y":4, "w":1.25}, | ||
73 | {"x":2.5, "y":4, "w":1.25}, | ||
74 | {"x":3.75, "y":4, "w":6.25}, | ||
75 | {"x":10, "y":4, "w":1.25}, | ||
76 | {"x":11.25, "y":4, "w":1.25}, | ||
77 | {"x":13, "y":4}, | ||
78 | {"x":14, "y":4}, | ||
79 | {"x":15, "y":4} | ||
80 | ] | ||
81 | }, | ||
82 | "LAYOUT_65_ansi": { | ||
83 | "layout": [ | 7 | "layout": [ |
84 | {"x":0, "y":0}, | 8 | {"x":0, "y":0}, |
85 | {"x":1, "y":0}, | 9 | {"x":1, "y":0}, |
@@ -154,7 +78,7 @@ | |||
154 | {"x":15, "y":4} | 78 | {"x":15, "y":4} |
155 | ] | 79 | ] |
156 | }, | 80 | }, |
157 | "LAYOUT_65_ansi_split_bs": { | 81 | "LAYOUT_65_ansi_blocker_split_bs": { |
158 | "layout": [ | 82 | "layout": [ |
159 | {"x":0, "y":0}, | 83 | {"x":0, "y":0}, |
160 | {"x":1, "y":0}, | 84 | {"x":1, "y":0}, |
@@ -230,7 +154,7 @@ | |||
230 | {"x":15, "y":4} | 154 | {"x":15, "y":4} |
231 | ] | 155 | ] |
232 | }, | 156 | }, |
233 | "LAYOUT_65_iso": { | 157 | "LAYOUT_65_ansi_blocker_isoenter": { |
234 | "layout": [ | 158 | "layout": [ |
235 | {"x":0, "y":0}, | 159 | {"x":0, "y":0}, |
236 | {"x":1, "y":0}, | 160 | {"x":1, "y":0}, |
@@ -279,7 +203,7 @@ | |||
279 | {"x":13.75, "y":1, "w":1.25, "h":2}, | 203 | {"x":13.75, "y":1, "w":1.25, "h":2}, |
280 | {"x":15, "y":2}, | 204 | {"x":15, "y":2}, |
281 | 205 | ||
282 | {"x":0, "y":3, "w":1.25}, | 206 | {"x":0, "y":3, "w":2.25}, |
283 | {"x":2.25, "y":3}, | 207 | {"x":2.25, "y":3}, |
284 | {"x":3.25, "y":3}, | 208 | {"x":3.25, "y":3}, |
285 | {"x":4.25, "y":3}, | 209 | {"x":4.25, "y":3}, |
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c index 404c64df6..f50119019 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c +++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c | |||
@@ -17,44 +17,47 @@ | |||
17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
20 | /* Keymap (Base Layer) Default Layer | ||
21 | * ,----------------------------------------------------------------. | ||
22 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |Del | | ||
23 | * |----------------------------------------------------------------| | ||
24 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |PgUp| | ||
25 | * |----------------------------------------------------------------| | ||
26 | * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return |PgDn| | ||
27 | * |----------------------------------------------------------------| | ||
28 | * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Up|End | | ||
29 | * |----------------------------------------------------------------| | ||
30 | * |Ctrl|Win |Alt | Space |Alt| FN| |Lef|Dow|Rig | | ||
31 | * `----------------------------------------------------------------' | ||
32 | */ | ||
33 | [0] = LAYOUT_65_ansi( | ||
34 | 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, | ||
35 | 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, | ||
36 | 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, | ||
37 | 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, | ||
38 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), | ||
39 | 20 | ||
40 | /* Keymap Fn Layer | 21 | /* Keymap (Base Layer) Default Layer |
41 | * ,----------------------------------------------------------------. | 22 | * ,---------------------------------------------------------------. |
42 | * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del |Ins | | 23 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |Del| |
43 | * |----------------------------------------------------------------| | 24 | * |---------------------------------------------------------------| |
44 | * | | |Up | | | | | |PSc|SLk|Pau|Up | | | | | 25 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |PUp| |
45 | * |----------------------------------------------------------------| | 26 | * |---------------------------------------------------------------| |
46 | * | |Lef|Dow|Rig| | | | |Hom|PUp|Lef|Rig| | | | 27 | * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return |PDn| |
47 | * |----------------------------------------------------------------| | 28 | * |---------------------------------------------------------------| |
48 | * | |BL+|BL-|BLT|BLS|BLM| | |End|PDn|Dow| |PUp| | | 29 | * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Up|End| |
49 | * |----------------------------------------------------------------| | 30 | * |---------------------------------------------------------------| |
50 | * | | | | | | | |Hom|PDn|End | | 31 | * |Ctrl|Win |Alt | Space |Alt | Fn | |Lef|Dow|Rig| |
51 | * `----------------------------------------------------------------' | 32 | * `---------------------------------------------------------------' |
52 | */ | 33 | */ |
53 | [1] = LAYOUT_65_ansi( | 34 | [0] = LAYOUT_65_ansi_blocker( |
54 | 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, | 35 | 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, |
55 | _______,_______, KC_UP, _______, _______,_______,_______,_______, KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, _______, _______, _______, | 36 | 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, |
56 | _______,KC_LEFT, KC_DOWN,KC_RGHT,_______,_______,_______,_______, KC_HOME,KC_PGUP,KC_LEFT, KC_RGHT, _______, _______, | 37 | 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, |
57 | _______, BL_DEC, BL_TOGG,BL_INC, BL_STEP,BL_BRTG,_______,_______, KC_END, KC_PGDN,KC_DOWN, _______, KC_PGUP, _______, | 38 | 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, |
58 | _______,_______, _______, _______, _______,_______, KC_HOME, KC_PGDN, KC_END), | 39 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
40 | ), | ||
41 | |||
42 | /* Keymap Fn Layer | ||
43 | * ,---------------------------------------------------------------. | ||
44 | * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |Ins| | ||
45 | * |---------------------------------------------------------------| | ||
46 | * | | |Up | | | | | |PSc|SLk|Pau|Up | | | | | ||
47 | * |---------------------------------------------------------------| | ||
48 | * | |Lef|Dow|Rig| | | | |Hom|PUp|Lef|Rig| | | | ||
49 | * |---------------------------------------------------------------| | ||
50 | * | |BL-|BLT|BL+|BLS|BLM| | |End|PDn|Dow| |PUp| | | ||
51 | * |---------------------------------------------------------------| | ||
52 | * | | | | | | | |Hom|PDn|End| | ||
53 | * `---------------------------------------------------------------' | ||
54 | */ | ||
55 | [1] = LAYOUT_65_ansi_blocker( | ||
56 | 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, | ||
57 | _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, _______, | ||
58 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, | ||
59 | _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, BL_BRTG, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, | ||
60 | _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | ||
61 | ), | ||
59 | 62 | ||
60 | }; | 63 | }; |
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md b/keyboards/mechbrewery/mb65s/keymaps/default/readme.md index 2cb43c5e1..50d242b75 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md +++ b/keyboards/mechbrewery/mb65s/keymaps/default/readme.md | |||
@@ -1 +1 @@ | |||
# The default keymap for kbd67 | # The default keymap for the MB65S | ||
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c index 605bbf666..6ef0dfdb0 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c +++ b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c | |||
@@ -18,21 +18,21 @@ | |||
18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
19 | 19 | ||
20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
21 | 21 | ||
22 | /* Base layer | 22 | /* Base layer |
23 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | 23 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
24 | * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│ | 24 | * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│ |
25 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | 25 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
26 | * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │PUp│ | 26 | * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │PUp│ |
27 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ | 27 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ |
28 | * │ FN │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │PDn│ | 28 | * │ Fn │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │PDn│ |
29 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ | 29 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ |
30 | * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ | 30 | * │Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ |
31 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴───┴──┬───┼───┼───┤ | 31 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ |
32 | * │Ctrl│LGUI│LAlt│ Space │RAlt│App │ ← │ ↓ │ → │ | 32 | * │Ctrl│LGUI│LAlt│ Space │RAlt│App │ │ ← │ ↓ │ → │ |
33 | * └────┴────┴────┴─────────────────────┴────┴─────────┴───┴───┴───┘ | 33 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
34 | */ | 34 | */ |
35 | [0] = LAYOUT_65_iso( | 35 | [0] = LAYOUT_65_ansi_blocker_isoenter( |
36 | KC_GESC, 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, | 36 | KC_GESC, 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, |
37 | 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_PGUP, | 37 | 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_PGUP, |
38 | MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, | 38 | MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, |
@@ -41,26 +41,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
41 | ), | 41 | ), |
42 | 42 | ||
43 | /* Function layer | 43 | /* Function layer |
44 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐ | 44 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
45 | * │§ │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│ | 45 | * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│ |
46 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤ | 46 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
47 | * │Caps │Prv│Pau│Nxt│ │ │ │ │ │ │BL+│BL-│BL │RESET│Ins │ | 47 | * │Caps │Prv│Pau│Nxt│ │ │ │ │ │ │BL+│BL-│BLT│Reset│Ins│ |
48 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├────┤ | 48 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ |
49 | * │ │V- │V0 │V+ │ │ │ │ │ │ │ │ │ │ │Home│ | 49 | * │ │Vl-│V0 │Vl+│ │ │ │ │ │ │ │ │ │ │Hom│ |
50 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤ | 50 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ |
51 | * │ │BL+│BL-│BLT│BLS│BLM│ │ │ │ │ │ │LClick│MUp│End │ | 51 | * │ │BL-│BLT│BL+│BLS│BLM│ │ │ │ │ │LClick│MUp│End│ |
52 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴───┴──┬───┼───┼────┤ | 52 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ |
53 | * │ │ │ │ │ │ │MLt│MDw│MRgt│ | 53 | * │ │ │ │ │ │ │ │MLt│MDw│MRt│ |
54 | * └────┴────┴────┴─────────────────────┴────┴─────────┴───┴───┴────┘ | 54 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
55 | */ | 55 | */ |
56 | 56 | [1] = LAYOUT_65_ansi_blocker_isoenter( | |
57 | [1] = LAYOUT_65_iso( | ||
58 | 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, | 57 | 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, |
59 | KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC, BL_DEC, BL_TOGG, KC_INS, | 58 | KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC, BL_DEC, BL_TOGG, KC_INS, |
60 | _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_HOME, | 59 | _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_HOME, |
61 | _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END, | 60 | _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END, |
62 | _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R | 61 | _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R |
63 | ), | 62 | ), |
64 | }; | ||
65 | |||
66 | 63 | ||
64 | }; | ||
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md b/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md index dfbd082c7..2397d2e85 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md +++ b/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md | |||
@@ -2,32 +2,32 @@ | |||
2 | 2 | ||
3 | Almost a default ISO layout, except Caps Lock swapped `MO(1)`. | 3 | Almost a default ISO layout, except Caps Lock swapped `MO(1)`. |
4 | 4 | ||
5 | Made with `LAYOUT_65_iso` | 5 | Made with `LAYOUT_65_ansi_blocker_isoenter` |
6 | 6 | ||
7 | ``` | 7 | ``` |
8 | Base layer | 8 | Base layer |
9 | ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | 9 | ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
10 | │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │ | 10 | │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│ |
11 | ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | 11 | ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
12 | │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ^ │ │Del│ | 12 | │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │PUp│ |
13 | ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ | 13 | ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ |
14 | │ FN │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ ' │ │PUp│ | 14 | │ Fn │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │PDn│ |
15 | ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ | 15 | ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ |
16 | │Shft│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │ Shift│ ↑ │PDn│ | 16 | │Shft │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ |
17 | ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | 17 | ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ |
18 | │Ctrl│LAlt│LGUI│ Space │RAlt│App │RCtl│ ← │ ↓ │ → │ | 18 | │Ctrl│LGUI│LAlt│ Space │RAlt│App │ │ ← │ ↓ │ → │ |
19 | └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | 19 | └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
20 | 20 | ||
21 | Function layer | 21 | Function layer |
22 | ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐ | 22 | ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
23 | │§ │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│ | 23 | │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│ |
24 | ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤ | 24 | ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
25 | │Caps │Prv│Pau│Nxt│ │ │ │ │ │ │BL+│BL-│BL │RESET│Ins │ | 25 | │Caps │Prv│Pau│Nxt│ │ │ │ │ │ │BL+│BL-│BLT│Reset│Ins│ |
26 | ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├────┤ | 26 | ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ |
27 | │ │V- │V0 │V+ │ │ │ │ │ │ │ │ │ │ │Home│ | 27 | │ │Vl-│V0 │Vl+│ │ │ │ │ │ │ │ │ │ │Hom│ |
28 | ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤ | 28 | ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ |
29 | │ │TOG│MOD│HU+│HU-│SA+│SA-│ │ │ │ │ │LClick│MUp│End │ | 29 | │ │BL-│BLT│BL+│BLS│BLM│ │ │ │ │ │LClick│MUp│End│ |
30 | ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼────┤ | 30 | ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ |
31 | │ │ │ │ │ │ │ │MLt│MDw│MRgt│ | 31 | │ │ │ │ │ │ │ │MLt│MDw│MRt│ |
32 | └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴────┘ | 32 | └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ |
33 | ``` | 33 | ``` |
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c index 36a135e24..b8a915f2b 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c +++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c | |||
@@ -17,45 +17,47 @@ | |||
17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
20 | /* Keymap (Base Layer) Default Layer | ||
21 | * ,----------------------------------------------------------------. | ||
22 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| - | = |Bsp|Del|Home| | ||
23 | * |----------------------------------------------------------------| | ||
24 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [ | ] | \ |PgUp| | ||
25 | * |----------------------------------------------------------------| | ||
26 | * |Ctrl | A| S| D| F| G| H| J| K| L| ; | ' |Return |PgDn| | ||
27 | * |----------------------------------------------------------------| | ||
28 | * |Shift | Z| X| C| V| B| N| M| , | . | / |Shift | Up|Home| | ||
29 | * |----------------------------------------------------------------| | ||
30 | * |Ctrl|Alt |GUI | Space |GUI |FN |Lef|Dow|Rig | | ||
31 | * `----------------------------------------------------------------' | ||
32 | */ | ||
33 | [0] = LAYOUT_65_ansi_split_bs( | ||
34 | 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, | ||
35 | 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, | ||
36 | KC_LCTL, 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, | ||
37 | 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, | ||
38 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | ||
39 | ), | ||
40 | 20 | ||
41 | /* Keymap Fn Layer | 21 | /* Keymap (Base Layer) Default Layer |
42 | * ,----------------------------------------------------------------. | 22 | * ,---------------------------------------------------------------. |
43 | * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |Del|Ins | | 23 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| - | = |Bsp|Del|Hom| |
44 | * |----------------------------------------------------------------| | 24 | * |---------------------------------------------------------------| |
45 | * | | |Up | | | | | |PSc|SLk|Pau|Up | | | | | 25 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [ | ] | \ |PUp| |
46 | * |----------------------------------------------------------------| | 26 | * |---------------------------------------------------------------| |
47 | * | |Lef|Dow|Rig| | | | |Hom|PUp|Lef|Rig| |Vol+| | 27 | * |Ctrl | A| S| D| F| G| H| J| K| L| ; | ' |Return |PDn| |
48 | * |----------------------------------------------------------------| | 28 | * |---------------------------------------------------------------| |
49 | * | |BL+|BL-|BLT|BLS|BLM| | |End|PDn|Dow| | |Vol-| | 29 | * |Shift | Z| X| C| V| B| N| M| , | . | / |Shift | Up|Hom| |
50 | * |----------------------------------------------------------------| | 30 | * |---------------------------------------------------------------| |
51 | * | | | | | | |Prv|Ply|Nxt | | 31 | * |Ctrl|Alt |GUI | Space |GUI |Fn | |Lef|Dow|Rig| |
52 | * `----------------------------------------------------------------' | 32 | * `---------------------------------------------------------------' |
53 | */ | 33 | */ |
54 | [1] = LAYOUT_65_ansi_split_bs( | 34 | [0] = LAYOUT_65_ansi_blocker_split_bs( |
55 | 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, | 35 | 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, |
56 | _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, _______, | 36 | 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, |
57 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_VOLU, | 37 | KC_LCTL, 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, |
58 | _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, BL_BRTG, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, KC_VOLD, | 38 | 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, |
59 | _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT), | 39 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
40 | ), | ||
41 | |||
42 | /* Keymap Fn Layer | ||
43 | * ,---------------------------------------------------------------. | ||
44 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| - | = | |Del|Ins| | ||
45 | * |---------------------------------------------------------------| | ||
46 | * | | |Up | | | | | |PSc|SLk|Pau|Up | | | | | ||
47 | * |---------------------------------------------------------------| | ||
48 | * | |Lef|Dow|Rig| | | | |Hom|PUp|Lef|Rig| |Vl+| | ||
49 | * |---------------------------------------------------------------| | ||
50 | * | |BL-|BLT|BL+|BLS|BLM| | |End|PDn|Dow| | |Vl-| | ||
51 | * |---------------------------------------------------------------| | ||
52 | * | | | | | | | |Prv|Ply|Nxt| | ||
53 | * `---------------------------------------------------------------' | ||
54 | */ | ||
55 | [1] = LAYOUT_65_ansi_blocker_split_bs( | ||
56 | 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, | ||
57 | _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, _______, | ||
58 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_VOLU, | ||
59 | _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, BL_BRTG, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, KC_VOLD, | ||
60 | _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT | ||
61 | ), | ||
60 | 62 | ||
61 | }; | 63 | }; |
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md b/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md index 2cb43c5e1..50d242b75 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md +++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md | |||
@@ -1 +1 @@ | |||
# The default keymap for kbd67 | # The default keymap for the MB65S | ||
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk b/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk deleted file mode 100644 index 4da205a16..000000000 --- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | LTO_ENABLE = yes | ||
diff --git a/keyboards/mechbrewery/mb65s/mb65s.h b/keyboards/mechbrewery/mb65s/mb65s.h index 9519208e3..f1faf3698 100644 --- a/keyboards/mechbrewery/mb65s/mb65s.h +++ b/keyboards/mechbrewery/mb65s/mb65s.h | |||
@@ -18,6 +18,22 @@ | |||
18 | 18 | ||
19 | #include "quantum.h" | 19 | #include "quantum.h" |
20 | 20 | ||
21 | #define XXX KC_NO | ||
22 | |||
23 | /* | ||
24 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ | ||
25 | * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0E │ 2u Backspace | ||
26 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ | ||
27 | * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ │ │ | ||
28 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter | ||
29 | * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F │ │1E │ │ | ||
30 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ | ||
31 | * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ | ||
32 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ | ||
33 | * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │ | ||
34 | * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ | ||
35 | */ | ||
36 | |||
21 | /* This a shortcut to help you visually see your layout. | 37 | /* This a shortcut to help you visually see your layout. |
22 | * | 38 | * |
23 | * The first section contains all of the arguments representing the physical | 39 | * The first section contains all of the arguments representing the physical |
@@ -26,7 +42,7 @@ | |||
26 | * The second converts the arguments into a two-dimensional array which | 42 | * The second converts the arguments into a two-dimensional array which |
27 | * represents the switch matrix. | 43 | * represents the switch matrix. |
28 | */ | 44 | */ |
29 | #define LAYOUT_all( \ | 45 | #define LAYOUT_65_ansi_blocker_split_bs( \ |
30 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ | 46 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ |
31 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ | 47 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ |
32 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ | 48 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ |
@@ -34,14 +50,14 @@ | |||
34 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ | 50 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ |
35 | ) \ | 51 | ) \ |
36 | { \ | 52 | { \ |
37 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ | 53 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ |
38 | { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | 54 | { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ |
39 | { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ | 55 | { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ |
40 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ | 56 | { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ |
41 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ | 57 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \ |
42 | } | 58 | } |
43 | 59 | ||
44 | #define LAYOUT_65_ansi( \ | 60 | #define LAYOUT_65_ansi_blocker( \ |
45 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ | 61 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ |
46 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ | 62 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ |
47 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ | 63 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ |
@@ -49,14 +65,14 @@ | |||
49 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ | 65 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ |
50 | ) \ | 66 | ) \ |
51 | { \ | 67 | { \ |
52 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \ | 68 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \ |
53 | { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | 69 | { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ |
54 | { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ | 70 | { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ |
55 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ | 71 | { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ |
56 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ | 72 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \ |
57 | } | 73 | } |
58 | 74 | ||
59 | #define LAYOUT_65_iso( \ | 75 | #define LAYOUT_65_ansi_blocker_isoenter( \ |
60 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ | 76 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ |
61 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ | 77 | K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ |
62 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \ | 78 | K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \ |
@@ -64,11 +80,9 @@ | |||
64 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ | 80 | K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ |
65 | ) \ | 81 | ) \ |
66 | { \ | 82 | { \ |
67 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \ | 83 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \ |
68 | { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | 84 | { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ |
69 | { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ | 85 | { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ |
70 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ | 86 | { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ |
71 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ | 87 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \ |
72 | } | 88 | } |
73 | |||
74 | #define LAYOUT_65_ansi_split_bs LAYOUT_all | ||
diff --git a/keyboards/mechbrewery/mb65s/rules.mk b/keyboards/mechbrewery/mb65s/rules.mk index 09f27b3a5..d0cf09161 100644 --- a/keyboards/mechbrewery/mb65s/rules.mk +++ b/keyboards/mechbrewery/mb65s/rules.mk | |||
@@ -10,12 +10,12 @@ BOOTLOADER = atmel-dfu | |||
10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
14 | COMMAND_ENABLE = no # Commands for debug and configuration | 14 | COMMAND_ENABLE = no # Commands for debug and configuration |
15 | NKRO_ENABLE = yes # Enable N-Key Rollover | 15 | NKRO_ENABLE = yes # Enable N-Key Rollover |
16 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 16 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
17 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 17 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
18 | AUDIO_ENABLE = no # Audio output | 18 | AUDIO_ENABLE = no # Audio output |
19 | LTO_ENABLE = yes | 19 | LTO_ENABLE = yes |
20 | 20 | ||
21 | LAYOUTS = 65_ansi 65_iso 65_ansi_split_bs | 21 | LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs |