summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-141-56/+91
|\
| * Add texts for Discord Events to be created post-merge. (#17944)Nick Brassel2022-08-131-56/+91
| |
* | Use ANSI ASCII art and fix comments for LT_COLN and LT_UNDS in ↵precondition2022-08-131-17/+17
| | | | | | | | keymap_lithuanian_qwerty.h (#18028)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-14137-510/+422
|\|
| * Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941)Ryan2022-08-13137-510/+422
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-147-0/+222
|\|
| * [Keyboard] Added different wiring of dactyl (#17997)Marko Skakun2022-08-137-0/+222
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1411-0/+833
|\|
| * [Keyboard] jacky_studio/piggy60 (#18012)Less/Rikki2022-08-1311-0/+833
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-141-0/+1
|\|
| * [Docs] Suggest imgur images are edited to set size (#18031)Tom Barnes2022-08-131-0/+1
| |
* | Improve avr wait_us() (#16879)Takeshi ISHII2022-08-141-9/+29
| |
* | Revert "[Core] Re-order user space rules inclusion (#17459)" (#18032)Joshua Diamond2022-08-141-10/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1314-0/+505
|\|
| * [Keyboard] Added Atreyu keyboard. (#17698)Jesus Climent2022-08-1314-0/+505
| | | | | | | | | | | | * Add Atreyu keyboard. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1310-0/+328
|\|
| * [Keyboard] Add Foundation to QMK (#17573)mechlovin2022-08-1310-0/+328
| | | | | | | | | | * add mechlovin foundation keyboard Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-135-0/+623
|\|
| * [Keymap] adding new user (p4yne) layout with complex lighting feature… ↵p4yne2022-08-135-0/+623
| | | | | | | | | | | | | | (#16085) * [Keymap] adding new user (p4yne) layout with complex lighting features (per layer, per key, per type) and usefull layers DE/US, etc. Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-138-0/+274
|\|
| * add BAMFK-4 (#17985)emlah2022-08-138-0/+274
| | | | | | * add BAMFK-4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-138-4/+299
|\|
| * Bandominedoni version output feature and a new keymap added (#17947)3araht2022-08-138-4/+299
| | | | | | | | | | | | | | | | | | | | | | * SPLIT_USB_DETECT added. * lednotg keymap added. * lednotg missing modification fixed. * VERSION is available. * USER00 is used instead of SAFE_RANGE in via/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-136-0/+457
|\|
| * Dactyl Manuform 4x5 with 5 thumb cluster (#17671)Shem Sedrick2022-08-136-0/+457
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Working on new dactyl * Preliminary build and keymap in place for 4x5_5 dactyl manuform * Removing first attempt to use 4x5 * Updating to match c style guide * Fixing issues after merge, deletion of dactyl_manuform.h * Spliting out custom keymap * Adding license headers * Fixing EE_HANDS detection on Pro-Micro The pro-micro was not working when I plugged into the elite-c on the right hand side of my keyboard. Adding the SPLIT_USB_DIRECT definition fixed the issue. * Apply suggestions from code review Adding Drashna's delete comments Co-authored-by: Drashna Jaelre <drashna@live.com> * Removed config.h for keymaps and tweaked keymap Per Drashna's pr review, I have removed the config.h files for the keymaps. Also tweaked my keymap to switch backspace and enter. Added tapping toggle for RAISE. * Further tweaking ssedrick keymap for dactyl_manuform 4x5_5 As with most new keyboards, they take some getting used to. I've rearranged my thumb cluster to hopfully a more long term solution. * Adding missing KC_BSLS to ssedrick keymap for 4x5_5 Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1316-0/+636
|\|
| * [Keyboard] Add Hillside 46 (#17968)mmccoyd2022-08-1316-0/+636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 46: Copy from 52 and file rename * 46: File internals refer to 46, not 52 * 46: Board remove row * 46: Keymap: Lshift becomes ctrl, Rshift a symbol - ESC and CAPs on upper thumbs - AltGr and App on upper thumbs - Page up/down on upper thumbs - F11, F12 and mods for them on adjust * 46: Readme update for json script, tweaks * 46: Board fix LED count * 46: Keymap: Arrows right, symmetric layer keys * 46: Readme: Image link with and w/o outer pinkie * 46: Keymap: link fixed image of nav layer * 46: Keymap: fix reaching adj layer Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-136-43/+165
|\|
| * RFC: add a simple implementation of the ploopy optical encoder (#17912)alaviss2022-08-136-43/+165
| |
* | Fix LV_CCAR and LV_NCED (#18025)precondition2022-08-131-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1318-237/+2941
|\|
| * Updated gourdo1 GMMK Pro keymaps (#17873)gourdo12022-08-1318-237/+2941
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed Left Shift tapdance in general and for gaming mode. (#12) * update ISO readme * left shift fixed in general, including for gaming mode * fixed toggle menu rendering on ISO layouts * updated readme's and cosmetics * update readme's * update readme's again * readme cosmetics * consolidate readme's * more readme cosmetics * clarification for bootloader mode on ISO * Autocorrect added with 400 word English dictionary (#13) * autocorrect added with 400 word dictionary * update readme's for autocorrect * Add FN-B as shortcut to bootloader * Update .gitignore Co-authored-by: Joel Challis <git@zvecr.com> * RGB changes to system numlock and ISO extended alphas - hide system numlock off indicator (primarily for Mac users) by moving it to numpad and FN layers instead - give users with extended alpha ISO languages a config option to add RGB highlights for extras alphas on capslock * readme updates * Fixed [FN]B and [FN]N shortcuts not working on numpad layer Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1317-5/+679
|\|
| * [Keyboard] Add Hillside 52 (#17374)mmccoyd2022-08-1317-5/+679
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 52 Keymap.json: Set for Hillside 52 - Change script rows * 52 Keymap.c: mirror .json CAPSWORD, QK_BOOT, readme cleanup, EE_RST * 52 Keymap.json: Initial files copy from 56 * 52 Keymap.json nav/edit lay, thumb shift, syms - Del in backspace spot on sym layer - Thumb shift OSM instead of extra space - Nav/edit on num/fn: arrows cut copy paste undo redo, page up/down - Fn keys bottom row to allow nav edit keys - App and AltGr on lower row, on their layer - Braces on index, so more common -= on middle ring. - Adjust has Ctrl/GUI swap - EE_RST, CAPSWORD, QK_BOOT, SPLIT_DETECT * 52 Family: readme image and folder link * 52 Board: initial copy from 56 * 52 Keymap via * 52 Board: remove keys, cant columns, better ids - .json: vid: MM, pid: H52 * 52 Keymap.c: initial.c copy from 48 * QK_BOOT EE_CLR, not ANY(), as config.qmk supports - CAPSWRD instead of ANY, though config.qmk still converts to ANY() * Cleanup readme * 52 Keymap: Remove redundant key, cleanup script * 52 Keymap: Fix template * 52 Readme: Link lower res image better for readme Co-authored-by: Drashna Jaelre <drashna@live.com> * 52 Keymap: Move pretty-print script to GitHub wiki * 52 Keymap: Link to 1024 res image thumbnails * 52 Keymap: fix whitespace before image link * Family: Fix image link to 1024 thumb Co-authored-by: Drashna Jaelre <drashna@live.com> * 52: Keymap: Caps word on a layer home row * 52: Keymap: Arrows on right. Symmetric layer keys. - Nav: - Arrows on right so up/down more intuitive. Page up/down on ends - Cut on home row, as more common - Sym: - Layer mods on activate hand, extras symbols on left - Common digits on lower row - Base: - Layer keys symmetric, on most extended, not resting, thumb - Mute on util key for easy use - Swap layers 3 and 4 to match swapped thumbs Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-139-0/+389
|\|
| * Add support for XT60_SINGA (#17752)kopibeng2022-08-139-0/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added support for Christine, XT65E and Adelais * Add support for MNK88 * Add support for XT8x * Renamed XT65E to Typ65 * Revert "Renamed XT65E to Typ65" This reverts commit b4fbc853d23003b9b4b5b67d49e098ea17d85a98. * Revert "Revert "Renamed XT65E to Typ65"" This reverts commit 09baee94eba56dab0a0a96b99ce3758b0c5aa8a9. * File reorganization * Add support for MNK88 * Update readme.md * Update keyboards/kopibeng/mnk88/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/kopibeng/mnk88/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Fix imgur link * Update keyboards/kopibeng/mnk88/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kopibeng/mnk88/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update info.json Previous suggested change was breaking lint check, reverting back to the original. * Update keyboards/kopibeng/mnk88/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Fix info.json * Added XT60_SINGA * Update config.h * Update readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] IDOBAO ID80v1 folder rename (#17265)Vino Rodrigues2022-08-1429-74/+112
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Core] Re-order user space rules inclusion (#17459)Albert Y2022-08-131-8/+10
| |
* | Fix Caps Word capitalization when used with Combos + Auto Shift. (#17549)Pascal Getreuer2022-08-139-15/+343
| |
* | Add Bit-C PRO converter (#17827)Jay Greco2022-08-135-2/+62
| |
* | Improve importer workflow (#17707)Joel Challis2022-08-133-65/+120
| |
* | Add led matrix support for CKLED2001 (#17643)lokher2022-08-137-16/+627
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-132-0/+15
|\|
| * Remove old submodules if present (#17930)Nick Brassel2022-08-132-0/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-131-1/+1
|\|
| * [Keyboard] Remove unused keycodes from Aurora65 keymap (#18022)Drashna Jaelre2022-08-121-1/+1
| |
* | [Bug] Fix wrong varaible in encoder block (#18020)Drashna Jaelre2022-08-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-137-0/+204
|\|
| * [Keyboard] add ogrn (#17983)arnstadm2022-08-127-0/+204
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-131-1/+4
|\|