summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-3010-2/+348
|\
| * [Keyboard] add sam's sg81m keyboard (#11624)CMMS-Freather2021-01-2910-2/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new repo: create cmm.studio folder, add saka qmk firmware new folder for cmm.studio line up keyboard added saka68 keyboard qmk and via firmware support * Update keyboards/cmm.studio/saka68/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cmm.studio/saka68/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cmm.studio/saka68/keymaps/via/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cmm.studio/saka68/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * fix on keymap, readme fix on keymap, readme * Update keyboards/cmm.studio/saka68/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cmm.studio/saka68/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * update vendor name with _ instead of . update vendor name with _ instead of . * Update readme.md change the make format * Update keyboards/cmm_studio/saka68/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * deleted some files from cmm.studio, changes to cmm_studio deleted some files from cmm.studio, changes to cmm_studio * Update readme.md make command changed * Update keyboards/cmm_studio/saka68/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md added pic for pcb * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update keyboards/cmm_studio/saka68/config.h tested and does work now. deleting these lines Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update keyboards/cmm_studio/saka68/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md added use physical reset button instruction * change to the cmm saka folder making the changes to cmm saka firmware seperated solder version firmware and hotswap version firmware * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * change to the cmm saka hotswap folder * add sam's sg81m keyboard add sam's sg81m keyboard firmware * Update keymap.c * Update keymap.c * update keymap update default keymap and via keymap * Update keymap.c * Update keymap.c * Update keymap.c * Update keyboards/sam/sg81m/sg81m.c Co-authored-by: Joel Challis <git@zvecr.com> * Update config.h * Update config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Adds AT90USB162 support (#11570)Dasky2021-01-2919-34/+42
| | | | | | | | | | | | | | | | | | | | | | * at90usb162 support * fix missing bracket * Apply suggestions from code 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-3019-3/+497
|\|
| * [Keyboard] Adding Gust Macro Board (#11610)Eithan Shavit2021-01-2911-0/+262
| | | | | | | | | | | | | | | | | | * Adding Gust Macro Board * Removing some rules * Changing some rules Co-authored-by: Eithan Shavit <eithan@fb.com>
| * [Keyboard] Adding Rev1 to afternoonlabs/breeze (#11611)Eithan Shavit2021-01-298-3/+235
| | | | | | | | | | | | | | | | | | * Breeze Rev1 * Better bootmagic and reset * typo Co-authored-by: Eithan Shavit <eithan@fb.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-307-0/+230
|\|
| * [Keyboard] A symmetric stagger keyboard: Angel (#11501)james sa2021-01-297-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New symmetric stagger keyboard: Angel * mac layout * layout simplify * Update keyboards/angel/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/angel/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/angel/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/angel/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/angel/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * tab lang switch * move to handwired and fix build instructions. Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-291-25/+125
|\|
| * Update feature_debounce_type.md of Japanese document. (#10596)shela2021-01-301-25/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update Japanese document. * fix table format. * fix heading * Update translation * Apply suggestions from code review Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * Update docs/ja/feature_debounce_type.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * Bump up comment tag Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
* | Allow post_config.h to be implemented in userspace (#11519)Joshua Diamond2021-01-291-0/+3
| | | | | | | | | | | | | | > Rebased and pushed. Squashed and merged. :)
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-287-2/+30
|\|
| * Add rgblight_reload_from_eeprom() (#11411)Joshua Diamond2021-01-283-0/+15
| | | | | | | | | | * Add rgblight_reset_from_eeprom() * reset->reload
| * [Docs] add qmk setup home parameter (#11451)glanchow2021-01-281-0/+2
| |
| * add get_matrix_scan_rate() to tmk_core/common/keyboard.c (#11489)Takeshi ISHII2021-01-283-2/+13
| |
* | Add support for 8 buttons to mouse report (#10807)Drashna Jaelre2021-01-289-61/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for 8 buttons to mouse report This includes support for 8 buttons in mousekeys. However, this does move the keys around due to the fact that the last mousekey keycode is already 0xFF, so any past that would not work with register_code and the like, breaking them for tap hold keys, encoders, and other features. * Update mouse key docs * Add changes based on feedback * Fix VUSB report size comment Because drashna red gud * Fix typo in action.c * Fix IS_MOUSE_BUTTON check * Change start range for mousekeys so that the end is 0xFF properly * condense mousekeys check
* | Backport ChibiOS Audio changes from ZSA (#11687)Drashna Jaelre2021-01-282-8/+19
| |
* | 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/