summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | fix lizard_trick/tenkey_plusplus/info.jsonZach White2021-01-031-2/+2
| |
* | fix clueboardsZach White2021-01-032-1/+2
| |
* | Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with yes/no for enable ↵Nick Brassel2021-01-044-8/+12
| | | | | | | | flag. (#11426)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-031-1/+1
|\|
| * Homebrew install: ignore pinned formulae in `brew upgrade` (#11423)Ryan2021-01-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-031-0/+4
|\|
| * arm_atsam: Use PROGRAM_CMD for :flash target if set (#11424)Joel Elkins2021-01-041-0/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-032-6/+12
|\|
| * Align ChibiOS spi_master behaviour with AVR (#11404)Ryan2021-01-031-2/+8
| | | | | | | | | | * Align ChibiOS spi_master behaviour with AVR * Rollback `spi_transmit()` and `spi_receive()` to preserve DMA
| * Fix broken Lighting Layers when RGBLIGHT_MAX_LAYERS > 16 (#11406)Joshua Diamond2021-01-021-4/+4
| | | | | | | | | | | | | | | | | | * fix incorrect bit math when RGBLIGHT_MAX_LAYERS > 16 * with 1UL cast is not needed * ...but just casting works and is even more efficient * cformat
* | Remove handwired/bluepill. (#11415)Nick Brassel2021-01-0325-2568/+0
| |
* | ChibiOS conf migrations... take 4 (#11413)Nick Brassel2021-01-039-4128/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ChibiOS conf upgrade for cannonkeys/tsukuyomi cannonkeys/tsukuyomi - 7beddc74b03d652481198843a178177de5da3ddb * ChibiOS conf upgrade for misterknife/knife66_iso misterknife/knife66_iso - f2dd6e6c54258ae9d09a88215b36fba34947fc23 * ChibiOS conf upgrade for mode/eighty mode/eighty/m80h - 4bbbee01a89a5b4ab5f4de36e0dd2044cf54a698 mode/eighty/m80s - 6de4a1affab4ed8f08423eb511393ed797e3ea77
* | Fix broken keyboards (#11412)Zach White2021-01-034-14/+20
| | | | | | | | | | * Fix a couple errors * add a dependency for the generated headers
* | Fix compiling on develop (#11409)Zach White2021-01-021-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-022-2/+4
|\|
| * Return the make exit code for qmk compile and flash (#11402)Zach White2021-01-022-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-029-0/+381
|\|
| * [Keyboard] Added LDK65 based off BKS65 (#11335)Felix Jen2021-01-029-0/+381
| |
* | Improved Language Specific Keycodes for US International and Extended ↵Joshua Diamond2021-01-027-13/+594
| | | | | | | | | | Layouts (#11307) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-021-1/+1
|\|
| * Update quark pin config (#11398)npspears2021-01-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-021-1/+1
|\|
| * [Docs] Fix typo in hand_wire.md (#11297)Michael Overman2021-01-011-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0219-0/+1039
|\|
| * [Keyboard] Added Phantom Solder PCB and KBD8X HS PCB Variants (#11282)Felix Jen2021-01-0119-0/+1039
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added config for phantom solder all layout via only * fixed matrix def * Added KBD8X * changed info name * lowercase instances of LAYOUT_ALL and edited rules.mk * edited kbd8x results * fixed kbd8x rules * removed trailing comma in kbd8x info * Update keyboards/lucid/kbd8x_hs/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/kbd8x_hs.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Fixed info.json key mismatch Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-2/+7
|\|
| * [Keyboard] Pos78 update (#11274)smssmssms2021-01-011-2/+7
| | | | | | | | | | | | | | | | | | * Added LED hardware pin numbers CAPS and NUM lock LEDs * Added "LED_PIN_ON_STATE 1" * Make MATRIX_ROW/COL pins match reality
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0111-0/+399
|\|
| * [Keyboard] Add GKB-M16 Macro Pad (#11262)gkeyboard2021-01-0111-0/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add GKB-M16 Macro Pad Add GKB-M16 (gkb_m16) Macro Pad under gkeyboard * Update keyboards/gkeyboard/gkb_m16/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0112-0/+622
|\|
| * [Keyboard] New Keyboard - Mercutio (#11214)Kyle McCreery2021-01-0112-0/+622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit on new clean branch. Testing out functionality of oled and encoder for default features. * Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly. * Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR. * Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies. * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechwild/mercutio/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Fixing json syntax. * Update keyboards/mechwild/mercutio/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-013-1/+120
|\|
| * [Keyboard] Rebound, adding files for VIA compat (#11193)Ross Montsinger2021-01-013-1/+120
| | | | | | | | | | | | | | | | | | | | | | * changes for via * add manu to product name * remove manu from product value * remove description * i m licensed
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-3/+1
|\|
| * speed up list_keyboards.shMURAOKA Taro2021-01-011-3/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-019-458/+513
|\|
| * O4L 5x12 refactor (#11392)Ryan2021-01-019-458/+513
| | | | | | | | | | * O4L 5x12 refactor * Remove config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-28/+28
|\|
| * Fix rart4x4 info.json (#11390)Ryan2021-01-011-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-1/+1
|\|
| * Fix typo in hand wiring guide (#11388)s-maurice2021-01-011-1/+1
| | | | | | ridid -> rigid
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-018-256/+268
|\|
| * Manta60 refactor (#11378)Ryan2021-01-028-256/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-12/+12
|\|
| * Fix layout ortho_4x12 macro for montsinger/rebound/rev4 (#11382)Joel Challis2021-01-011-12/+12
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-0133-719/+1071
|\|
| * Quark refactor (#11377)Ryan2021-01-0130-700/+1052
| |
| * Manually run formatting CI process (#11375)Joel Challis2021-01-014-44/+44
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3121-0/+899
|\|
| * Quark PCB for Planck/Preonic (#11206)npspears2020-12-3121-0/+899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Quark PCB for Planck/Preonic Quark provides alternate bottom row layouts for both the OLKB Planck and Preonic * Rename rules.mk.txt to rules.mk * added Tapping Toggle removed tapping toggle from keymap level * Update info.json took out } as requested * update config.h added GPL2+ license and #pragma once * update info.json again cleaned up syntax * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * update config.h added GPL2+ License * Update info.json - and again fixed it - oops Co-authored-by: Drashna Jaelre <drashna@live.com>