summaryrefslogtreecommitdiffstats
path: root/layouts/community/66_ansi/mechmerlin
Commit message (Collapse)AuthorAgeFilesLines
* merge upstream 713427clokher2023-04-261-12/+12
|
* Deprecate `VLK_TOG` for `VK_TOGG` (#18807)Ryan2022-10-221-1/+1
|
* Remove legacy Grave Escape keycodes (#18787)Ryan2022-10-201-1/+1
|
* Remove legacy EEPROM clear keycodes (#18782)Ryan2022-10-201-1/+1
| | | | | | | | | | | * `EEP_RST` -> `EE_CLR`, default-ish keymaps * `EEP_RST` -> `EE_CLR`, user keymaps * `EEP_RST` -> `EE_CLR`, community layouts * `EEP_RST` -> `EE_CLR`, userspace * `EEP_RST` -> `EE_CLR`, docs & core
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211-1/+1
|
* [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-051-1/+1
|
* Merlin's userspace updates (#8074)MechMerlin2020-02-032-8/+19
|
* [Keymap] Userspace Keymap Updates (#5215)MechMerlin2019-02-282-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable velocikey for my userspace and explicitly for my 75% layout * add guards to only turn on RGB stuff if the RGB pin is actually defined * update 60_ansi keymap * update the 60_ansi_split_bs_rshift keymap * update 66_ansi keymap * update docs * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/66_ansi/mechmerlin/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * remove my attempt to find a good way to detect this * move audio clicky into user space and do feature setting per keyboard * fixup 66_ansi keymap * update changelog * update readme
* Keymap: Merlin Learns to QMK (#3820)MechMerlin2018-08-312-12/+4
| | | | | | | | | | | | | | | | | | | | | | * Fix up my keymaps to use more QMK features * update 60_ansi readme * add the start of my userspace * begin to use my new userspace * use more of my userspace * spread userspace love to my clueboard * spread userspace love to 75 layout * add a fairly vanilla readme * put the FNX into a userspace incase I ever want to use it for something else * respond to drashna's code review comments
* Keymap: copy skully's faux clicky mods (#3628)MechMerlin2018-08-112-1/+13
|
* add some of my default layouts for the clueboard I gotmechmerlin2018-08-111-0/+36