summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reduce firmware size in prep for #12670 (#13724)Drashna Jaelre2021-07-2712-18/+55
| | | | | * Reduce firmware size in pre for #12670 * Also disable pixel mode, just in case
* [Keyboard] Update kyria make path example (#13720)Albert Y2021-07-261-2/+2
| | | Co-authored-by: filterpaper <filterpaper@localhost>
* [Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre2021-07-2650-1396/+993
|
* Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731)Joel Challis2021-07-274-10/+2
|
* Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-2726-559/+394
|\
| * Add bootloader size (#13729)datafx2021-07-272-0/+2
| | | | | | | | | | | | | | | | | | * Add bootloader size Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic * Include dz60rgb v2.1 Add boot loader size to this pcb also
| * 40percentclub/nein: update info.json layout macro reference (#13726)James Young2021-07-261-1/+1
| | | | | | - change LAYOUT to LAYOUT_ortho_3x3
| * Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" ↵Cyril2021-07-252-4/+4
| | | | | | | | | | (#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-251-0/+2
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041)Drashna Jaelre2021-07-2520-555/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Update ZSA Keyboard Readmes and keymaps * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Remove custom rgb code for RGB_M_P * Fix inevitable typo Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/planck/ez/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard Update] Change to L422 (#13717)Xelus222021-07-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | * change to L422 * Add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> * add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Valor Rev 2 (#13551)Xelus222021-07-2516-0/+672
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Bug] Include gpio.h in solenoid driver for GPIO Control functions (#13716)Drashna Jaelre2021-07-251-0/+1
| |
* | Haptic: driver-> feature (#13713)Joel Challis2021-07-257-138/+177
| |
* | [Keyboard] Fix up SplitKB keyboards (#13511)Drashna Jaelre2021-07-25111-314/+1012
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-255-6/+59
|\|
| * Allow output of logging when running unit tests (#13556)Joel Challis2021-07-255-6/+59
| | | | | | | | | | | | | | | | | | | | | | * Initial pass at enabling logging for unit tests * Add to docs * Bind debug for more test types * Force everything * Tidy up slightly
* | Update LUFA (18-07-2021) and add QMK-HID Bootloader support (#13588)Drashna Jaelre2021-07-246-9/+80
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fix compile size for the Vitamins Included via keymap (#13696)Drashna Jaelre2021-07-254-20/+24
| |
* | docs/cli_commands: fix typo (#13697)Marc Tamsky2021-07-251-1/+1
| |
* | dirty fix (#13695)Dasky2021-07-253-1/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-2520-42/+307
|\|
| * [Keyboard] Fix keymaps for clueboard 66_hotswap (#13694)Drashna Jaelre2021-07-259-0/+242
| | | | | | | | | | | | | | * [Keyboard] Fix default keymap for clueboard proto * Fix keymaps, because they're not actually revision compatible * Add copyright headers
| * Refactor some platform dependent logic (#13675)Joel Challis2021-07-2411-46/+65
| |
* | [Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691)Drashna Jaelre2021-07-252-5/+2
| |
* | [Keyboard] Fix Compile size on ungodly Launch Pad (#13692)Drashna Jaelre2021-07-251-0/+8
| |
* | Fix & clean up tronguylabs/m122_3270 (#13684)Ryan2021-07-2514-347/+318
| |
* | [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-251-1/+4
| |
* | Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689)Drashna Jaelre2021-07-2420-125/+64
| |
* | [Keyboard] Fix Q1 change dip switch to bool (#13687)Dasky2021-07-241-12/+13
| |
* | [Docs] Fix typo in dip switch example (#13688)Dasky2021-07-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2412-0/+590
|\|
| * [Keyboard] Add Keychron Q1 (#13397)lokher2021-07-2412-0/+590
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@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-07-243-0/+185
|\|
| * [Keymap] add kinesis/keymaps/jwon (#13618)James Won2021-07-243-0/+185
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2414-0/+320
|\|
| * [Keyboard] Dharma (#13663)Xelus222021-07-2412-0/+278
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * feature: Add swap hands support for sofle keyboard. (#13654)Shane Celis2021-07-242-0/+42
| |
* | Fix up xd002 rgb keymaps (#13685)Joel Challis2021-07-244-13/+13
| |
* | Avoid LTO conficts on arm_atsam (#13676)Joel Challis2021-07-246-6/+6
| |
* | [Keyboard] Reduce compile size for dz60rgb v2.1 (#13680)Drashna Jaelre2021-07-242-4/+4
| |
* | [Keyboard] Fix type on pandora via keymap (#13681)Drashna Jaelre2021-07-241-1/+1
| |
* | Remove deprecated callbacks for encoders and dip switches (#13404)Drashna Jaelre2021-07-2459-463/+343
| |
* | [Keyboard] Quick hack to fix Astro65 board (#13665)Drashna Jaelre2021-07-231-4/+6
| | | | | | | | | | * [Keyboard] Quick hack to fix Astro65 board * Use proper pins
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-249-0/+325
|\|
| * [Keyboard] Added Compound keyboard support (#12942)Rafael Yumagulov2021-07-239-0/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Added Compound keyboard support * Small fixes for Compound keyboard * Fixed readme and header file for Compound keyboard * Update keyboards/compound/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Changed info.json and readme.md for Compound Keyboard info.json - removed key_count readme.md - changed PCB picture url to low-resolution Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Disables rgblight twinkle by default. (#13677)Nick Brassel2021-07-241-1/+0
| | | | | | | | | | | | | | | | | | | | This takes up about 700 bytes of space, and needs to be swapped to opt-in, rather than opt-out. Build failures in general on AVR due to the scarcity of available flash. People can re-enable it by adding to their keymap's config.h files: ``` #define RGBLIGHT_EFFECT_TWINKLE ```
* | [Keyboard] Fix split matrix for sekigon grs 70ec (#13672)Drashna Jaelre2021-07-231-5/+17
| |
* | [Keyboard] Fix matrix delay on Drop boards (#13671)Drashna Jaelre2021-07-232-2/+2
| |
* | [Keyboard] Disable console by default on all Keebio boards (#13649)Drashna Jaelre2021-07-237-9/+9
| |