summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Improve the qmk lint readme check (#13941)Zach White2021-08-101-4/+5
| | | | | | | | | | * improve lint readme check * improve if
| * Architecture documentation for Configurator and API (#13935)Zach White2021-08-104-0/+66
| | | | | | | | | | | | | | | | | | * Architecture documentation for the configurator and api * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-0/+2
|\|
| * Update feature_wpm.md (#13936)Stefan Subich2021-08-101-0/+2
| | | | | | Fix example markdown code formatting
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-0/+5
|\|
| * Add padding to LUFA-MS .BIN files (#13922)Ryan2021-08-101-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1017-0/+1370
|\|
| * [Keyboard] Added pistachio_pro (#13466)rate2021-08-0917-0/+1370
| | | | | | | | | | | | | | | | * Added pistachio_pro * Apply suggestions from code review * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-103-0/+255
|\|
| * adding my keymap "vayashiko" (#13049)Ryuki2021-08-093-0/+255
| | | | | | | | | | | | | | * adding my keymap * changed some bugs * removed include keymap.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-091-1/+1
|\|
| * Ristretto - Update bootloader (#13933)Brandon Lewis2021-08-091-1/+1
| | | | | | | | | | * updated bootloader for 32u4 mcu Should be atmel-dfu instead of caterina as the mcu is integrated instead of on a pro-micro/elite-c
* | Fix compliation for ferris 0.2 bling (#13937)Dasky2021-08-091-1/+1
| | | | | | * Fix include
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-0939-384/+815
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
| * Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)Daniil Yastremskiy2021-08-096-10/+29
| |
| * Support all the 0.2 Ferris variants (#12653)Pierre Chevalier2021-08-0921-11/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support all the 0.2 Ferris variants For the Compact, the High and the Mini, create a new directory so each keyboard may have the correct USB descriptor and a readme with more specific information about it. For the Bling, also add support for the underglow functionality. Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the name of the company I incorporated to sell keyboards, and change the default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more descriptive. I didn't update the 0.1 variants as I don't intend to sell these kits with "Cuddly Keyboards". The firmware is mostly there to support existing users. Update the "hardware availability" to point to my new website: cuddlykeyboards.com. * Add RGB mode toggle to my keymap and to the default keymap * Improve wording in the readme
| * [User] changes to nstickney's keymaps (#11456)Stick2021-08-0912-362/+477
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | Remove backwards compatibility of debounce names (#13877)Joel Challis2021-08-0911-56/+10
| | | | | | | | | | | | | | * Remove backwards compatibility of debounce names * Update docs * Update keyboards/keymaps
* | Remove ONEHAND_ENABLE (#13920)Joel Challis2021-08-095-7/+3
| |
* | Fixup rgb matrix config for KBD67 mkII boards (#13931)Drashna Jaelre2021-08-094-340/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-092-0/+199
|\|
| * [Keymap] new keymap for nui_mini (#13924)Edvard Sire2021-08-092-0/+199
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-093-0/+87
|\|
| * [Keymap] Add kbd67 mkiirgb keymap (#13884)Pascal Pfeil2021-08-093-0/+87
| | | | | | | | Co-authored-by: Spaceman <rionlion100@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Make default keymap for GMMK Pro reflect stock (#13850)Andre Brait2021-08-095-24/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-098-0/+170
|\|
| * [Keyboard] Add TouhouPad (#13915)Michele Ferri2021-08-098-0/+170
| | | | | | | | | | | | | | * Touhoupad rev 2 * cleanup for PR * fixes after review
* | Merge remote-tracking branch 'origin/master' into developZach White2021-08-0935-18/+3370
|\| | | | | | | | | Conflicts: keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
| * Fix generate api (#13930)Zach White2021-08-092-2/+2
| | | | | | | | | | * Add missing returncode to exit() * fix the aozora/hotswap vendor id
| * make json imports more robust (#13928)Zach White2021-08-091-1/+4
| |
| * [Keymap] rootiest for planck/rev6/ (#13294)Chris2021-08-094-0/+2137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * squashed commits to master * Fix in case of missing user_song_list Substitutes missing songs with safe versions Also updated and added detail to keymap readme * Adjust Readme to match qmk contrib conventions * Update keyboards/planck/keymaps/rootiest/config.h * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Fixed license header to GPLv2+ * Fix Volume key delay Use a static number instead of removed MEDIA_KEY_DELAY * Use TAP_CODE_DELAY * added license to config.h * Clean up formatting - Fixed markdown in readme - Removed extra commented line from config.h * Update keyboards/planck/keymaps/rootiest/config.h
| * [Keyboard] Undead 60M (#13735)jfescobar182021-08-089-0/+343
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Aozora (hotswap) keyboard (#13919)Phooood2021-08-087-0/+254
| | | | | | | | | | | | | | | | | | | | | | * Initial Commit * added header to hotswap.c * added keymap-specific reamdme.md * minor adjustments * Requested corrections to readme's
| * [Keyboard] Add kbdfans kbd67 mkii rgb v3 (#13714)datafx2021-08-0713-135/+632
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix compilation issue. (#13926)Nick Brassel2021-08-091-1/+1
| |
* | Add support for STM32F407x MCUs. (#13718)thpoll832021-08-099-2/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for STM32F407x MCUs. * Removing STMF407 MCU variation * Update quantum/mcu_selection.mk Remove options for dfu flashing Co-authored-by: Ryan <fauxpark@gmail.com> * DISABLE STM32_USB_USE_OTG1 * Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h Co-authored-by: thomas.pollak <thomas.pollak@dynatrace.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0821-4/+310
|\|
| * [Keyboard] Add Pancake v2 (#13839)Spaceman2021-08-0721-4/+310
| | | | | | | | 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-082-1/+15
|\|
| * [Keyboard] Added CapsLED and ScrollLock LEDs (#13837)Ananya Kirti2021-08-072-1/+15
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Keymap] Drashna split transport improvement (#13905)Drashna Jaelre2021-08-0712-71/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix up split stuff * Fix Split perf issues * Allow LTO to be disabled * Fixup WPM and encoders * Fixup qmk keys per scan * Add bootloader info * Change encoder pins * Fixup corne oled code * Expand transport sync * Improve user transport * Cleanup mouse processing at keymap level * Improve layer checking for mouse layering
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-084-17/+114
|\|
| * [Keyboard] a1200 converter minor changes (#13848)8bits4ever2021-08-074-17/+114
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0812-0/+338
|\|
| * [Keyboard] Gorthage Truck - New PCB (#13909)jpuerto962021-08-0712-0/+338
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-086-139/+106
|\|
| * [Keyboard] Clean up lfkpad and add keymap (#13881)Pascal Pfeil2021-08-076-139/+106
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-081-0/+104
|\|
| * [Keyboard] Adding my Nyquist keymap (#13858)peott-fr2021-08-071-0/+104
| |
* | [Keyboard] Fix matrix_output_unselect_delay for handwired/xealousbrown (#13913)Drashna Jaelre2021-08-081-3/+2
| |