summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-160-0/+0
|\
| * Fix submodule check for qmk setup (#11379)Stefan Schulze2021-02-161-2/+2
| | | | | | | | | | | | The initialization of the submodules would succeed, but the result of the subsequent check_submodules() run wasn't checked correctly. Co-authored-by: Stefan Schulze <stefan.andre.schulze@posteo.de>
* | RGBLight: Allow configurable default settings (#11912)Ryan2021-02-162-14/+39
| | | | | | | | | | * RGBLight: Allow configurable default settings * Docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-162-0/+50
|\|
| * [Keymap] Adding HHKB Keymap for dz60rgb_wkl:v2 (#11840)Daniil Kivenko2021-02-162-0/+50
| | | | | | | | | | | | | | | | | | | | * adding new hhkb layout * adding license header * fix end of lines symbol Co-authored-by: Daniil Kivenko <d.kivenko@evrone.com> Co-authored-by: Daniil macbet Kivenko <macbet@wisebits.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-164-0/+167
|\|
| * Add mattir2 keymap for Kyria (#11752)Matt Gilbert2021-02-164-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | * added files to support my 2nd kyria * fixed missing line * swapped thumb keys * Update keyboards/kyria/keymaps/mattir2/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-161-2/+2
|\|
| * Update IGNORE_MOD_TAP_INTERRUPT (#11452)xgnxs2021-02-151-2/+2
| | | | | | Current wording of IGNORE_MOD_TAP_INTERRUPT is incorrect, and very confusing when attempting to correct a somewhat common issue for quick typists that have Mod-Tap on a commonly used key. Research indicates this wording has been incorrect for some time, and has tripped up others attempting to solve the issue of Mod + Key being sent, when Tap + Key is expected after quickly pressing keys.
* | Merge branch 'master' into developJoshua Diamond2021-02-1560-957/+968
|\|
| * Dc01 fixes (#11843)yiancar2021-02-1547-717/+383
| | | | | | | | | | | | | | | | | | | | | | * dc01-fixes * dc01-fixes * Cleanup and add VIA * Updated JSONs * fix
| * AMJ40 Refactor (#11854)James Young2021-02-1413-242/+585
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update keyboard source files - add license headers (attributed to original keyboard submitter) - #pragma once include guards - file template matching - readme update and template matching * set sensible default keyboard settings - enable Bootmagic Lite and Mouse Keys - disable Console and Command - remove default keymap's rules.mk file * remove unnecessary files from default keymap * refactor default keymap * add additional layouts/keymaps * update keyboard readme - add images and bootloader instructions - reformat link list * convert tabs to spaces in default keymap
* | Format code according to conventions (#11928)github-actions[bot]2021-02-162-19/+19
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Split transport mirror (#11046)XScorpion22021-02-1612-59/+93
| | | | | | | | | | | | | | * Split transport mirror support * Updated RGB Matrix to respond to electrical events instead of key events * split matrix slave fix
* | ChibiOS conf migrations... take 14 (#11927)Nick Brassel2021-02-168-3348/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | * ChibiOS conf upgrade for geminate60 geminate60 - a2765e46491151a8de309bc1cc8ce7e953ee1e50 * ChibiOS conf upgrade for sowbug/68keys sowbug/68keys - 7475a03ff2d704497d503a002b6c5dbac12f0a84 * ChibiOS conf upgrade for sowbug/ansi_tkl sowbug/ansi_tkl - 87be98eb6ed03a8752c1082c872a8a75b1d00ae7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1510-114/+142
|\|
| * [Keyboard] PloopyCo VIA updates (#11290)Drashna Jaelre2021-02-1410-114/+142
| | | | | | | | Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Glen D'souza <gdsouza@linuxmail.org>
* | Merge branch 'master' into developJoshua Diamond2021-02-1414-25/+24
|\|
| * LED Matrix: rename `LED_DRIVER_LED_COUNT` to `DRIVER_LED_TOTAL` (#11858)Ryan2021-02-1514-25/+24
| |
* | Merge branch 'develop' of github.com:qmk/qmk_firmware into developJoshua Diamond2021-02-142-5/+5
|\ \
| * | Format code according to conventions (#11907)github-actions[bot]2021-02-152-5/+5
| | | | | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | | Merge branch 'master' into developJoshua Diamond2021-02-1465-829/+3360
|\ \ \ | |/ / |/| / | |/
| * [Keymap] Add MOC keymap for meishi2 (#11833)Atsushi NAGASE2021-02-143-0/+81
| |
| * initial add S20 keyboard into polycarbdiet folder (#11865)Galib, Muhammad2021-02-149-0/+331
| |
| * csc027/windows-terminal-shortcuts (#11867)csc0272021-02-142-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed some comments in the defines file. * Replaced the Git command layer with a Windows Terminal shortcut layer. * Added numbered tab switching to the Windows Terminal layer. * Added 'new tab' and 'command pane' commands to the Windows Terminal layer. * Shortened the USB polling interval for the Iris to 1 millisecond. * Disabled old style macros and functions for the Iris.
| * [Docs] Japanese translation of adc_driver.md (#10971)umi2021-02-141-0/+155
| | | | | | | | | | | | | | | | | | * add adc_driver.md translation * update based on comment * update based on comment * update based on comment
| * [Docs] Japanese translation of feature_unicode.md (#10985)umi2021-02-141-0/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | * add feature_unicode.md translation * consolidate sentence end * update based on comment * update based on comment * update based on comment * update based on comment
| * [Keyboard] YMDK YMD40 v2 (#11835)James Young2021-02-1310-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] YMDK YMD40 v2 * fork default keymap into default and factory - factory keymap is as assigned by the extracted JSON provided by the vendor - default keymap is based on the Planck * add AUDIO_SUPPORTED rule per drashna * modify factory keymap's readme Recommend users copy the default keymap instead.
| * [Keyboard] NEO Keys Palette G67 Hotswap & Soldered (#11850)James Young2021-02-1318-0/+1209
| |
| * unscramble Durgod k320 keymap / fix Issue #11883 (#11885)Joshua Diamond2021-02-134-91/+79
| | | | | | | | | | * unscramble Durgod k320 keymap / fix Issue #11883 * fix a few keymaps
| * LED Matrix: add led_matrix_types.h and implement g_led_config (#11741)Ryan2021-02-146-299/+302
| | | | | | | | | | | | | | | | | | * LED Matrix: add led_matrix_types.h and implement g_led_config * Set correct flags for non-"modifier" LEDs * Clean up docs a little * Add license headers for [led,rgb]_matrix_types.h
| * Split gpio and atomic to platform (#11792)Joel Challis2021-02-1411-436/+580
| |
* | Audio system overhaul (#11820)Drashna Jaelre2021-02-15113-2456/+9731
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |