summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-064-0/+243
|\
| * [Keymap] Adding encg keymap for 2% Milk keyboard (#11041)encg2020-12-064-0/+243
| | | | | | | | | | | | | | * adding my keymap * Updating coding convention and style for new keymap PR * Added GPL license header and to-do list to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-0/+1
|\|
| * Use patch bump for auto tagging workflow (#11137)Joel Challis2020-12-061-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-066-86/+126
|\|
| * handwired/videowriter: oleg keymap update, via keymap (#10984)Dmitry Nosachev2020-12-066-86/+126
| | | | | | | | | | | | | | | | | | | | | | * oleg keymap update, via keymap * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * via keymap use default bootloader Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0610-0/+1661
|\|
| * [Keyboard] Add Lasgweloth (#10944)Álvaro A. Volpato2020-12-0610-0/+1661
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial Lasgweloth PCB support * Fix column attribution * Fix Col1 pin assignment * New xoxotus layout and revised README * Removed KC_NO definition * Update keyboards/acheron/lasgweloth/config.h Remove USB DESCRIPTION filed from config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/acheron/lasgweloth/rules.mk Remove unnecessary comment lines on rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md Update readme.md Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-069-0/+358
|\|
| * [Keyboard] Added a dactyl promicro rah (#10889)Ralph Azucena2020-12-069-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added a dactyl promicro with a slightly different 6x6 layout * updated keyboard layout * Removed description as per code review * refactored as per code review * removed redundant config.h file * removed and updated a couple of lines in rules.mk * replaced symlink with copy of file * removed lines in readme * Update readme.md Co-authored-by: ralphie02 <ralph.azucena@carbon60.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-068-0/+314
|\|
| * [Keyboard] Latin47ble bluetooth keyboard (#11023)haierwangwei20052020-12-068-0/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create rules.mk * Create glcdfonr.c * Create keymap.c * Create keymap.c * Create rules.mk * Add files via upload * Update readme.md * Update readme.md * Update readme.md * Update config.h * Update 10bleoledhub.h * Update 10bleoledhub.c * Update info.json * Update keymap.c * Update keymap.c * Rename glcdfonr.c to glcdfont.c * Update config.h * Update config.h * Update config.h * Update rules.mk * Update 10bleoledhub.c * Update 10bleoledhub.h * Update info.json * Update config.h * Update rules.mk * Update keymap.c * Update keymap.c * Update glcdfont.c * Update keyboards/10bleoledhub/rules.mk * Update keyboards/10bleoledhub/keymaps/via/keymap.c * Update keyboards/10bleoledhub/keymaps/default/keymap.c * Update keyboards/10bleoledhub/config.h * Update keyboards/10bleoledhub/config.h * Update keyboards/10bleoledhub/10bleoledhub.h * Create readme.md * Create rules.mk * Create latin47ble.h * Create latin47ble.c * Create info.json * Create config.h * Create keymap.c * Create rules.mk * Create keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk * Update keyboards/latin47ble/rules.mk * Update keyboards/latin47ble/rules.mk * Update latin47ble.h * Update latin47ble.c * Update latin47ble.h * Update latin47ble.c * Update keymap.c * Update keymap.c * Update config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk * Delete info.json * Update readme.md * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/latin47ble.c * Update keyboards/latin47ble/latin47ble.h * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keymap.c * Update keymap.c * Update latin47ble.h * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/latin47ble.h * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-062-22/+32
|\|
| * CI: Add workflow for tagging essential modified files (#7384)Joel Challis2020-12-062-22/+32
| | | | | | | | | | | | | | | | | | * Add workflow for tagging essential modified files * Update inline with recent actions * align rules to labeler * Update .github/workflows/auto_tag.yaml
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-13/+21
|\|
| * Revert back to the old matrix (Take the blue pill) (#10568)MechMerlin2020-12-061-13/+21
| | | | | | | | | | * revert back to the old matrix. * apparently I can't count, J is the 19th not the 20th column
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-069-0/+213
|\|
| * Added WT60-G (#10876)Wilba2020-12-069-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0624-992/+1403
|\|
| * Bocaj - Third Annual Refactor (Redux) (#10295)Jacob Jerrell2020-12-0624-992/+1403
| | | | | | | | | | | | | | | | | | * Reset everything to upstream, reapply Bocaj changes * Bocaj - address PR comments * Just in time changes * Bocaj - Several adjustments after using the layout for a while
* | gcc 10 compatibility for Drop alt (#9485)Jesper Jensen2020-12-066-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split dmac_desc declaration and definition According to the official documentation[1] gcc 10 is more strict about correct extern usage. I've had to move the definition of dmac_desc and dmac_desc_wb from i2c_master.h to the corresponding .c file. This could be an issue if anyone includes the i2c_master.h file without liking with the object file. [1]: https://gcc.gnu.org/gcc-10/porting_to.html * Remove the keymap_config definition from keymaps The keymap_config def was conflicting with the one found in tmk_core/common/magic.c. Declaring it extern in magic.c breaks a bunch of keyboard that rely on that declaration (like the ergodox). Instead I've removed the one found in the keymap.c of the massdrop alt. The same change will have to be made to other keyboards.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-8/+9
|\|
| * Update is31fl3731-simple (#7610)Xelus222020-12-061-8/+9
| | | | | | | | | | * update simple * Update is31fl3731-simple.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-065-4/+85
|\|
| * add definition WS2812_BYTE_ORDER to fix RGB LED issues (#10184)Josh Hinnebusch2020-12-065-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add define for WS2812B-2020 to fix RGB issues * update driver doc * add WS2812_BYTE_ORDER definition to correct RGB byte issues * add definition variable thing * update per PR request * update per PR reqs * update per PR request * inital changes * move defines to color.h and add rgbw incase * Update docs/ws2812_driver.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: hineybush <hineybushkeyboards@gmail.com> Co-authored-by: Xelus22 <preyas22@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-0/+4
|\|
| * Add definitions for RGB off/black. (#11132)r-pufky2020-12-061-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-0/+28
|\|
| * Added OLED Initialized checks (#11129)XScorpion22020-12-061-0/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-5/+11
|\|
| * Fix error handling in SPI master. (#11122)Dimitris Papavasiliou2020-12-061-5/+11
| | | | | | Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0510-0/+334
|\|
| * Initial Nightingale Studios Hailey support (#11116)Joel Challis2020-12-0510-0/+334
| | | | | | | | | | | | | | | | | | | | | | * Initial Nightingale Studios Hailey support * Add info.json * Fix bootmagic jump * Add missing header * Update default keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-054-0/+194
|\|
| * Add a custom keymap for Torn keyboard (#11017)Alexander Dergachev2020-12-054-0/+194
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-052-8/+16
|\|
| * Omit serial number if not defined (#11104)Ryan2020-12-052-8/+16
| |
* | ChibiOS upgrade: keyboard conf migrations (phase 1) (#10418)Nick Brassel2020-12-05263-125956/+5216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |<