summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-07add mt84 keyboard (#10857)maikong
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-07Eek! keyboard firmware merge into QMK (#11020)James Smith
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-12-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-07Add VIA support for E88 (#11065)monjebf
* Add VIA support for E88 * Update keyboards/e88/keymaps/via/keymap.c
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06[Keymap] Adding encg keymap for 2% Milk keyboard (#11041)encg
* adding my keymap * Updating coding convention and style for new keymap PR * Added GPL license header and to-do list to readme
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Use patch bump for auto tagging workflow (#11137)Joel Challis
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06handwired/videowriter: oleg keymap update, via keymap (#10984)Dmitry Nosachev
* 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>
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06[Keyboard] Add Lasgweloth (#10944)Álvaro A. Volpato
* 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>
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06[Keyboard] Added a dactyl promicro rah (#10889)Ralph Azucena
* 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>
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06[Keyboard] Latin47ble bluetooth keyboard (#11023)haierwangwei2005
* 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
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06CI: Add workflow for tagging essential modified files (#7384)Joel Challis
* Add workflow for tagging essential modified files * Update inline with recent actions * align rules to labeler * Update .github/workflows/auto_tag.yaml
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Revert back to the old matrix (Take the blue pill) (#10568)MechMerlin
* revert back to the old matrix. * apparently I can't count, J is the 19th not the 20th column
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Added WT60-G (#10876)Wilba
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Bocaj - Third Annual Refactor (Redux) (#10295)Jacob Jerrell
* 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
2020-12-06gcc 10 compatibility for Drop alt (#9485)Jesper Jensen
* 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.
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Update is31fl3731-simple (#7610)Xelus22
* update simple * Update is31fl3731-simple.c
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06add definition WS2812_BYTE_ORDER to fix RGB LED issues (#10184)Josh Hinnebusch
* 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>
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Add definitions for RGB off/black. (#11132)r-pufky
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Added OLED Initialized checks (#11129)XScorpion2
2020-12-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-06Fix error handling in SPI master. (#11122)Dimitris Papavasiliou
Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
2020-12-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-05Initial Nightingale Studios Hailey support (#11116)Joel Challis
* Initial Nightingale Studios Hailey support * Add info.json * Fix bootmagic jump * Add missing header * Update default keymap
2020-12-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-05Add a custom keymap for Torn keyboard (#11017)Alexander Dergachev
2020-12-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-05Omit serial number if not defined (#11104)Ryan
2020-12-05ChibiOS upgrade: keyboard conf migrations (phase 1) (#10418)Nick Brassel
* ChibiOS conf upgrade for acheron/arctic acheron/arctic - 8d3d233f15bf5d396e29abb94f943a89b0b828d1 * ChibiOS conf upgrade for acheron/austin acheron/austin - beabc6204533de80704684de9ff7790895f319e1 * ChibiOS conf upgrade for acheron/keebspcb acheron/keebspcb - e14a96e99aab54aefebc1d3d24d64b0082db7842 * ChibiOS conf upgrade for aeboards/ext65/rev2 aeboards/ext65/rev2 - 0b97daef994903585be2768b6aaffc4da97ec617 * ChibiOS conf upgrade for ai03/vega ai03/vega - 7e5f208278309681fd1db8b2629890b813fdf938 * ChibiOS conf upgrade for at_at/660m at_at/660m - e30393b6546454f9939c1187aa9c6539f1ef76c1 * ChibiOS conf upgrade for bt66tech/bt66tech60 bt66tech/bt66tech60 - a7f4e8a224132830447d12c92d146997f9b56b7d * ChibiOS conf upgrade for cannonkeys/an_c cannonkeys/an_c - e7320dc09377fdad749e382b3986f2241633214b * ChibiOS conf upgrade for cannonkeys/atlas cannonkeys/atlas - 063a8eaea7e68607b725ad06777c49d34686b433 * ChibiOS conf upgrade for cannonkeys/chimera65 cannonkeys/chimera65 - 01ce66c862a5cd98183b10e992939a55038779bc * ChibiOS conf upgrade for cannonkeys/db60 cannonkeys/db60 - 45636d0b3cf951cef51a5b19678e2da549efd14f * ChibiOS conf upgrade for cannonkeys/devastatingtkl cannonkeys/devastatingtkl - 709e0155c421991fad283d38c28f850320ed4730 * ChibiOS conf upgrade for cannonkeys/instant60 cannonkeys/instant60 - 7e530e10794183d684a328f01b9b0743907440c7 * ChibiOS conf upgrade for cannonkeys/instant65 cannonkeys/instant65 - c8de288708d0586337cb7137ae54d97e1ddc90a6 * ChibiOS conf upgrade for cannonkeys/iron165 cannonkeys/iron165 - 3a3c0273e227fd15ab3527e4aa557b94d0b69248 * ChibiOS conf upgrade for cannonkeys/obliterated75 cannonkeys/obliterated75 - cdf834802ae77b1bbd4876eb8c34c19a83ad95cd * ChibiOS conf upgrade for cannonkeys/ortho48 cannonkeys/ortho48 - 3432ff13c83a6358eca44b37f72b18882eeda699 * ChibiOS conf upgrade for cannonkeys/ortho60 cannonkeys/ortho60 - 95be42a23798cc8f9b04175d4892b712d871a52d * ChibiOS conf upgrade for cannonkeys/ortho75 cannonkeys/ortho75 - e1149893fd01e853124808b45d521b61a7638eb9 * ChibiOS conf upgrade for cannonkeys/practice60 cannonkeys/practice60 - 6e4da87f0a766cf2665e9b4aa8e3ab33017cf745 * ChibiOS conf upgrade for cannonkeys/practice65 cannonkeys/practice65 - c436c06829123503073b3a9c5a1c0acfc2dbe2e5 * ChibiOS conf upgrade for cannonkeys/rekt1800 cannonkeys/rekt1800 - 43e8e21b62531534afeaa241f4c683fbdb60a8e0 * ChibiOS conf upgrade for cannonkeys/satisfaction75 cannonkeys/satisfaction75 - 28ff9a8a11ad1de9d09ec85fab2af906b7c27d6a * ChibiOS conf upgrade for cannonkeys/savage65 cannonkeys/savage65 - 53eaefae56020b536d4934686506d5d1fe51b6e0 * ChibiOS conf upgrade for cannonkeys/tmov2 cannonkeys/tmov2 - 8b1ced8ff7dc368afa268104cd5192bb1bfc8a1c * ChibiOS conf upgrade for chavdai40 chavdai40/rev1 - b166af66b084077764b705c9428725cde0b0ce51 chavdai40/rev2 - 0048c8ec8c28f1dfa5d1a37348524899595d8325 * ChibiOS conf upgrade for cheshire/curiosity cheshire/curiosity - f1636e53638ce2e798070e6e622fd88a08982d5a * ChibiOS conf upgrade for clueboard/60 clueboard/60 - bb5057d4a2976b6530fe2e345a4153de2f7c042d * ChibiOS conf upgrade for clueboard/66_hotswap/gen1 clueboard/66_hotswap/gen1 - 03fe10f4de7b67e5f1cf0a7d576f82676adf4261 * ChibiOS conf upgrade for clueboard/66/rev4 clueboard/66/rev4 - 878e38a34f97b32d9d109a6d98f98bc385d84864 * ChibiOS conf upgrade for coarse/cordillera coarse/cordillera - 5cae5c643e96d03bddcbb73e76e225ea5f82fef3 * ChibiOS conf upgrade for converter/siemens_tastatur converter/siemens_tastatur - 48f82cd227836878967dfa0fe0411f7d877a124c * ChibiOS conf upgrade for ergodox_infinity ergodox_infinity - 8df21d6129eef47d7a5ced92715e5bdbfb0151e5 * ChibiOS conf upgrade for function96 function96 - deecdcdca34c88058f820f0e2bc9f112458c85c5 * ChibiOS conf upgrade for generic_panda/panda65_01 generic_panda/panda65_01 - 8522d8107edcf71758f3be7298c0bc18fa7f6706 * ChibiOS conf upgrade for hadron/ver3 hadron/ver3 - 632af7727b767720c699abdff770edc9682928ee * ChibiOS conf upgrade for handwired/ck4x4 handwired/ck4x4 - a4cb9b5b8c3a162083677b14b105edbc1bca2baf * ChibiOS conf upgrade for handwired/co60/rev6 handwired/co60/rev6 - be1688eeabd83a7f576d9e4e23e24d56b8dc251b * ChibiOS conf upgrade for handwired/co60/rev7 handwired/co60/rev7 - d196c5772859ddee695bda5b0e9f0944a0f350f8 * ChibiOS conf upgrade for handwired/onekey/blackpill_f401 handwired/onekey/blackpill_f401 - 8387bfd56888fc1605d293dc0071b4ec94b23991 * ChibiOS conf upgrade for handwired/onekey/blackpill_f411 handwired/onekey/blackpill_f411 - 855efdb2f60c384edf64773c0f4ff4b7ea8ae4c9 * ChibiOS conf upgrade for handwired/onekey/bluepill handwired/onekey/bluepill - 60d8555b174dbdabae196a4cc5eccfee4bdd9529 * ChibiOS conf upgrade for handwired/onekey/stm32f0_disco handwired/onekey/stm32f0_disco - 9bc12e29f5a4e4b9ec0f34987559e5e11de4bb48 * ChibiOS conf upgrade for handwired/onekey/teensy_32 handwired/onekey/teensy_32 - 17459dd8e71b3a33270037878bdbd04151af196b * ChibiOS conf upgrade for handwired/onekey/teensy_lc handwired/onekey/teensy_lc - 3a9aed4681c287176efe31c988340ca43ad27a9d * ChibiOS conf upgrade for handwired/pill60/blackpill_f401 handwired/pill60/blackpill_f401 - 5b652354ae957e86e211dcef29f8f27320b31180 * ChibiOS conf upgrade for handwired/pill60/blackpill_f411 handwired/pill60/blackpill_f411 - 580255c171e95b5bca53b14a13ae018a73d18414 * ChibiOS conf upgrade for handwired/pill60/bluepill handwired/pill60/bluepill - 29109b54137ea94ac266c604991cff87516689ff * ChibiOS conf upgrade for handwired/riblee_f401 handwired/riblee_f401 - dc68c31d7ca8ae0fad7e7ad8bdd63406155ff363 * ChibiOS conf upgrade for handwired/riblee_f411 handwired/riblee_f411 - cf0fadff4c98d41cf9bdddbe1ead15c79be941b9 * ChibiOS conf upgrade for handwired/steamvan/rev1 handwired/steamvan/rev1 - 743b395ac87b918b6be4614c9e120e80a9f049d4 * ChibiOS conf upgrade for handwired/t111 handwired/t111 - 99b61ae5692ee4b2101673d1a896cd7a5831bcfa * ChibiOS conf upgrade for handwired/twadlee/tp69 handwired/twadlee/tp69 - 3ab2753c40e947a726ece6c825493ebc87ecf20e * ChibiOS conf upgrade for handwired/z150 handwired/z150 - 78808b0c8671e2386b9ba65dbd647d613d92f253 * ChibiOS conf upgrade for hs60/v2 hs60/v2/ansi - 7bcd152c269803de8f96416ba26e939c0420ceae hs60/v2/hhkb - d77f393d2811bd104b05c4530bf1083d75856b7a hs60/v2/iso - 5d3d20de919fca3b64cb7548cad46e8d35d7cc04 * ChibiOS conf upgrade for infinity60 infinity60 - dbcbb2f58ee499252b0879d68d9beec08a8433bc * ChibiOS conf upgrade for k_type k_type - 492f476177da95495442d1e173391e3c17324a70 * ChibiOS conf upgrade for keebio/bdn9/rev2 keebio/bdn9/rev2 - 4dbb5d606b3d9060ad01a437978220fe0f1fc5b2 * ChibiOS conf upgrade for keebio/choconum keebio/choconum - 1521e634088a30114cd12b7b6bbd2cca5331c822 * ChibiOS conf upgrade for keebwerk/mega keebwerk/mega/ansi - 10e32718c7bfff2f6bd8dd2159a15bef0f4acbf9 * ChibiOS conf upgrade for misterknife/knife66 misterknife/knife66 - cf2f3d26103036d79bf7fcec204e13899e33fbe3 * ChibiOS conf upgrade for nack nack - ba7f421d5670e672c5c14fd5f80c0f86447c1468 * ChibiOS conf upgrade for nebula12 nebula12 - aedb11fa894dc19513462f054a9fa00f5c195adc * ChibiOS conf upgrade for nebula68 nebula68 - 6bed6afb2fd84ef9069b757f1d1e87fc1cbe290c * ChibiOS conf upgrade for nemui nemui - 86ed80ea8565d7d0f39512a9032cc5e1b306fcff * ChibiOS conf upgrade for nk65 nk65 - 75b2484741a96dcbff14e94c44443bb33ad73dce * ChibiOS conf upgrade for nk87 nk87 - f719a739a3d2c0969c79c1ace5fe9a7d6f05cc22 * ChibiOS conf upgrade for peiorisboards/ixora peiorisboards/ixora - b5adf1090fb4c6278d8990ce9132727a13ca3cd7 * ChibiOS conf upgrade for phoenix phoenix - 21bfb14c52451899dadf545b78a8e88b22a420f0 * ChibiOS conf upgrade for polilla polilla - 3ba5f326b268362c9aba570b1510e1c61009ba96 * ChibiOS conf upgrade for primekb/meridian primekb/meridian - df266e25c682a8ed3318faa186805683014ccec4 * ChibiOS conf upgrade for projectkb/alice projectkb/alice - eee7210f618588b2c5c6367c8a0318427d09da52 * ChibiOS conf upgrade for projectkb/signature87 projectkb/signature87 - 617430e601981f0bb5fbcce42eee53107d5161b8 * ChibiOS conf upgrade for ramonimbao/squishy65 ramonimbao/squishy65 - 88e4cd3db8db61ccf9daed5405cf5eeb32f8043e * ChibiOS conf upgrade for ramonimbao/wete ramonimbao/wete - f0e90d943d8749e802b6bba619ce943b568a7f65 * ChibiOS conf upgrade for rart/rartlice rart/rartlice - f7a6b58e6cadd4102fcf5f89d054d1fbdc5809d0 * ChibiOS conf upgrade for retro_75 retro_75 - 34c7b291fb2443bf8cb69fb9ee676190c736bf00 * ChibiOS conf upgrade for rocketboard_16 rocketboard_16 - 24e6503a7a5259934a80dd96dd37d3281b4240d3 * ChibiOS conf upgrade for satt/vision satt/vision - c926d6433d8b2dc1d74623184255016bdd36ae22 * ChibiOS conf upgrade for tkc/candybar tkc/candybar/lefty - 2f269cbed5dcec61bb0c7904a46436f110dc0ae1 tkc/candybar/righty - 9b1448b2ccbcf8a4d1e5ad74d8ad5933003ee9a2 * ChibiOS conf upgrade for tkc/godspeed75 tkc/godspeed75 - 2cfed58d44a7eef8f341ff24e0136511e03aa78d * ChibiOS conf upgrade for tkw/stoutgat/v2/f411 tkw/stoutgat/v2/f411 - b094651ec61c79099de3e6e4991319816ac464c1 * ChibiOS conf upgrade for viktus/styrka viktus/styrka - f3f678ea55126c9965f24da6fffc9bbbd8b24aa9 * ChibiOS conf upgrade for vinta vinta - e5403dc6bbf47f35a53cf43b1b1d130f05552f16 * ChibiOS conf upgrade for westfoxtrot/prophet westfoxtrot/prophet - 0e4d6987ffa6430720804e7bc1502ab6c3dcb879 * ChibiOS conf upgrade for whitefox whitefox - 5ca6de6fb09d8c2cfa996b65732fcd55391053ff * ChibiOS conf upgrade for wolfmarkclub/wm1 wolfmarkclub/wm1 - 2d8294e29b08f5af5406988a284483d1694ed36c * ChibiOS conf upgrade for xelus/kangaroo xelus/kangaroo - f9697ba27d4e6c36a1cfd9e2657eac35dfa3be99 * ChibiOS conf upgrade for xelus/trinityxttkl xelus/trinityxttkl - a457601b446ea9b4e9e28d2ba304a4bcdb934257 * ChibiOS conf upgrade for xelus/valor_frl_tkl xelus/valor_frl_tkl - 27ec14b9ee0e5cb2d026af500d16b17d4c2885e2 * ChibiOS conf upgrade for zoo/wampus zoo/wampus - 926487c1f50c1c5eb0608ca7dc1184881d54d35e * ChibiOS conf upgrade for zvecr/split_blackpill zvecr/split_blackpill - 02f4393d01e0a70c94af48fa979ff0229732e8ca * ChibiOS conf upgrade for zvecr/zv48/f401 zvecr/zv48/f401 - 8b1766a24f943b9b0ba756c6fe340ba69d5e14e3 * ChibiOS conf upgrade for zvecr/zv48/f411 zvecr/zv48/f411 - 09ba645092eb7f3d41da0d5e6727f2f4f97033c0
2020-12-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-05Fix missing define to map rgb_matrix function set to rgblight. (#11084)Sergey Omelchenko
2020-12-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-05add nt750 (#11091)Evy Dekkers
2020-12-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-04Add default early-init bootloader to F042/F072. (#11120)Nick Brassel
2020-12-04Merge remote-tracking branch 'origin/master' into developQMK Bot