summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-185-0/+223
|\
| * [Keymap] Add 'j4ckofalltrades' keymap for sofle/rev1 (#14446)Jordan Duabe2021-09-175-0/+223
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1819-0/+439
|\|
| * [Keyboard] Add Dosa40RGB + dtisaac01 (#14476)Dao Tak Isaac2021-09-1719-0/+439
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-184-124/+112
|\|
| * [Keymap] Major Updates to Personal Kyria Keymap (#14485)john-ezra2021-09-174-124/+112
| | | | | | | | | | * added john ezra keymap with updates * changed tapping term
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-181-49/+4
|\|
| * fix link error for helix/rev3_5rows:five_rows (#14466)Takeshi ISHII2021-09-181-49/+4
| | | | | | | | This is a tentative quick fix. I was adding the same functions for both #14426 and #14427 and they were in conflict.
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-09-1744-184/+2163
|\|
| * Nix Studio OXALYS80 Refactor (#14473)James Young2021-09-176-94/+640
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update grid alignment of keycodes * update key assignments on via keymap A seemingly-misplaced key assignment on Layers 1 through 3 of the via keymap led to keys being off by one in comparison to the default keymap. * switch Backslash and Backspace on via keymap base layer Matches the via keymap's key mapping to that of the default keymap. * use QMK 3-character notation in oxalys80.h * add matrix diagram; remove Planck reference * add LAYOUT_tkl_ansi and LAYOUT_tkl_ansi_wkl layout macros * add LAYOUT_tkl_ansi_tsangan macro * add ISO layouts Add LAYOUT_tkl_iso, LAYOUT_tkl_iso_tsangan, and LAYOUT_tkl_iso_wkl macros. * enable Community Layouts support * tidy up rules.mk * readme tidy-up
| * [Keyboard] Move Planck EZ off 'Proton C' board (#14479)Drashna Jaelre2021-09-173-8/+73
| |
| * [Keyboard] Move Moonlander off 'Proton C' board (#14478)Drashna Jaelre2021-09-173-2/+62
| |
| * Update rules.mk for xbows keyboard (#14477)X-Bows Tech2021-09-173-3/+3
| | | | | | | | | | | | | | * Update rules.mk * Update rules.mk * Update rules.mk
| * [Keymap] Adding personal keymap (#14326)Matt2021-09-167-0/+772
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add Sauce Mild Keyboard (#14287)Andy Yong2021-09-169-0/+259
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Add gaming toggle layer & layer colors to r-pufky keymap. (#14251)r-pufky2021-09-163-47/+94
| |
| * Mode 65S: Tap code and extra keys for media keys (#14471)Álvaro A. Volpato2021-09-162-2/+4
| |
| * [Keymap] Update Helix:five_rows OLED code (#14427)Takeshi ISHII2021-09-168-28/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stop using snprintf() in keymaps/five_rows/oled_display.c. The binary size becomes 1350 bytes smaller. make HELIX=verbose,core-oled helix/rev2/sc:five_rows (104 bytes over) -> (95%, 1256 bytes free) make helix/rev3_5rows:five_rows (528 bytes over) -> (97%, 830 bytes free) * add matrix scan rate display to OLED for keymaps/five_rows * add matrix_output_unselect_delay.c to helix keymaps/five_rows * add GPLv2 header * apply review comment
* | Use opendrain pin with external pullup again (#14474)Stefan Kerkmann2021-09-171-1/+1
| |
* | Add i2c defaults for Convert to Proton C (#14470)Drashna Jaelre2021-09-161-0/+9
| | | | | | | | | | * Add i2c defaults for Convert to Proton C * Hide default defines behing CTPC check
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-168-239/+587
|\|
| * [Keyboard] Increase the way to add oled code for helix/rev3. (#14426)Takeshi ISHII2021-09-168-239/+587
| | | | | | | | | | | | | | | | | | | | | | * move rev3_Xrows/oled_display.c to rev3_Xrows/keymaps/default/oled_display.c * add dummy rev3_Xrows/oled_display.c * Add default minimum oled_task_user() to helix/rev3_Xrows/rev3_Xrows.c * remove unnecessary comment in rev3_Xrows/keymaps/default/oled_display.c * copy rev3_Xrows/keymaps/default/oled_display.c to rev3_Xrows/keymaps/via/oled_display.c
* | [Bug] fix logical minimum in Programmable Button rdesc (#14464)Thomas Weißschuh2021-09-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1613-132/+1157
|\|
| * Adds optional hebrew layout (Unicode) (#14156)Jos Boersema2021-09-1513-132/+1157
| |
* | New CLI subcommand to create clang-compatible compilation database ↵Bao2021-09-165-4/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (`compile_commands.json`) (#14370) * pulled source from dev branch * missed a file from origin * formatting * revised argument names. relaxed matching rules to work for avr too * add docstrings * added docs. tightened up regex * remove unused imports * cleaning up command file. use existing qmk dir constant * rename parser library file * move lib functions into command file. there are only 2 and they aren't large * currently debugging... * more robustly find config * updated docs * remove unused imports * reuse make executable from the main make command * pulled source from dev branch * missed a file from origin * formatting * revised argument names. relaxed matching rules to work for avr too * add docstrings * added docs. tightened up regex * remove unused imports * cleaning up command file. use existing qmk dir constant * rename parser library file * move lib functions into command file. there are only 2 and they aren't large * currently debugging... * more robustly find config * updated docs * remove unused imports * reuse make executable from the main make command * remove MAKEFLAGS from environment for better control over process management * Update .gitignore Co-authored-by: Michael Forster <forster@google.com> * add a usage line to docs * doc change as suggested Co-authored-by: Nick Brassel <nick@tzarc.org> * rename command * remove debug print statements * generate-compilation-database: fix arg handling * generate-comilation-db: improve error handling * use cli.run() instead of Popen() Co-authored-by: Xton <cdewan@apple.com> Co-authored-by: Christon DeWan <cmdpix@mac.com> Co-authored-by: Michael Forster <forster@google.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-169-0/+485
|\|
| * [Keyboard] Add the Idobao ID96 keyboard (#14371)Vino Rodrigues2021-09-159-0/+485
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.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-09-1636-0/+1565
|\|
| * [Keyboard] Add FJLabs TF60 Variants and TF65 Variant (#14392)Felix Jen2021-09-1527-0/+1197
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Absolute Designs AD65 Keyboard (#14391)Felix Jen2021-09-159-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Bug] Fix descriptor for USB Programmable Buttons (#14455)Thomas Weißschuh2021-09-151-1/+1
| |
* | Make ChibiOS PAL interactions less STM32 specific - Round 2 (#14456)Joel Challis2021-09-167-15/+17
| |
* | core: fix compilation issues with USB programmable buttons (#14454)Thomas Weißschuh2021-09-161-0/+2
| | | | | | | | Reported here: https://github.com/qmk/qmk_firmware/pull/12950#issuecomment-920329569
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-159-0/+309
|\|
| * [Keyboard] add Matrix Me (#14331)yulei2021-09-159-0/+309
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1517-17/+53
|\|
| * [Keyboard] Replaced Maker Keyboards & FJLabs Legacy Code (#14393)Felix Jen2021-09-1517-17/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-2/+2
|\|
| * [Keyboard] Add `NO_LED` positions to match key matrix. (#14417)Albert Y2021-09-151-2/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-152-5/+5
|\|
| * [Keymap] A slight improvement to my own ErgoDox keymap (#14425)IFo Hancroft2021-09-152-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1514-86/+200
|\|
| * [Keymap] Trying again with Prime-e update! (#14429)peott-fr2021-09-151-21/+21
| |
| * [Keyboard] Update lighting effects for xbows keyboard (#14432)X-Bows Tech2021-09-1513-65/+179
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-152-8/+13
|\|
| * [Docs] add sync options heading, update led indicators (#14441)Dasky2021-09-152-8/+13
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-154-20/+24
|\|
| * [Bug] Fix IS31fl3741 driver to accept 1 or 2 addresses (#14451)Drashna Jaelre2021-09-154-20/+24
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Add Support for USB programmable buttons (#12950)Thomas Weißschuh2021-09-1522-14/+436
| |