summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developNick Brassel2022-07-0321-600/+2786
|\
| * Add a workman-miryoku hybrid keymap for the ferris sweep keyboard (#17511)bruun-baer2022-07-033-0/+112
| |
| * [keymap] Update gourdo1 keymap for Q2 changes (#17398)gourdo12022-07-0318-600/+2674
| |
* | Tentative Teensy 3.5 support (#14420)Ryan2022-07-0311-5/+180
| | | | | | | | | | | | | | | | | | | | | | * Tentative Teensy 3.5 support * Set firmware format to .hex for ARM Teensys * Got to "device descriptor failed" by comparing with Teensy 3.6 code * Drop down to 96MHz... * Bump back up to 120MHz
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-0222-16/+1774
|\|
| * Added new keyboard KB16-01 (#17418)HorrorTroll2022-07-0320-0/+1767
| |
| * MSYS2 install: use MinGW python-qmk package (#17302)Ryan2022-07-022-16/+7
| | | | | | | | | | | | | | | | | | * MSYS2 install: use MinGW python-qmk package * Add missing flashers * Note VC Redist for manual install * VC Redist no longer needed
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-024-122/+77
|\|
| * My ErgoDox Keymap (finally perfected, I think) (#17208)IFo Hancroft2022-07-034-122/+77
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-028-0/+242
|\|
| * Add BigBoy macro pad (#16962)TJ2022-07-038-0/+242
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-0215-0/+1419
|\|
| * [Keyboard] Add Support to Ducky One2 SF (#17260)Khairullah2022-07-0315-0/+1419
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-023-1/+17
|\|
| * add rotary encoder support for Quark^2 (#17470)npspears2022-07-033-1/+17
| |
* | [Keyboard] Update Charybdis code for Extended Mouse reports (#17435)Drashna Jaelre2022-07-024-6/+75
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-029-0/+499
|\|
| * [Keyboard]KPrepublic bm80v2 Keyboard ANSI support (#17192)Yizhen Liu2022-07-029-0/+499
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-025-0/+1131
|\|
| * add crkbd/keymaps/bermeo (#17320)Guilherme Bermêo2022-07-025-0/+1131
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-025-11/+40
|\|
| * [keyboard] annepro2 Add support for sticky keys (#17359)zv0n2022-07-025-11/+40
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-025-603/+872
|\|
| * Cleanup post-#17314. (#17536)Nick Brassel2022-07-024-203/+199
| |
| * [keymap] Add tiny text, full width characters to Ergodone->Vega (#17427)Vega Deftwing2022-07-021-400/+673
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-0228-0/+1109
|\|
| * Added 3 new keyboards (#17314)DeskDaily2022-07-0228-0/+1109
| | | | | | Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-025-0/+549
|\|
| * feat(keymap): add keebio/iris/rev6/radlinskii keymap (#17216)Radliński Ignacy2022-07-025-0/+549
| | | | | | Co-authored-by: ignacy-radlinski <ignacy.radlinski@schibsted.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-022-0/+5
|\|
| * Allow for RGB actions to take place on Keydown instead of Keyup (#16886)CoffeeIsLife2022-07-022-0/+5
| | | | | | | | | | * Allow for switch on keydown * add docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-0214-0/+816
|\|
| * Add note about qmk doctor in newbs_flashing.md (#15688)ripdog2022-07-021-0/+2
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] New IDOBAO ID63 (a.k.a. Denwir D60) (#17144)Vino Rodrigues2022-07-0213-0/+814
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-022-0/+141
|\|
| * Added VIA support for Drop CTRL (#17336)InonL2022-07-022-0/+141
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-024-0/+366
|\|
| * Add keymaps for muralis and kuru (#17337)Murali S2022-07-024-0/+366
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Sree Vidya Sobha Dharmarajan <ssd@Srees-MacBook-Pro.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-029-0/+330
|\|
| * Swift65 Hotswap Support (#16987)spooknik2022-07-029-0/+330
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Steven Phillips <steven.phillips.17@me.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-028-0/+350
|\|
| * Add Jpe230 Preonic Keymap (#17331)jpe2302022-07-024-0/+188
| |
| * Add personal YMDK Split64 keymap (#16980)Minke Zhang2022-07-024-0/+162
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-027-74/+832
|\|
| * Added oriaj3 keymap with Matrix RGB support for Kimiko keyboard. (#17103)Jairo Ramírez Ávila2022-07-027-74/+832
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-029-0/+238
|\|
| * Add base Ryujin firmware (#17187)Wolf Van Herreweghe2022-07-029-0/+238
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | [Keyboard] IDOBAO ID67 code touch-ups and include factory keymap (#17231)Vino Rodrigues2022-07-0216-387/+703
| |
* | [Keyboard] IDOBAO ID87v2 code rewrite and include factory keymap (#17232)Vino Rodrigues2022-07-0214-391/+713
| |
* | [Keyboard] IDOBAO ID80v3 code rewrite and include factory keymap (#17234)Vino Rodrigues2022-07-0219-449/+790
| |