summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-111-12/+12
|\|
| * [Keyboard] Fix lck75 via keymap (#14786)Drashna Jaelre2021-10-111-12/+12
| |
* | Fix misplaced endif in led_matrix_drivers.c (#14785)Ryan2021-10-101-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-4/+17
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of Sweep (#14732)Albert Y2021-10-103-4/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-114-4/+11
|\|
| * [Keyboard] Add bootmagic lite keys to both halve of A.dux (#14731)Albert Y2021-10-104-4/+11
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1111-76/+425
|\|
| * [Keyboard] update lck75 keyboard layouts (#14687)im a can what do you think lmao?2021-10-1011-76/+425
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-0/+262
|\|
| * [Keymap] orthodox keymap for shaymdev (#14660)Shay Merrill2021-10-103-0/+262
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1110-0/+322
|\|
| * [Keyboard] Add keebsforall/freebirdtkl (#14460)KnoblesseOblige2021-10-1010-0/+322
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1122-25/+25
|\|
| * [Keyboard] nullbitsco keyboards: common file cleanup (#14358)Jay Greco2021-10-1022-25/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-119-0/+597
|\|
| * [Keyboard] Add firmware for the TS60 (#14157)Wolf Van Herreweghe2021-10-109-0/+597
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-113-0/+71
|\|
| * [Keyboad] Add VIA support for Atreus promicro (#13169)leonardusdipa2021-10-103-0/+71
| |
* | Clean up LED/RGB Matrix driver config (#14760)Ryan2021-10-1051-265/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-103-2/+8
|\|
| * Changing RGB default to on so it plays well with VIA's QMK lighting section ↵Kyle McCreery2021-10-103-2/+8
| | | | | | | | and adding the B9 init workaround to obe.c so the I2C EEPROM will initialize correctly since we are using B9 for caps lock indicator. (#14677)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-101-0/+16
|\|
| * cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782)Sergey Vlasov2021-10-111-0/+16
| |
* | Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780)Sergey Vlasov2021-10-104-8/+87
| | | | | | | | | | | | | | | | The custom OLED_OFF mode implemented on satisfaction75 is incompatible with the OLED_TIMEOUT feature (the OLED_TIMEOUT code assumes that any key or encoder action should turn the OLED display on, and does not provide any way to disable that behavior). To keep the OLED_OFF mode functioning as before while still having a working OLED idle timeout, a custom implementation of the OLED idle timeout code is added.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-101-12/+12
|\|
| * [Keyboard] Fix DZTECH duo_s default keymap (#14772)Drashna Jaelre2021-10-091-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-091-0/+64
|\|
| * Ein_60: add Configurator layout data (#14777)James Young2021-10-101-0/+64
| |
* | Fix OLED timeout on recent qwiic migrations (#14775)Joel Challis2021-10-102-13/+12
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-0912-57/+339
|\|
| * [Keyboard] Add cg108 keyboard and fix keymap Dosa40rgb (#14753)Dao Tak Isaac2021-10-0912-57/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add cg108 keyboard and fix keymap Dosa40rgb * Update keyboards/dtisaac/cg108/readme.md * Update keyboards/dtisaac/dosa40rgb/rules.mk * Update keyboards/dtisaac/cg108/info.json * Update keyboards/dtisaac/cg108/keymaps/default/keymap.c * Update keyboards/dtisaac/cg108/rules.mk * Update keyboards/dtisaac/cg108/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-091-32/+33
|\|
| * Update Japanese document (#14766)shela2021-10-091-32/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-092-7/+8
|\|
| * Update Japanese document (#14767)shela2021-10-091-3/+4
| |
| * Update Japanese document (#14769)shela2021-10-091-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-096-165/+56
|\|
| * [Keyboard] Update Tractyl Manuform config for F411 (#14770)Drashna Jaelre2021-10-096-169/+58
| |
* | Remove QWIIC_DRIVERS (#14174)Joel Challis2021-10-0910-783/+1
| |
* | Migrate satisfaction75 away from QWIIC_DRIVERS (#14747)Joel Challis2021-10-096-299/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | * stash * refactor old draw * refactor old draw - tidy * refactor old draw - tidy * refactor old draw - reorder for diffs * refactor old draw - reorder for diffs
* | Enable eeprom with F401xE ld (#14752)Dasky2021-10-083-4/+89
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-081-1/+5
|\|
| * [Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb (#14755)Drashna Jaelre2021-10-081-1/+5
| |
* | Improve Adafruit BLE configuration defines (#14749)Ryan2021-10-089-50/+26
| | | | | | | | | | * Improve Adafruit BLE configuration defines * Formatting
* | Put back eeconfig_update_ functions (#14751)Joel Challis2021-10-082-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-081-0/+41
|\|
| * Translate keycodes us ansi shifted (#13820)s-show2021-10-081-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * copy "keycodes_us_ansi_shifted.md" to docs/ja. * Add japanese translation "docs/keycodes_us_ansi_shifted.md". * Apply suggestions from code review Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/keycodes_us_ansi_shifted.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-083-22/+136
|\|
| * dyz selka40 touch-up (#14748)James Young2021-10-073-22/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * friendly-format info.json * remove info.json rounding errors * fix info.json layout macro reference JSON data referenced `LAYOUT` instead of `LAYOUT_all`. * correct info.json key sequence * remove dead space from info.json layout data * remove vertical offsets from info.json layout data * horizontally align info.json layout data * add matrix diagram to selka40.h * add LAYOUT_2u_bs * remove duplicated settings