summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782)Sergey Vlasov
2021-10-10Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780)Sergey Vlasov
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.
2021-10-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-09[Keyboard] Fix DZTECH duo_s default keymap (#14772)Drashna Jaelre
2021-10-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-10Ein_60: add Configurator layout data (#14777)James Young
2021-10-10Fix OLED timeout on recent qwiic migrations (#14775)Joel Challis
2021-10-09Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-09[Keyboard] Add cg108 keyboard and fix keymap Dosa40rgb (#14753)Dao Tak Isaac
* 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
2021-10-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-09Update Japanese document (#14766)shela
2021-10-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-09Update Japanese document (#14767)shela
2021-10-09Update Japanese document (#14769)shela
2021-10-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-09[Keyboard] Update Tractyl Manuform config for F411 (#14770)Drashna Jaelre
2021-10-09Remove QWIIC_DRIVERS (#14174)Joel Challis
2021-10-09Migrate satisfaction75 away from QWIIC_DRIVERS (#14747)Joel Challis
* stash * refactor old draw * refactor old draw - tidy * refactor old draw - tidy * refactor old draw - reorder for diffs * refactor old draw - reorder for diffs
2021-10-08Enable eeprom with F401xE ld (#14752)Dasky
2021-10-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-08[Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb (#14755)Drashna Jaelre
2021-10-08Improve Adafruit BLE configuration defines (#14749)Ryan
* Improve Adafruit BLE configuration defines * Formatting
2021-10-08Put back eeconfig_update_ functions (#14751)Joel Challis
2021-10-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-08Translate keycodes us ansi shifted (#13820)s-show
* 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>
2021-10-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07dyz selka40 touch-up (#14748)James Young
* 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
2021-10-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07DYZ TKL touch-up (#14744)James Young
* friendly-format info.json * add LAYOUT_all layout data * add matrix diagram to dyz_tkl.h * add LAYOUT_tkl_ansi * add LAYOUT_tkl_ansi_f13 * add LAYOUT_tkl_iso * add LAYOUT_tkl_iso_f13 * remove `ENCODER_ENABLE = no` from rules.mk * remove redundant definitions from config.h Data-driven compilation calculates `MATRIX_ROWS` and `MATRIX_COLS` from the info.json data, so defining them in config.h isn't necessary. * add missing comma to info.json per fauxpark
2021-10-07Move converter specific tmk_core protocols (#14743)Joel Challis
2021-10-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07Dyz60 touch-up (#14742)James Young
* friendly-format info.json * refactor keymaps - update grid alignment - use four-space indent - use QMK short-form keycodes * correct info.json layout data Adds three missing positions, and corrects some key sizes. * add matrix diagram to dyz60.h * add LAYOUT_60_ansi * add LAYOUT_60_iso * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_iso_split_bs_rshift * add readme * Remove duplication between config.h and info.json Duplicating settings between config.h and info.json leads to warnings when compiling. Removes the duplicated settings from config.h.
2021-10-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07Fix link from feature_tap_dance.md to tapping term settings (#14741)precondition
2021-10-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07Dyz40 Configurator fixes (#14739)James Young
* add matrix diagram to keyboard header file * friendly-format info.json * correct layout data * add legends to info.json key labels * add LAYOUT_split_space_split_bs Rename the `LAYOUT` tree in info.json to `LAYOUT_split_space_split_bs`, and add a corresponding layout macro. * add LAYOUT_all data to info.json * add LAYOUT_7u_space * add LAYOUT_7u_space_split_bs * add LAYOUT_split_space * convert tabs to spaces in dyz40.h
2021-10-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07update product id for selka40 (#14629)Bahrul Hidayat
2021-10-07Correct the Turkish F '?' keycode (TR_QUES) (#14740)precondition
define TR_QUES S(TR_ASTR) // ? → define TR_QUES S(TR_SLSH) // ?
2021-10-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-07Enabled Bootmagic Lite (#14573)jmcwilliams403
* Enabled Bootmagic Lite * Enabled Bootmagic Lite Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2021-10-07Remove SERIAL_LINK feature (#14727)Joel Challis
* Remove SERIAL_LINK * more stale paths in doxygen-todo * Fix * More refs * Update testing docs * Update doxygen-todo Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-07Reuse of EEPROM debounce logic (#14699)Joel Challis
* reuse rgb debounce logic * Refactor led matrix * Remove log line * timeout should not be hard coded
2021-10-07Fix i2c_readReg16 (#14730)Joel Challis
2021-10-07Purge uGFX. (#14720)Nick Brassel
* Purge uGFX. * Remove remnants of visualizer. * Remove remnants of uGFX.
2021-10-07i2c_master: Add support for reading/writing to 16-bit registers (#14289)Ryan
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-06Updated Keychron Q1 user keymap (#14666)Grayson Carr
* Updated Keychron Q1 user keymap - Added Caps Lock indicator - Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA * Only use VIA keycode range if VIA is enabled * Reformatted led_indexes enum to match layout * Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned * Fixes * Cleanup: Updated method signature of rgb_matrix_set_color_by_keycode to more closely match rgb_matrix_set_color * Fixed int sizing for keycodes
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot