summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-195-14/+237
|\
| * Caps Unlocked CU65 layout macro fixes (#11606)James Young2021-01-195-14/+237
| |
* | Fixup builds on develop branch. (#11600)Nick Brassel2021-01-193-7/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1812-0/+383
|\|
| * [Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)datafx2021-01-1812-0/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-184-178/+298
|\|
| * Naked64 Configurator update and rework (#11568)James Young2021-01-184-178/+298
| |
* | ChibiOS conf migrations... take 9 (#11598)Nick Brassel2021-01-1815-8584/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1893-97/+0
|\|
| * Remove `DESCRIPTION`, E-G (#11574)Ryan2021-01-1893-97/+0
| |
* | `qmk cformat`Nick Brassel2021-01-179-113/+136
| |
* | Keep track of last matrix activity. (#11552)Nick Brassel2021-01-183-14/+32
| | | | | | | | | | Co-authored-by: Dasky <daskygit@users.noreply.github.com> Co-authored-by: Dasky <daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-172-1/+93
|\|
| * Add syscall fallbacks to ChibiOS builds (#11573)Nick Brassel2021-01-182-1/+93
| | | | | | | | | | * Add fallback syscalls to ChibiOS builds that are present but able to be overridden as appropriate. * Modified location to be ChibiOS-specific.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-171-3/+55
|\|
| * Generate version.h when compiling json files (#11581)Zach White2021-01-171-3/+55
| | | | | | | | | | | | | | | | | | * generate version.h when compiling json files * make flake8 happy * fix formatting and verbose * quiet up the compile output
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1713-0/+1673
|\|
| * [Keyboard] add Stream15 keyboard (#11515)nibiria2021-01-1713-0/+1673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ChibiOS conf upgrade for hub20 (#11588)Nick Brassel2021-01-173-1375/+68
| | | | | | hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
* | Merge remote-tracking branch 'origin/master' into developZach White2021-01-165-26/+133
|\|
| * Improve the compile and flash subcommands (#11334)Zach White2021-01-166-30/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-158-0/+345
|\|
| * New Keyboard: walletburner/cajal (#10458)ridingqwerty2021-01-158-0/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-155-4/+59
|\|
| * Add BGR byte order for WS2812 drivers (#11562)kb-elmo2021-01-165-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-152-31/+44
|\|
| * Modify my keymap (#11407)Reibl János Dániel2021-01-152-31/+44
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-154-3/+52
|\|
| * Adds VIA support for the KPRepublic's BM60 Poker (#11267)Peter Peterson2021-01-154-3/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-151-268/+70
|\|
| * Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)James Young2021-01-151-268/+70
| | | | | | | | | | * human-friendly formatting * correct key order
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-15162-180/+980
|\|
| * Cutie Club Borsdorf: Configurator key sequence fix (#11549)James Young2021-01-141-3/+146
| | | | | | | | | | * human-friendly formatting * correct key order (ISO Enter)
| * [Keyboard] Add cool836A 1_2 (#11467)Ohashi2021-01-148-0/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 1st trial on 1_2 * remove keymaps/default/km_default.c * fix cool836A.h * fix keymap.c into 3x12 * rename to cool836a (not 'A') * remove cool836A (not a) * remove backslashes at keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * update keymap.c (add licence) * Update keyboards/cool836a/keymaps/default/readme.md removed "<br>" in line 2 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 4 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 8 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/cool836a.h remove cool836a.h line 30:36 Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Adafruit BLE cleanups (#11556)Ryan2021-01-153-32/+26
| |
| * arm_atsam: temporarily lower raw HID endpoint/report size (#11554)Ryan2021-01-151-1/+1
| |
| * [Keymap] Adds ymdk/ymd09 andys8 layout (#11320)Andy2021-01-141-0/+65
| | | | | | | | Custom layout for macropad. It shows the usage of macros with unicode, and other layouts (ISO-DE) with unicode, emojis, and git commands.
| * allow customizing decrease delay of rgb heatmap (#11322)André Silva2021-01-143-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow customizing decrease delay of rgb heatmap * rename rgb typing heatmap decrease delay variable * address review comments * nix-shell: add clang-tools required for formatting the C code * heatmap: use real timer to track decrement rate * heatmap: fix ifndef var name typo * heatmap: add docs * Update docs/feature_rgb_matrix.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keymap] Add domnantas lily58 keymap (#10910)Domantas2021-01-144-0/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initialize domnantas layout * Update oled status display * Layout and oled changes * Updates to keymap * Add F keys and page moves * Add media keys, rearrange home and end * Add instructions * Swap backspace and enter * Remove unnecesary Enter keymap * - Change display timeout - Update minus sign to work on both English and Lithuanian layouts * Add copyright header * Replace static strings with PSTR * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Remove `DESCRIPTION`, B-D (#11513)Ryan2021-01-15152-153/+1
| |
* | Revert "Keep track of last matrix activity (#10730)"Nick Brassel2021-01-153-30/+15
| | | | | | | | This reverts commit 79d1db332477963555416d9fff82ecac4399bd52.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-141-5/+18
|\|
| * Updated documentation for new BDN9 board revisions (#11380)Nick Blyumberg2021-01-141-5/+18
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Danny <nooges@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-142-19/+17
|\|
| * [Keyboard] eliminate nested layout warnings in kbd75 (#11540)Joshua Diamond2021-01-132-19/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1412-5/+336
|\|
| * [Keyboard] Added Ortho support to Program Yoink kb (#11534)melonbred2021-01-1312-5/+336
| | | |</