summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-015-35/+66
|\
| * Allow <keyboard>.h to be optional when going data driven (#12706)Joel Challis2021-05-015-35/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | * Allow <keyboard>.h to be optional when going data driven * Remove stub files as no longer required * Rename function * Remove include of layouts.h for now * Take advantage of type=keyboard_folder * Take advantage of type=keyboard_folder - kb should still be mandatory
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-301-1/+1
|\|
| * [Keyboard] Fix bootloader rule for meishi2 keyboard (#12740)k.bigwheel2021-05-011-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-3032-2/+955
|\|
| * Add breeze variants (#12596)David Fryer2021-04-3032-2/+955
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Adrian <42110361+xSteins@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-295-68/+136
|\|
| * DracuLad: add Configurator data and rework layout macro (#12727)James Young2021-04-295-68/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | * add info.json file * refactor keymaps for readability * rework layout macro Arranges the layout macro and keycodes to resemble the physical layout. * readme touch-up Corrections to capitalization and spelling, and removal of extra white space.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2920-0/+655
|\|
| * Add firmware for CozyKeys Bloomer keyboard (#12639)Paul Ewing2021-04-2920-0/+655
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-291-0/+2
|\|
| * Align drivers.txt with toolbox (#12741)Joel Challis2021-04-301-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-292-6/+0
|\|
| * Fix F13 LED issue for WT75-B, WT75-C (#12729)Wilba2021-04-292-6/+0
| |
* | [CI] Format code according to conventions (#12731)github-actions[bot]2021-04-294-16/+14
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Change RGB/LED Matrix to use a simple define for USB suspend (#12697)Drashna Jaelre2021-04-299-53/+62
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-1/+1
|\|
| * Fix up bad keycode in #12405. (#12722)Nick Brassel2021-04-281-1/+1
| |
* | Fix bad PR merge for #6580. (#12721)Nick Brassel2021-04-281-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-0/+2
|\|
| * add default folder to standard (#12712)Xelus222021-04-281-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-0/+3
|\|
| * YMDK Wings: Update config.h (#12718)alittlepeace2021-04-271-0/+3
| | | | | | Adds Caps Lock LED indicator configuration.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-1/+11
|\|
| * Add flashing instructions to GMMK Pro readme (#12719)James Young2021-04-271-1/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-274-0/+133
|\|
| * GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)W. Ducky2021-04-274-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WholesomeDucky keymap for GMMK Pro * Finalized keymap & added 1000hz polling for GMMK Pro * Corrected for RAlt and Fn being swapped * Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout. * Removed an old comment from personal keymap for GMMK Pro * added VIA support * Defined bootmagic row and column for GMMK Pro Esc key * Update keyboards/gmmk/pro/config.h * Update keyboards/gmmk/pro/keymaps/via/keymap.c * Update keyboards/gmmk/pro/keymaps/via/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2711-0/+965
|\|
| * Add Draculad keyboard (#12604)Mango The Fourth2021-04-2711-0/+965
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: mangoiv <mangoiv@outlook.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-272-3/+20
|\|
| * GMMK Pro: add RESET binding, fix layout macro bug (#12684)Ryan Mitchell2021-04-272-3/+20
| | | | | | | | | | * add RESET binding, fix layout mod key bug (fixes #12683) * remove underscore #define and use core's instead
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2712-439/+296
|\|
| * Update noroadsleft userspace and keymaps (2021-04-26) (#12711)James Young2021-04-2612-439/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update noroadsleft userspace and keymaps (2021-04-26) - add Discipline keymap - move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace - re-add some custom keycode handling I accidentally deleted - update VRSN keycode - update KC60 and userspace readmes * remove Git readme from kc60 keymap * update kc60:noroadsleft readme Concatenates this readme into one file, and updates the image links.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-261-0/+1
|\|
| * Add python-version to gitignore (#12678)Andrew Kannan2021-04-261-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-261-0/+3
|\|
| * [Keyboard] fix planck light via endpoints (#12701)Xelus222021-04-261-0/+3
| |
* | Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)JTM2021-04-2624-27/+393
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com>
* | Add STM32L433 and L443 support (#12063)Xelus222021-04-269-2/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers Co-authored-by: Nick Brassel <nick@tzarc.org> * Include L443 in compatible microcontrollers Co-authored-by: Nick Brassel <nick@tzarc.org> * Update config bootloader jump description Co-authored-by: Nick Brassel <nick@tzarc.org> * Update ChibiOS define reasoning Co-authored-by: Nick Brassel <nick@tzarc.org> * Update quantum/mcu_selection.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * fix git conflict Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-264-0/+58
|\|
| * fix configs (#12631)Xelus222021-04-264-0/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-0/+1
|\|
| * [Config] Add VSCode workspace files to .gitignore (#12469)Luis Moreno2021-04-261-0/+1
| |
* | Format code according to conventions (#12687)github-actions[bot]2021-04-250-0/+0
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Format code according to conventions (#12682)github-actions[bot]2021-04-251-1/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Add support for MCU = STM32F446 (#12619)Purdea Andrei2021-04-259-2/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2510-0/+288
|\|
| * [Keyboard] Ninjin (#12496)Xelus222021-04-2510-0/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ninjin init * put in gpl thing * underglow * update to latest chibios * fix gpl headers * remove other files * fix header * Update keyboards/xelus/ninjin/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/mcuconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/halconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | eeprom driver: Refactor where eeprom driver initialisation (and EEPROM ↵Purdea Andrei2021-04-252-13/+12
| | | | | | | | emulation initialisation) occurs to make it non-target-specific. (#12671)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-253-0/+266
|\|