summaryrefslogtreecommitdiffstats
path: root/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Rework and expand Pointing Device support (#14343)Drashna Jaelre2021-11-141-16/+16
| | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-052-243/+47
|\
| * [Keymap] Revamp the ergodox french_hacker layout (#15064)kototama2021-11-052-243/+47
| |
* | Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-059-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference.
* | Basic keycode overhaul (#14726)Ryan2021-11-0312-21/+21
| |
* | Remove complex `fn_actions` macros (#14662)Ryan2021-11-0127-5024/+367
| | | | | | | | | | * Remove complex `fn_actions` macros * Remove additional `KC_FN*` instances
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-314-0/+123
|\|
| * Add new default community layout for no f-row TKLs (#14812)MechMerlin2021-10-314-0/+123
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-292-6/+6
|\|
| * [Keymap] ajp10304: add mouse scroll keys (#14953)Alan Pocklington2021-10-292-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-6/+6
|\|
| * [Keymap] Simplify unicode input mode change and CTRL and GUI swapping (#14874)Reibl János Dániel2021-10-221-6/+6
| |
* | Tidy up LCD_ENABLE/visualizer references (#14855)Joel Challis2021-10-209-331/+55
| | | | | | | | | | | | | | * Tidy up LCD_ENABLE/visualizer references * Fix up my (333fred) ergodox keymap with new LCD driver Co-authored-by: Fredric Silberberg <fred@silberberg.xyz>
* | Split out HAPTIC_ENABLE to have separate DRIVER option (#14854)Joel Challis2021-10-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | * DRIVER -> ENABLE * Update generic_features.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update common_features.mk Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1618-30/+77
|\|
| * [Keymap] Update Miryoku (#14827)Manna Harbour2021-10-1518-30/+77
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-154-4/+4
|\|
| * [Keymap] Drashna Keymap Updates (#14842)Drashna Jaelre2021-10-154-4/+4
| | | | | | | | | | | | | | * 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-121-10/+31
|\|
| * [Keymap] Add workman layout (#14792)Reibl János Dániel2021-10-111-10/+31
| |
* | Remove sysex API (#14723)Ryan2021-10-061-5/+0
|/
* [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-0511-51/+48
|
* [Keymap] Update to Drashna Code (#14644)Drashna Jaelre2021-09-291-4/+137
|
* Cleanup issues identified by lgtm (#14459)Zach White2021-09-273-9/+1
| | | | | * cleanup issues identified by lgtm * fix the git_status check
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-1259-118/+0
|
* [Keyboard] Corrected layout for np24 by YMDK (#14096)Trent Hoh2021-08-294-0/+68
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keymap] Drashna keymap fixups (#14140)Drashna Jaelre2021-08-241-7/+8
|
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* [Keymap] Drashna's Improve OLEDs and custom Split code (#14063)Drashna Jaelre2021-08-217-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-192-1/+17
|\ | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk
| * [Keymap] Quark AJP10304 layout (#13290)Alan Pocklington2021-08-192-1/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-193-0/+310
|\|
| * [Keymap] Add personal layout for 60% ISO boards (#13232)BifbofII2021-08-193-0/+310
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-192-4/+7
|\|
| * [Keymap] community/ortho_4x12/junonum update (#14062)Juno Nguyen2021-08-192-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update new community universal keymaps * Revert bottom row to default for better use of WIN_MODS and MAC_MODS * Revert to use public domain songs * Update Dpad layer in junonum to tailor for StarCraft group control * Remove junonum512 * Update junonum readme * Define custom songs in the keymap * Move DP_OFF location * Update DPAD modifiers * Update F-row placement in junonum dpad layer * Update CapsLock location and rectify KC_APP
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-144-494/+419
|\|
| * [Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121)Joshua T2021-08-134-494/+419
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-1216-680/+468
|\|
| * [Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548)Jacob Jerrell2021-08-1216-680/+468
| |
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-091-142/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-142/+0
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | Remove backwards compatibility of debounce names (#13877)Joel Challis2021-08-091-1/+1
| | | | | | | | | | | | | | * Remove backwards compatibility of debounce names * Update docs * Update keyboards/keymaps
* | [Keymap] Drashna split transport improvement (#13905)Drashna Jaelre2021-08-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-035-8/+62
|\|
| * [Keymap] Minor cleanup of bcat keymaps and userspace (#13224)Jonathan Rascher2021-08-035-8/+62
| |
* | [Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre2021-07-266-365/+177
| |
* | Remove deprecated callbacks for encoders and dip switches (#13404)Drashna Jaelre2021-07-243-3/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2022-1/+301
|\|
| * Six Pack and ortho_ layout updates (#13587)Suschman2021-07-1922-1/+301
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Suschman <suschman@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 03:19:39 +0000