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.

Sign up for GitHub

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 mj64 #10425

Merged
merged 28 commits into from
Oct 16, 2020
Merged

Melgeek mj64 #10425

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
66eda1a
[Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard
melgeek001365 Sep 17, 2020
cb2ed79
Update keyboards/melgeek/mj61/mj61.c
melgeek001365 Sep 21, 2020
fb99dd9
Update keyboards/melgeek/mj61/mj61.c
melgeek001365 Sep 21, 2020
5700bec
Merge branch 'master' of https://github.com/qmk/qmk_firmware
melgeek001365 Sep 21, 2020
b23ed6f
Merge branch 'master' of https://github.com/melgeek001365/qmk_firmware
melgeek001365 Sep 21, 2020
c7099e0
[Keyboard] MJ61 Add license header for files and the link for readme
melgeek001365 Sep 21, 2020
18ff5b3
Update keyboards/melgeek/mj61/readme.md
melgeek001365 Sep 21, 2020
897b143
Update keyboards/melgeek/mj61/rev1/config.h
melgeek001365 Sep 21, 2020
82c4d1b
Update keyboards/melgeek/mj61/rev1/rules.mk
melgeek001365 Sep 21, 2020
ebfc304
Update keyboards/melgeek/mj61/mj61.c
melgeek001365 Sep 23, 2020
86a586f
Update keyboards/melgeek/mj61/mj61.c
melgeek001365 Sep 23, 2020
7b5f1bd
Merge branch 'master' of https://github.com/qmk/qmk_firmware
melgeek001365 Sep 23, 2020
115f0b6
Merge branch 'master' of https://github.com/qmk/qmk_firmware
melgeek001365 Sep 24, 2020
d7f9edb
[Keyboard] Support MJ64 which is a 60% Hotswap RGB keyboard with arrows
melgeek001365 Sep 24, 2020
b4184b2
Update keyboards/melgeek/mj64/mj64.h
melgeek001365 Sep 30, 2020
1a82466
Update keyboards/melgeek/mj64/keymaps/default/keymap.c
melgeek001365 Sep 30, 2020
e33187d
Update keyboards/melgeek/mj64/keymaps/via/keymap.c
melgeek001365 Sep 30, 2020
389e51e
Update keyboards/melgeek/mj64/keymaps/via/keymap.c
melgeek001365 Sep 30, 2020
ad296c2
Update keyboards/melgeek/mj64/keymaps/default/keymap.c
melgeek001365 Sep 30, 2020
12d3e40
Update keyboards/melgeek/mj64/keymaps/via/keymap.c
melgeek001365 Sep 30, 2020
5253318
Update keyboards/melgeek/mj64/rev2/rules.mk
melgeek001365 Sep 30, 2020
5042c4d
Update keyboards/melgeek/mj64/rev1/rules.mk
melgeek001365 Sep 30, 2020
db54110
Update keyboards/melgeek/mj64/keymaps/via/keymap.c
melgeek001365 Sep 30, 2020
7d2d84a
Update keyboards/melgeek/mj64/info.json
melgeek001365 Sep 30, 2020
6c7ef8e
Update keyboards/melgeek/mj64/info.json
melgeek001365 Oct 10, 2020
8dd2e5c
Update keyboards/melgeek/mj64/rev1/config.h
melgeek001365 Oct 10, 2020
c0ec9b2
Update keyboards/melgeek/mj64/rev2/config.h
melgeek001365 Oct 10, 2020
b7fd134
Update the VID and PID in mj64/config.h
melgeek001365 Oct 10, 2020
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
Update keyboards/melgeek/mj64/keymaps/default/keymap.c 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
  • Loading branch information
@melgeek001365 @noroadsleft
melgeek001365 and noroadsleft authored Sep 30, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit ad296c268d97e6d2a6b8480c0d652d67211d3727
2 changes: 1 addition & 1 deletion keyboards/melgeek/mj64/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT_60_ansi( /* FN */
[1] = LAYOUT_64_ansi( /* FN */
KC_GESC, 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,
_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EEP_RST,