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

Jonavin murphpad keymap update #14637

Merged
merged 37 commits into from
Sep 29, 2021
Merged
Changes from 2 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ed1f2f8
fix NKRO - switch to get_mods()
Jonavin Sep 2, 2021
88a2c76
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 2, 2021
d90ba04
refactor encoder action for better readability
Jonavin Sep 3, 2021
e9cf08a
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 3, 2021
5b7abe3
refactor for better readability
Jonavin Sep 3, 2021
950a232
refactor fix - murphpad
Jonavin Sep 3, 2021
5dab943
refactor - encoder layer switching
Sep 3, 2021
4cfecda
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 3, 2021
8c517c0
gmmk pro encoder override defaults
Sep 4, 2021
2db10c7
gmmk pro override defaults
Sep 4, 2021
9427644
cleanup ENCFUNC
Sep 4, 2021
a561272
update readme
Sep 4, 2021
366d7e3
fix readme typo
Sep 4, 2021
d63342f
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 6, 2021
4f6aac6
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 9, 2021
dec722c
Merge branch 'qmk:master' into jonavin-get_mods-NKRO-fix
Jonavin Sep 11, 2021
53ddde0
update vert layout
Jonavin Sep 11, 2021
d0de37d
update vert oled display
Sep 11, 2021
8a4cff9
Update readme.md
Jonavin Sep 11, 2021
d049639
add media keys
Sep 12, 2021
ff3d54e
Merge branch 'jonavin-murphpad-keymap-update' of https://github.com/j…
Sep 12, 2021
d1c5b75
update readme
Sep 12, 2021
70d8241
Update readme.md
Jonavin Sep 12, 2021
3666099
add rgb encoder actions
Sep 12, 2021
fe36e9d
remove duplicate prototype declaration
Sep 12, 2021
e4e25c8
Merge branch 'qmk:master' into jonavin-murphpad-keymap-update
Jonavin Sep 12, 2021
3b33346
update murphpad keymap
Sep 12, 2021
0776ef4
turn off rgb when oled when PC suspended
Sep 12, 2021
808d138
update murphpad keymap
Sep 13, 2021
01448a3
update enc 1 actions
Jonavin Sep 13, 2021
15872a8
Merge branch 'qmk:master' into jonavin-murphpad-keymap-update
Jonavin Sep 23, 2021
36f7c38
Merge branch 'qmk:master' into jonavin-murphpad-keymap-update
Jonavin Sep 25, 2021
4286b87
Merge branch 'qmk:master' into jonavin-murphpad-keymap-update
Jonavin Sep 26, 2021
1239c17
Merge branch 'master'
Sep 28, 2021
6e7951e
resolve conflicts
Sep 28, 2021
74fc9cc
Merge branch 'master' of git://github.com/qmk/qmk_firmware into qmk-m…
Sep 28, 2021
73657e8
Merge branch master
Sep 28, 2021
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

These merge commits were added into this branch cleanly.

There are no new changes to show.