summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-77/+138
|\|
| * handwired/nicekey optimisation (#14788)Ryan2021-10-113-77/+138
| | | | | | | | | | | | | | * handwired/nicekey optimisation * Add some consts * Read address from progmem, pass it into send_string_with_delay_P
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-111-5/+5
|\|
| * Allow AVR Bootloader size to be configurable (#14783)Drashna Jaelre2021-10-111-5/+5
| | | | | | | | | | * Allow AVR Bootloader size to be configurable * revert changes to atmel dfu
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-112-0/+141
|\|
| * [Keymap] gipsy-king's layout for cornelius (#14602)bgrosse-midokura2021-10-112-0/+141
| | | | | | Co-authored-by: Benjamin Große <ste3ls@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1114-1/+594
|\|
| * [Keyboard] Add ZSA Moonlander VIA support (#14603)Quinn Mikelson2021-10-114-1/+136
| | | | | | | | Co-authored-by: Quinn Mikelson <quinn.mikelson@tyvak.com> Co-authored-by: Drashna Jael're <drashna@live.com>
| * [Keyboard] Add Rart67M and support via (#14630)Alabahuy2021-10-1110-0/+458
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1110-0/+421
|\|
| * [Keyboard] Add Jay60 PCB (#14676)mechlovin2021-10-1110-0/+421
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+920
|\|
| * [Keymap] lets split keymap for shaymdev (#14663)Shay Merrill2021-10-113-0/+253
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keymap] Architeutis Dux keymap (#14728)Dalius Dobravolskas2021-10-116-0/+667
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1118-0/+804
|\|
| * [Keyboard] Add blank01 keyboard (#14698)gkeyboard2021-10-1111-0/+542
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] New Keyboard: Horizon (#14776)Steven Karrmann2021-10-117-0/+262
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-114-70/+71
|\|
| * [Keyboard] Modify mokey64 matrix (#14761)rhmokey2021-10-114-70/+71
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+1052
|\|
| * [Keyboard] Add BIOI F60 (#14763)kb-elmo2021-10-119-0/+1052
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-111-12/+12
|\|
| * [Keyboard] Fix lck75 via keymap (#14786)Drashna Jaelre2021-10-111-12/+12
| |
* | Fix misplaced endif in led_matrix_drivers.c (#14785)Ryan2021-10-101-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-4/+17
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of Sweep (#14732)Albert Y2021-10-103-4/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-114-4/+11
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of A.dux (#14731)Albert Y2021-10-104-4/+11
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1111-76/+425
|\|
| * [Keyboard] update lck75 keyboard layouts (#14687)im a can what do you think lmao?2021-10-1011-76/+425
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-0/+262
|\|
| * [Keymap] orthodox keymap for shaymdev (#14660)Shay Merrill2021-10-103-0/+262
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1110-0/+322
|\|
| * [Keyboard] Add keebsforall/freebirdtkl (#14460)KnoblesseOblige2021-10-1010-0/+322
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1122-25/+25
|\|
| * [Keyboard] nullbitsco keyboards: common file cleanup (#14358)Jay Greco2021-10-1022-25/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+597
|\|
| * [Keyboard] Add firmware for the TS60 (#14157)Wolf Van Herreweghe2021-10-109-0/+597
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-0/+71
|\|
| * [Keyboad] Add VIA support for Atreus promicro (#13169)leonardusdipa2021-10-103-0/+71
| |
* | Clean up LED/RGB Matrix driver config (#14760)Ryan2021-10-1051-265/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-103-2/+8
|\|
| * Changing RGB default to on so it plays well with VIA's QMK lighting section ↵Kyle McCreery2021-10-103-2/+8
| | | | | | | | and adding the B9 init workaround to obe.c so the I2C EEPROM will initialize correctly since we are using B9 for caps lock indicator. (#14677)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-101-0/+16
|\|
| * cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782)Sergey Vlasov2021-10-111-0/+16
| |
* | Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780)Sergey Vlasov2021-10-104-8/+87
| | | | | | | | | | | | | | | | The custom OLED_OFF mode implemented on satisfaction75 is incompatible with the OLED_TIMEOUT feature (the OLED_TIMEOUT code assumes that any key or encoder action should turn the OLED display on, and does not provide any way to disable that behavior). To keep the OLED_OFF mode functioning as before while still having a working OLED idle timeout, a custom implementation of the OLED idle timeout code is added.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-101-12/+12
|\|
| * [Keyboard] Fix DZTECH duo_s default keymap (#14772)Drashna Jaelre2021-10-091-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-091-0/+64
|\|
| * Ein_60: add Configurator layout data (#14777)James Young2021-10-101-0/+64
| |