Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-21 | 74 | -75/+74 |
|\ | |||||
| * | Remove audio pin references in rules.mk (#14532) | Ryan | 2021-09-21 | 74 | -74/+74 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-20 | 26 | -26/+26 |
|\| | |||||
| * | Remove backlight pin references in rules.mk (#14513) | Ryan | 2021-09-20 | 26 | -26/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-18 | 8 | -347/+0 |
|\| | |||||
| * | [Keyboard] Add Dosa40RGB + dtisaac01 (#14476) | Dao Tak Isaac | 2021-09-17 | 8 | -347/+0 |
| | | |||||
* | | Move Bluetooth config to common_features.mk (#14404) | Ryan | 2021-09-12 | 10 | -17/+18 |
| | | | | | | | | | | | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Align ChibiOS I2C defs with other drivers (#14399) | Joel Challis | 2021-09-12 | 4 | -9/+7 |
| | | | | | | | | | | | | | | | | | | * Align ChibiOS I2C defs with other drivers * Update keyboards/xelus/valor_frl_tkl/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-12 | 148 | -148/+0 |
|\| | |||||
| * | Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379) | Ryan | 2021-09-12 | 148 | -148/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-12 | 168 | -412/+11 |
|\| | |||||
| * | Remove width, height and key_count from info.json (#14274) | Ryan | 2021-09-12 | 168 | -412/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 4 | -4/+0 |
|\| | |||||
| * | Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375) | Ryan | 2021-09-10 | 4 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-10 | 2 | -2/+2 |
|\| | |||||
| * | Change USBasp and bootloadHID bootloaders to lowercase (#14354) | Ryan | 2021-09-10 | 2 | -2/+2 |
| | | |||||
* | | Fix number of elements in info.json does not match errors (#14213) | Zach White | 2021-09-09 | 1 | -451/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 86 | -614/+2 |
|\| | |||||
| * | Remove bootloader listings from rules.mk (#14330) | Ryan | 2021-09-10 | 86 | -614/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 1 | -1/+0 |
|\| | |||||
| * | Remove commented out BLUETOOTH_ENABLE rules (#14361) | Ryan | 2021-09-10 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-09 | 1 | -1/+1 |
|\| | |||||
| * | Bugfix for Joystick and JSON schema (#14295) | Ryan | 2021-09-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 11 | -118/+141 |
|\| | |||||
| * | [Keyboard] Tractyl Manuform - configuration updates (#14314) | Drashna Jaelre | 2021-09-08 | 11 | -118/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Tractyl Manuform - configuration updates * Update readmes * Add more details * Fix issues with encoder pins * Additional fixes for pin config * Fix up some comments | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 1 | -1/+1 |
|\| | |||||
| * | Fixes for recent i2c migrations (#14352) | Joel Challis | 2021-09-08 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 6 | -442/+52 |
|\| | |||||
| * | handwired/dactyl - Refactor use of legacy i2c implementation (#14344) | Joel Challis | 2021-09-07 | 6 | -442/+52 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-05 | 1 | -2/+13 |
|\| | |||||
| * | [Bug] Fix compile issues for boards with custom matrix (#14323) | Drashna Jaelre | 2021-09-05 | 1 | -2/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-05 | 61 | -920/+0 |
|\| | |||||
| * | Remove empty override functions (#14312) | Ryan | 2021-09-05 | 61 | -920/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove empty override functions, 0-9 * Remove empty override functions, A-D * Remove empty override functions, E-H * Remove empty override functions, handwired * Remove empty override functions, I-L * Remove empty override functions, M-P * Remove empty override functions, Q-T * Remove empty override functions, U-Z | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 2 | -6/+0 |
|\| | |||||
| * | Remove more cruft in keyboard files (#14288) | Ryan | 2021-09-03 | 2 | -6/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 5 | -8/+13 |
|\| | |||||
| * | [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271) | Drashna Jaelre | 2021-09-01 | 5 | -8/+13 |
| | | |||||
* | | Change keyboard level include guards to `pragma once` (#14248) | Ryan | 2021-09-01 | 40 | -443/+333 |
| | | | | | | | | | | | | | | | | | | * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 1 | -22/+21 |
|\| | |||||
| * | [Keymap] reflects current rick's keymap (#14169) | Ibnu Daru Aji | 2021-08-31 | 1 | -22/+21 |
| | | |||||
* | | handwired/symmetric70_proto use post_rules.mk (#14235) | Takeshi ISHII | 2021-08-31 | 5 | -12/+2 |
|/ | |||||
* | [Keymap] Drashna keymap fixups (#14140) | Drashna Jaelre | 2021-08-24 | 3 | -7/+6 |
| | |||||
* | [Core] Refactor OLED to allow easy addition of other types (#13454) | Xelus22 | 2021-08-24 | 28 | -96/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> | ||||
* | [Keyboard] Fix compile issues for Tractyl Manuform (#14105) | Drashna Jaelre | 2021-08-21 | 4 | -7/+3 |
| | |||||
* | [Keymap] Drashna's Improve OLEDs and custom Split code (#14063) | Drashna Jaelre | 2021-08-21 | 17 | -189/+593 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fill the oleds with right mods * Enable double mods on x32 oleds * Disable forced NKRO * Make oleds fancy only on good MCUs * Overhaul oled display * Further enhance oled, with kitty! * Final oled form * Not working transport * Transport id of woring * Add acceleration * fix button placement for accel macro * Fix accelartion location and behavior * Remove OLED sync code * Fix alignment issue * Remove audio hack * Fix up zima keymap * Add matrix slave scan function and cleanup drashna.h * Clean up user space * Allow userspace sync to be disable-able * Fix weird issue with audio * Fix alignment issue with user split sync * Disable second rgb matrix task * Disable additional animations * Change dynamic keymap settings * Hacky fix for borked corne * Add Blackpill (F411) support to tractyl manuform * remove manual via eeprom reset * Remove all references to rgblight twinkle * Fix issues with config processing | ||||
* | Improve pmw3360 sensor and make it more hardware agnostic (#14097) | Drashna Jaelre | 2021-08-20 | 2 | -0/+6 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-08-19 | 11 | -1/+336 |
|\ | | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk | ||||
| * | [Keyboard] Add Elrgo S to keyboards/handwired (#13893) | Yaroslav Smirnov | 2021-08-19 | 8 | -0/+303 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keymap] Quark AJP10304 layout (#13290) | Alan Pocklington | 2021-08-19 | 3 | -1/+33 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-08-17 | 4 | -41/+29 |
|\| |