summaryrefslogtreecommitdiffstats
path: root/users
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * [Keymap] add kuatsure planck keymap (#10625)Jarrett Drouillard2021-08-122-13/+11
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548)Jacob Jerrell2021-08-1220-895/+783
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-118-0/+414
|\|
| * [Userspace] Add custom tap dancing function (#13963)Kyle Xiao2021-08-118-0/+414
| |
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-096-47/+364
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
| * [User] changes to nstickney's keymaps (#11456)Stick2021-08-096-47/+364
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | [Keymap] Drashna split transport improvement (#13905)Drashna Jaelre2021-08-074-30/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix up split stuff * Fix Split perf issues * Allow LTO to be disabled * Fixup WPM and encoders * Fixup qmk keys per scan * Add bootloader info * Change encoder pins * Fixup corne oled code * Expand transport sync * Improve user transport * Cleanup mouse processing at keymap level * Improve layer checking for mouse layering
* | Remove Full Bootmagic (#13846)James Young2021-08-0620-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-033-2/+34
|\|
| * [Keymap] Minor cleanup of bcat keymaps and userspace (#13224)Jonathan Rascher2021-08-033-2/+34
| |
* | [Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre2021-07-2617-448/+435
| |
* | [Keyboard] Add Durgod Taurus K310 keyboard (#12314)Donald Kjer2021-07-221-0/+1
| | | | | | | | Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca> Co-authored-by: Simon Arlott <sa.me.uk>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-203-0/+194
|\|
| * [Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924)imchipwood2021-07-203-0/+194
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus222021-07-1914-31/+31
| | | | | | | | | | * fix sat75 * update uint32_t to layer_state
* | `keymap_extras`: Remove deprecated defines (#12949)Ryan2021-07-068-53/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-035-402/+2324
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:35:37 +0000