summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable sync of OLED/ST7565 display on/off state on Splits (#13542)Drashna Jaelre2021-08-155-21/+123
| | | | | | | | | * Enable sync of OLED/ST7565 display on/off state on Splits * Only send if states are not matched Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org>
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-08-1520-457/+434
|\
| * AL1 refactor (#13679)Ryan2021-08-1510-414/+391
| |
| * LFKeyboards: Replace `KC_FNx` with `F(x)` (#13999)Ryan2021-08-1510-44/+44
| |
* | Fix errors that have cropped up in develop (#14005)Zach White2021-08-152-15/+1
| | | | | | | | | | * frooastboard: remove duplicate values from config.h * pistachio_pro: remove unused pin D5
* | [Keyboard] ez_maker/directpins for easy one-offs in qmk_configurator (#13321)Zach White2021-08-1447-0/+1141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new keyboard: handwired/directpins * fix promicro keyboard_name * add teensy2 and teensy2++ support * align with handwired/onekey * tweak pids * add teensy 3.2 and teensy lc to directpins * move directpins from handwired to ez_maker * add docs for easy maker
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-0/+714
|\|
| * [Keyboard] Add TKL-FF PCB (#14003)Ramon Imbao2021-08-1410-0/+714
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+216
|\|
| * [Keyboard] add Stealth macropad (#13986)Rifaa Subekti2021-08-149-0/+216
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-75/+80
|\|
| * Rework keymap_extras docs (#13949)Ryan2021-08-151-75/+80
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-145-60/+76
|\|
| * Ducky One2mini Layout Macro fixes (#14002)James Young2021-08-145-60/+76
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-4/+537
|\|
| * Function96 V2 Configurator fixes (#13996)James Young2021-08-141-4/+537
| | | | | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * correct key sequence for LAYOUT_iso * correct key sequence for LAYOUT_iso_splitspace * add layout data for LAYOUT_all
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-143-111/+133
|\|
| * Orthocode Layout Macro rework (#13995)James Young2021-08-143-111/+133
| | | | | | | | | | | | | | | | | | | | | | | | * move rotary encoder to top row of layout macro Makes the layout macro and keycodes resemble the assembled keyboard. * update info.json data - convert tabs to spaces - use human-friendly formatting - fill in key object labels - adjust object sequence for layout macro changes
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-144-37/+131
|\|
| * Noxary 378 Layout Macro rework (#13998)James Young2021-08-144-37/+131
| | | | | | | | | | * physically arrange layout macro * add info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+292
|\|
| * add falcon keyboard (#13674)yulei2021-08-149-0/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added falcon keyboard * Update keyboards/matrix/falcon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/matrix/falcon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * added description for the bootloader * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-70/+466
|\|
| * [Keyboard] Add Irene Keyboard (#13991)Ramon Imbao2021-08-139-0/+396
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Fix Line endings in Absinthe VIA keymap (#13997)Drashna Jaelre2021-08-141-70/+70
| |
* | Fix `combo_disable` (#13988)Pete Sevander2021-08-141-8/+10
| | | | | | | | | | | | - Dump key buffer when combos are disabled. - Recursive calls to `dump_key_buffer` need to start dumping the buffer from index i+1 to avoid possible infinite loops. - Handle combo key releases even though combo processing is disabled.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1444-1200/+2060
|\|
| * [Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121)Joshua T2021-08-1344-1200/+2060
| | | | | | | | 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-145-116/+544
|\|
| * Crin Refactor (#13982)James Young2021-08-135-116/+544
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT_default to LAYOUT_all * apply human-friendly formatting to info.json * correct keyboard dimensions * correct data for LAYOUT_tsangan * add labels to LAYOUT_ansi data * add labels to LAYOUT_all data * add labels to LAYOUT_iso data * crin.h: update grid alignment of matrix identifiers * crin.h: add matrix diagram * physically position matrix identifiers for LAYOUT_all - move k2d to top row (right half of split Backspace) - move k41 to fourth row (right half of split Left Shift [KC_NUBS]) * physically position matrix identifiers for LAYOUT_iso - move k1d to top row ([KC_NUHS]) - add k41 to fourth row ([KC_NUBS], previously missing) * refactor keymaps - grid-align keycodes - use four-space indent * correct data for LAYOUT_iso - move Enter key to home row * rename LAYOUT_tsangan to LAYOUT_ansi_tsangan * add LAYOUT_iso_tsangan * update readme.md - add `make` command for building - add "Flashing example..." - touch-up bootloader jump instructions (previous Markdown didn't render ideally on GitHub) * extend keymap functionality - add Grave Accent, Function keys, Print Screen, Scroll Lock and Pause keycodes to keymaps - add RESET keycode (Fn+R) - use KC_RGHT for Right arrow * touch-up bootloader instructions on readme - note that Bootmagic Lite jump erases persistent settings - note that Fn+R is RESET keycode by default
* | Fix pmw3360 code to only output debug info if mouse debugging is enabled ↵Drashna Jaelre2021-08-131-6/+8
| | | | | | | | (#13993)
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-1338-187/+1533
|\|
| * [Keyboard] Add Gud70 (#12575)Evelien-Lillian Dekkers2021-08-138-0/+607
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Adding VIA to Absinthe (#13031)alittlepeace2021-08-132-0/+72
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Macropad v2 polling rate fix (#13129)Sergey Omelchenko2021-08-131-0/+3
| |
| * [Keyboard] Add eniigmakeyboards/ek60 (#13140)eniigmakeyboards2021-08-139-0/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add eniigmakeyboards/ek60 * Update keyboards/eniigmakeyboards/ek60/rules.mk Updated layouts Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c Added GPL2+ header * Update keymap.c Added GPL2+ * Update rules.mk Added ISO layout here * Update readme.md Added instructions for resetting bootloader * Update keyboards/eniigmakeyboards/ek60/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: adamws <adamws@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add n9 macropad (#13168)NightlyBoards2021-08-139-0/+267
| |
| * [Keyboard] Updates to ScrabblePad (#13177)DonutCables2021-08-139-187/+204
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-134-0/+266
|\|
| * [Keymap] adds sulrich crkbd (corne) personal keymap (#13186)steve ulrich2021-08-134-0/+266
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1310-566/+326
|\|
| * [Keymap] Updates to jdelkins userspace and keymaps (#13216)Joel Elkins2021-08-1310-566/+326
| | | | | | | | | | | | | | - 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 developQMK Bot2021-08-131-2/+45
|\|
| * [Keyboard] Add optional colemak layout to keymap (#13217)Christian Sandven2021-08-131-2/+45
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1322-0/+921
|\|
| * [Keyboard] add support for alternate ortho UD40 PCB (#13491)npspears2021-08-1322-0/+921
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-131-0/+2
|\|
| * [Keyboard] Add split_3x5_3 layout support to boardsource/microdox (#13323)Manna Harbour2021-08-131-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-131-76/+82
|\|
| * [Keyboard] Interlace matrix scan for performance on Moonlander (#13625)Hugues Morisset2021-08-131-76/+82
| |