summaryrefslogtreecommitdiffstats
path: root/users
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-166-405/+483
|\
| * [Keymap] Update Miryoku (#14827)Manna Harbour2021-10-156-405/+483
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-157-1019/+762
|\|
| * [Keymap] Drashna Keymap Updates (#14842)Drashna Jaelre2021-10-157-1019/+762
| | | | | | | | | | | | | | * Fix issues with user split transport code * Improve OLED (More font stuff, improved keylogger, etc) * Add `KEYLOCK` macro to disable USB, borrowed from command feature. * Convert Kyria fully to proton C (no more AVR kyria) * Add Work Louder Work Board keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-168-0/+392
|\|
| * [Keymap] zigotica userspace (#14670)Sergi Meseguer2021-10-158-0/+392
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-162-2/+3
|\|
| * [Keymap] Userspace updates (#14832)stanrc852021-10-152-2/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-1/+13
|\|
| * [Keymap] Display default layer name (#14819)Reibl János Dániel2021-10-141-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-122-0/+8
|\|
| * [Keymap] Add workman layout (#14792)Reibl János Dániel2021-10-112-0/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-124-43/+112
|\|
| * [Keymap] Jonavin new obe keymap (#14657)jonavin2021-10-114-43/+112
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
* | Remove sysex API (#14723)Ryan2021-10-061-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-054-4/+20
|\|
| * [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-054-4/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-47/+43
|\|
| * [Keymap] Update to Drashna Code (#14644)Drashna Jaelre2021-09-295-47/+43
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-292-1/+75
|\|
| * [Keymap] Jonavin murphpad keymap update (#14637)jonavin2021-09-292-1/+75
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-283-57/+87
|\|
| * [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin2021-09-283-57/+87
| | | | | | | | | | (#14278) Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-281-0/+4
|\|
| * [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵Alexander Kagno2021-09-281-0/+4
| | | | | | | | | | (#14623) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-271-2/+1
|\|
| * Cleanup issues identified by lgtm (#14459)Zach White2021-09-271-2/+1
| | | | | | | | | | * cleanup issues identified by lgtm * fix the git_status check
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-2010-48/+216
|\|
| * [Keymap] Updates to existing keymaps and userspace (#14503)Konstantin Đorđević2021-09-1910-48/+216
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-132-0/+40
|\|
| * [Keymap] Userspace updates (#14418)stanrc852021-09-132-0/+40
| |
* | Move Bluetooth config to common_features.mk (#14404)Ryan2021-09-121-2/+2
|/ | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keymap] moults31 userspace and keymaps (#12025)Zac Moulton2021-09-1010-0/+482
|
* [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)Drashna Jaelre2021-09-013-105/+113
|
* [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)hvp2021-09-015-7/+120
|
* [Keymap] Jonavin keymap gmmk pro (#14220)jonavin2021-09-013-2/+30
| | | | | add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=>
* [Keymap] cwebster2 Keymap and userspace updates (#14258)Casey Webster2021-08-312-20/+21
|
* [Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji2021-08-319-243/+210
|
* [Keymap] Drashna keymap fixups (#14140)Drashna Jaelre2021-08-243-13/+7
|
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-2421-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
* Updated RGB Matrix suspend define part 3 (#13954)Drashna Jaelre2021-08-221-1/+1
| | | | | | | | | * Updated RGB Matrix suspend define part 3 * Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)" This reverts commit 80015f7fb023f27ad5307815fd5433694a3bcb4a. * Add additional boards/keymaps
* [Keymap] Drashna's Improve OLEDs and custom Split code (#14063)Drashna Jaelre2021-08-2113-309/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fill the oleds with right mods * Enable double mods on x32 oleds * Disable forced NKRO * Make oleds fancy only on good MCUs * Overhaul oled display * Further enhance oled, with kitty! * Final oled form * Not working transport * Transport id of woring * Add acceleration * fix button placement for accel macro * Fix accelartion location and behavior * Remove OLED sync code * Fix alignment issue * Remove audio hack * Fix up zima keymap * Add matrix slave scan function and cleanup drashna.h * Clean up user space * Allow userspace sync to be disable-able * Fix weird issue with audio * Fix alignment issue with user split sync * Disable second rgb matrix task * Disable additional animations * Change dynamic keymap settings * Hacky fix for borked corne * Add Blackpill (F411) support to tractyl manuform * remove manual via eeprom reset * Remove all references to rgblight twinkle * Fix issues with config processing
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-198-1/+465
|\ | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk
| * [Keymap] Add jonavin user space / common functions (#13876)jonavin2021-08-195-0/+432
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=>
| * [Keymap] Quark AJP10304 layout (#13290)Alan Pocklington2021-08-193-1/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1422-326/+1086
|\|
| * [Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121)Joshua T2021-08-1322-326/+1086
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-132-5/+23
|\|
| * [Keymap] Updates to jdelkins userspace and keymaps (#13216)Joel Elkins2021-08-132-5/+23
| | | | | | | | | | | | | | - Remove disused dz60/jdelkins_ss keymap - Manage configured features for firmware size - Improve build configuration for the secrets feature - Various keymap tweaks - Clean up formatting in various places
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-1222-908/+794
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 23:30:30 +0000