summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-20Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-01-20Remove `DESCRIPTION`, K-M (#11619)Ryan
2021-01-20Fix up comments showing how to execute config migration. (#11621)Nick Brassel
2021-01-19ChibiOS enable memory allocations (#11620)Nick Brassel
2021-01-19Fixup declaration for _kill, add other missing syscalls, populate errno. ↵Nick Brassel
(#11608)
2021-01-20ChibiOS 20.3.2 (#11495)Nick Brassel
* Update ChibiOS submodule * Update ChibiOS-Contrib submodule * Update ChibiOS config files
2021-01-20Remove `DESCRIPTION`, H-J (#11616)Ryan
2021-01-20ChibiOS conf migrations... take 10 (#11617)Nick Brassel
* ChibiOS conf upgrade for akegata_denki/device_one akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f * ChibiOS conf upgrade for chavdai40 chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8 chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73 * ChibiOS conf upgrade for ergodox_stm32 ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad * ChibiOS conf upgrade for jm60 jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d * ChibiOS conf upgrade for matrix/m20add matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8 * ChibiOS conf upgrade for matrix/noah matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
2021-01-20Leftover early initialisation conversions (#11615)Nick Brassel
* jm60 * ergodox_stm32 * F042 bootloader jumps. * xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072. * matrix/m20add, matrix/noah
2021-01-20Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-01-19GCC 10 compatibility for Ploopy optical encoder (#11586)Glen D'souza
2021-01-19change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap ↵CMMS-Freather
fimware (#11443) * 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 Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19New keymaps with KC_LGUI on another key and scroll with encoder (#11479)Benjamin Garcia
* feat(kyria): new keymaps with KC_LGUI on another key add also possibility to scroll with encoder and finally play with olded screen to replace default kyria logo by Magic the Gathering mana color icon. * Update keyboards/kyria/keymaps/benji/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * add magic logo * add mouse button Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19[Keymap] Add peej userspace and keymaps (#11332)Paul James
2021-01-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)James Young
* info.json: human-friendly formatting * info.json: correct key object order * info.json: replace Unicode characters They don't play nice with `qmk info -l`. * info.json: correct keyboard dimensions
2021-01-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Caps Unlocked CU65 layout macro fixes (#11606)James Young
2021-01-19Fixup builds on develop branch. (#11600)Nick Brassel
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18[Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)datafx
* Support for Monstargear XO87 Hot-Swap PCB * Remove manufacturer from product line * Removed alternate bootloaders * Updated info.json * Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h * Delete kb.h * Update rgb.h * Update rules.mk * Add files via upload * Delete kb.h * Update keymap.c * Update config.h * Update rgb.c * Add via RGB support * Update info.json * Update readme.md * Update readme.md * Update config.h * Update rgb.h * Update config.h * Mirror factory layout * Mirror factory layout * Update rgb.h * Update keyboards/xo87/rgb/rgb.c * Update rgb.c * Update keyboards/xo87/rgb/config.h * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update config.h * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * remove deprecated action_get_macro() * rearrange layout per request * rearrange layout per request * Update keyboards/xo87/rgb/rgb.h * Update keyboards/xo87/rgb/keymaps/default/readme.md * Update keyboards/xo87/rgb/readme.md * Bugfix for RGB Matrix * Bugfix for RGB Matrix * Moved to new subdirectory and updated build commands to reflect changes * Remove old files
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18Naked64 Configurator update and rework (#11568)James Young
2021-01-18ChibiOS conf migrations... take 9 (#11598)Nick Brassel
* ChibiOS conf upgrade for akegata_denki/device_one akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f * ChibiOS conf upgrade for ergodox_stm32 ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f * ChibiOS conf upgrade for jm60 jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef * ChibiOS conf upgrade for matrix/m20add matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209 * ChibiOS conf upgrade for matrix/noah matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf * ChibiOS conf upgrade for nibiria/stream15 nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82 * ChibiOS conf upgrade for xiaomi/mk02 xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18Remove `DESCRIPTION`, E-G (#11574)Ryan
2021-01-17`qmk cformat`Nick Brassel
2021-01-18Keep track of last matrix activity. (#11552)Nick Brassel
Co-authored-by: Dasky <daskygit@users.noreply.github.com> Co-authored-by: Dasky <daskygit@users.noreply.github.com>
2021-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18Add syscall fallbacks to ChibiOS builds (#11573)Nick Brassel
* Add fallback syscalls to ChibiOS builds that are present but able to be overridden as appropriate. * Modified location to be ChibiOS-specific.
2021-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-17Generate version.h when compiling json files (#11581)Zach White
* generate version.h when compiling json files * make flake8 happy * fix formatting and verbose * quiet up the compile output
2021-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-17[Keyboard] add Stream15 keyboard (#11515)nibiria
* add keyboard Stream15 * committted changes as suggested by drashna * committed further changes as suggested * Update info.json removed excessive comma * Update keyboards/nibiria/stream15/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nibiria/stream15/keymaps/via/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nibiria/stream15/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * resolved 2 more issues Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-17ChibiOS conf upgrade for hub20 (#11588)Nick Brassel
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
2021-01-16Merge remote-tracking branch 'origin/master' into developZach White
2021-01-16Improve the compile and flash subcommands (#11334)Zach White
* add support for --clean to compile and flash * compile standalone JSON keymaps without polluting the tree * Add support for passing environment vars to make * make flake8 happy * document changes to qmk compile and flash * add -e support to json export compiling * Fix python 3.6 * honor $MAKE * add support for parallel builds
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15New Keyboard: walletburner/cajal (#10458)ridingqwerty
* adding alpha variants * adding cajal layouts * adding V2 PCB support adding additional layouts for new PCB version, and correecting incorrect image in info file * Cleanup master -- remove alpha9 * Cleanup master -- remove g4m3ralpha * Cleanup master -- remove cajal & sl40 * Master cleanup -- re-add sl40 * Master cleanup -- correct SL40 image * New Keyboard: walletburner/cajal * Added license attribution to *.{c,h} files * Update keyboards/walletburner/cajal/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Rename 'ortho' keymap to 'default_ortho' * Update keyboards/walletburner/cajal/cajal.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md Adding bootloader instructions. Co-authored-by: worldspawn00 <mcmancuso@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-16Add BGR byte order for WS2812 drivers (#11562)kb-elmo
* add byte order bgr for ws2812 * update docs for driver change * Update ws2812_driver.md * Update docs/ws2812_driver.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Modify my keymap (#11407)Reibl János Dániel
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Adds VIA support for the KPRepublic's BM60 Poker (#11267)Peter Peterson
* WIP working on new keymap * tweaking keymap * updated keymap * cleaned up a little bit * New preonic keymap * my preonic keymap * added mac layout * preonic map update * cleaning up old repo * cleaning up to match upstream * more cleanup * removing old keymaps * cleaned up commit history for bm60poker via support * cleaned up via keymap * fixed copywrite Co-authored-by: Peter Peterson <ppeterson@noao.edu>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)James Young
* human-friendly formatting * correct key order
2021-01-15Merge remote-tracking branch 'upstream/master' into developfauxpark