Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MelGeek MJ6XY Refactor #18862

Merged
merged 56 commits into from
Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6dc6222
mj6xy.h: convert tabs to spaces
noroadsleft Oct 24, 2022
da80128
info.json: convert tabs to spaces
noroadsleft Oct 24, 2022
bca43c2
info.json: apply friendly formatting
noroadsleft Oct 24, 2022
4ae7a35
rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan
noroadsleft Oct 24, 2022
afcff4a
add K31 position to LAYOUT_60_iso
noroadsleft Oct 24, 2022
bf853f7
rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_spl…
noroadsleft Oct 24, 2022
ba8e570
add K31 position to LAYOUT_60_iso_arrow
noroadsleft Oct 24, 2022
e93c17b
add K31 position to LAYOUT_60_iso_arrow_6u_spc
noroadsleft Oct 24, 2022
6aa8783
add K31 position to LAYOUT_60_iso_arrow_3u_spc
noroadsleft Oct 24, 2022
a165b1b
refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan
noroadsleft Oct 24, 2022
1e4a0a0
add K31 position to LAYOUT_64_iso
noroadsleft Oct 24, 2022
f56b564
add K31 position to LAYOUT_64_iso_3u_spc
noroadsleft Oct 24, 2022
e47db05
add K31 position to LAYOUT_64_iso_split_3u_spc
noroadsleft Oct 24, 2022
e7e3ca6
remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap
noroadsleft Oct 25, 2022
6f5e87a
remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap
noroadsleft Oct 25, 2022
14c0082
rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs
noroadsleft Oct 25, 2022
80e6d89
add K31 position to LAYOUT_60_iso_split_bs
noroadsleft Oct 25, 2022
e293460
rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_…
noroadsleft Oct 25, 2022
302346e
add K31 position to LAYOUT_60_iso_arrow_split_bs
noroadsleft Oct 25, 2022
7b5a55c
add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs
noroadsleft Oct 25, 2022
42620cf
add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc
noroadsleft Oct 25, 2022
6542b7f
refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_spl…
noroadsleft Oct 25, 2022
b046240
add K31 position to LAYOUT_64_iso_split_bs
noroadsleft Oct 25, 2022
e26a738
add K31 position to LAYOUT_64_iso_3u_spc_split_bs
noroadsleft Oct 25, 2022
214f25b
add K31 position to LAYOUT_64_iso_split_bs_3u_spc
noroadsleft Oct 25, 2022
89f6e1a
remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap
noroadsleft Oct 25, 2022
ca460f0
remove LAYOUT_64_ansi_6u_spc macro and keymap
noroadsleft Oct 25, 2022
8a1b7b7
remove LAYOUT_60_iso_arrow_6u_spc macro and keymap
noroadsleft Oct 25, 2022
9675a52
remove LAYOUT_64_iso_6u_spc macro and keymap
noroadsleft Oct 25, 2022
1bdd9fb
remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap
noroadsleft Oct 25, 2022
2be6dd4
remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap
noroadsleft Oct 25, 2022
0b34d8e
remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap
noroadsleft Oct 25, 2022
4acd09d
remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap
noroadsleft Oct 26, 2022
3eba42b
remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap
noroadsleft Oct 26, 2022
9f30e0a
remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap
noroadsleft Oct 26, 2022
6e09621
refactor keymaps
noroadsleft Oct 26, 2022
7e8b291
remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap
noroadsleft Oct 26, 2022
5e2c4f5
remove LAYOUT_60_iso_arrow_3u_spc macro and keymap
noroadsleft Oct 26, 2022
47d999c
remove LAYOUT_60_iso_tsangan_split_bs macro and keymap
noroadsleft Oct 26, 2022
40bb53d
remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap
noroadsleft Oct 26, 2022
b223e61
remove LAYOUT_64_ansi_3u_spc macro and keymap
noroadsleft Oct 26, 2022
c9f67ab
remove LAYOUT_64_iso_3u_spc macro and keymap
noroadsleft Oct 26, 2022
68f221b
remove LAYOUT_60_iso_split_bs macro and keymap
noroadsleft Oct 26, 2022
a585060
remove LAYOUT_60_iso_split_rshift macro and keymap
noroadsleft Oct 26, 2022
7c07d2f
add LAYOUT_60_ansi_split_bs_rshift macro and keymap
noroadsleft Oct 26, 2022
e5e91f6
remove LAYOUT_60_ansi_split_bs macro and keymap
noroadsleft Oct 26, 2022
e13c09e
add LAYOUT_60_tsangan_hhkb macro and keymap
noroadsleft Oct 26, 2022
3768e48
remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap
noroadsleft Oct 26, 2022
973ab80
standardize keymap names
noroadsleft Oct 26, 2022
8160bb8
add LAYOUT_all; refactor default keymap
noroadsleft Oct 26, 2022
6b616ab
refactor via keymap
noroadsleft Oct 26, 2022
ec471f0
improve keyboard readme
noroadsleft Oct 26, 2022
90d7433
fix default_60_tsangan_hhkb keymap
noroadsleft Oct 26, 2022
431dd9e
mj6xy.h: add matrix diagram
noroadsleft Oct 27, 2022
6b1b92c
KC_GESC -> QK_GESC per fauxpark
noroadsleft Oct 27, 2022
ef9ca75
KC_SLCK -> KC_SCRL per fauxpark
noroadsleft Oct 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add K31 position to LAYOUT_60_iso_arrow_6u_spc
  • Loading branch information
noroadsleft committed Oct 24, 2022
commit e93c17be24074c0259f90a7e11975dda860a5dba
3 changes: 2 additions & 1 deletion keyboards/melgeek/mj6xy/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,8 @@
{"x":12.75, "y":2},
{"x":13.75, "y":1, "w":1.25, "h":2},

{"x":0, "y":3, "w":2.25},
{"x":0, "y":3, "w":1.25},
{"x":1.25, "y":3},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
Expand Down
4 changes: 2 additions & 2 deletions keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_DEL,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT,KC_DOWN, KC_RGHT),

LAYOUT_60_iso_arrow_6u_spc(
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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

4 changes: 2 additions & 2 deletions keyboards/melgeek/mj6xy/mj6xy.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
k40, k41, k42, k45, k4a, k4b, k4c, k4d, k4e \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
{ k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
{ k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e } \
}

Expand Down