summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* UART driver refactor (#11637)Ryan2021-01-2712-39/+287
|
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-27253-757/+0
|\
| * Remove `MIDI_ENABLE_STRICT` from keyboards' config.h (#11679)Ryan2021-01-27256-766/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-279-1/+1
|\|
| * pull retropad out of handwired and update readme.md (#11545)Brandon Claveria2021-01-279-1/+1
| | | | | | Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-264-0/+491
|\|
| * [Keymap] Add 'mattir' keymap for the Kyria keyboard (#11428)Matt Gilbert2021-01-254-0/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * First version of keymap * cleaned up code, made some tweaks, added readme * extended oled timeout * resolved final issues, all features functional * added some leader-key combos * added missing RGB keys to layout diagram * removed lines for older elite-c v3 * make filename lowercase * add old update interval * fix spacing
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-263-0/+765
|\|
| * [Keymap] tk planck keymap (#11400)Tushar Khan2021-01-253-0/+765
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tushark54 base layers * init summer keymap * drafted new keymap layers * added new keymap * v2.0 mvp * added bracket modes * added oneshot left modifiers * added HYPER layer * added audio * added audio and more * changed layer order * swapped SUPER and LCTL keys * added more tunes * added more audio * added tunes * major layer modifications * major changes to keymaps * minor changes * added venv macro * merge conflict * v3 mvp * moved DEL to hyper layer and PANIC+ALT * fn keys on hyper, macros on lower ii * dynamic macros and audio options * minor audio improvements * osl timeouts * manually added .vscode directory * fixed upstream file * fixed upstream file * base and hyper layer changes * modified tapping term * added more macros * added GPL2+ compatible license headers * removed songs * updated licenses * added chmod macro
* | ChibiOS conf upgrade for durgod/k320 (#11689)Nick Brassel2021-01-252-1221/+25
| | | | | | durgod/k320 - 168c88d401381d9a29166d3b07967e6f0752532d
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2518-0/+2877
|\|
| * Add support for the DURGOD Taurus K320 keyboard (#11399)Donald Kjer2021-01-2619-2/+2877
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial support for Durgod K320 with BootMagic Lite - Adding missing files - Add Unicode Map Support & new user keymap - Remove personalized features from Default keymap - Added Unicode Map to both Default and kuenhlee keymap.c - Updated readme.md - Added additional Fn Shortcut keys * Additional support for Durgod K320 - Simplifying default keymap - Renaming durgod_k320 => durgod/k320 - Removing copy of ST_NUCLEO64_F070RB from K320. Replacing with local board.h - Adding Mac keyboard layout for K320 as alternative via Fn+F12 - Implementing Windows Key lock on K320 - Cleaning up duplicated core functionality - Adding default_toggle_mac_windows keymap with: - Ability to toggle between Windows and MacOS layout - Mac Media Lock functionality. * Updating K320 keymap readme Co-authored-by: kuenhlee <eos.camera.lee@gmail.com>
* | Update list of MCUs in keyboard.jsonschema to mirror qmk.constants.py (#11688)Nick Brassel2021-01-251-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-257-5/+330
|\|
| * [Keyboard] Add Quefrency Rev. 3 (#11578)Danny2021-01-247-5/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update default VIA layout option * Add Quefrency Rev. 3 * Update readme * Add GPL2 headers * Update keyboards/keebio/quefrency/rev3/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-258-0/+287
|\|
| * [Keyboard] Knobgoblin keyboard initial commit (#11664)mrT1ddl3s2021-01-248-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Knobgoblin keyboard initial commit New macropad initial commit. Keyboard and keymap * corrected bracket and layout name * attempting info file fix again * info file line 33 hanging comma fix * Update keyboards/knobgoblin/config.h per fauxpark review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/knobgoblin/readme.md per fauxpark review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/knobgoblin/readme.md per fauxpark review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-251-0/+4
|\|
| * [Keyboard] Fix for LEDs on PocketType (#11671)Niek Blankers2021-01-241-0/+4
| | | | | | | | | | | | | | | | The LED anodes of the pockettype are connected to the bus voltage when a pro micro is used, but other controllers like the Elite-C (v4) connect this pin to GPIO B0. This means that LEDs do not work by default for those controllers. This commit implements a fix for that by setting the B0 pin high.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-251-4/+4
|\|
| * [Keymap] Update Program Yoink Ortho Split Layout (#11675)melonbred2021-01-241-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-253-0/+28
|\|
| * [Keyboard] Add RGB Matrix support for The Mark:65 (#11676)Albert Y2021-01-243-0/+28
| | | | | | | | | | | | | | | | | | | | | | * Add RGB Matrix support for Mark 65 keyboard * Update drive LED count * Removed unnecessary define line * Corrected typo Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2510-26/+0
|\|
| * Remove redundant I2C config defines from keyboards (#11661)Ryan2021-01-2510-26/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-251-0/+2
|\|
| * [Keyboard] Add layout to torn keyboard (#11684)Brian Romanko2021-01-241-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-255-9/+7
|\|
| * Change VID/PID for Zinc (#11681)Monksoffunk2021-01-252-6/+6
| |
| * Fix midi for CRKBD (#11644)Loïc Wisniewski2021-01-253-3/+1
| | | | | | Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2432-0/+2189
|\|
| * Add jones v.0.3 and v.0.3.1 keyboard (#11130)Takeshi Nishio2021-01-2432-0/+2189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |