summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-076-83/+494
|\
| * Dyz60 touch-up (#14742)James Young2021-10-076-83/+494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-071-1/+1
|\|
| * Fix link from feature_tap_dance.md to tapping term settings (#14741)precondition2021-10-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-072-7/+322
|\|
| * Dyz40 Configurator fixes (#14739)James Young2021-10-072-7/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-071-1/+1
|\|
| * update product id for selka40 (#14629)Bahrul Hidayat2021-10-071-1/+1
| |
* | Correct the Turkish F '?' keycode (TR_QUES) (#14740)precondition2021-10-071-1/+1
| | | | | | define TR_QUES S(TR_ASTR) // ? → define TR_QUES S(TR_SLSH) // ?
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-071-1/+1
|\|
| * Enabled Bootmagic Lite (#14573)jmcwilliams4032021-10-071-1/+1
| | | | | | | | | | | | | | | | | | * Enabled Bootmagic Lite * Enabled Bootmagic Lite Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Remove SERIAL_LINK feature (#14727)Joel Challis2021-10-0736-2252/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Reuse of EEPROM debounce logic (#14699)Joel Challis2021-10-073-44/+46
| | | | | | | | | | | | | | | | | | * reuse rgb debounce logic * Refactor led matrix * Remove log line * timeout should not be hard coded
* | Fix i2c_readReg16 (#14730)Joel Challis2021-10-071-1/+1
| |
* | Purge uGFX. (#14720)Nick Brassel2021-10-0766-3897/+2
| | | | | | | | | | | | | | * Purge uGFX. * Remove remnants of visualizer. * Remove remnants of uGFX.
* | i2c_master: Add support for reading/writing to 16-bit registers (#14289)Ryan2021-10-075-3/+130
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-067-11/+169
|\|
| * Updated Keychron Q1 user keymap (#14666)Grayson Carr2021-10-067-11/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-062-4/+89
|\|
| * Mode M65S touch-up (#14722)James Young2021-10-062-4/+89
| | | | | | | | | | | | | | | | | | | | | | * add Configurator data * rename README.md to lowercase API can't find this file unless the filename is lowercase (`readme.md`). * readme touch-up Correct typos and improve some grammar and Markdown.
* | Remove sysex API (#14723)Ryan2021-10-0614-425/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-175/+175
|\|
| * MelGeek Mach80: correct Configurator layout (#14716)James Young2021-10-051-175/+175
| | | | | | Adds a 0.5u gap between the top two rows.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-2/+2
|\|
| * Added semicolons to rules.mk to allow symlinks from /bin/sh to /bin/zsh to ↵remanifest2021-10-061-2/+2
| | | | | | | | | | complete the filesize check without error. (#14718) Co-authored-by: John Beard <jbeard@pipelinerx.com>
* | Move Audio drivers from quantum to platform drivers folder (#14308)Drashna Jaelre2021-10-0610-10/+5
| | | | | | | | | | | | | | | | | | * Move Audio drivers from quantum to platform drivers folder * fix path for audio drivers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-3/+3
|\|
| * [Bug] Fix command feature if mousekey is enabled and using 3-speed setting ↵Drashna Jaelre2021-10-051-3/+3
| | | | | | | | (#14697)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-069-31/+385
|\|
| * [Keyboard] Add basic Keyhive Sofle support (#14296)Drashna Jaelre2021-10-059-31/+385
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0515-55/+68
|\|
| * [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-0515-55/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-055-16/+19
|\|
| * 0xc7/61key touch-up (#14712)James Young2021-10-055-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | * correct Configurator layout data * rename LAYOUT to LAYOUT_60_ansi * correct info.json maintainer field Use the maintainer's GitHub username. * correct the compiling/flashing instructions Keyboard value is relative to `qmk_firmware/keyboards/`.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-16/+16
|\|
| * Durgod DGK6X Galaxy: correct Configurator layout (#14714)James Young2021-10-051-16/+16
| | | | | | Top row had a y-value of 1, which placed it behind the number row when rendered.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-13/+21
|\|
| * More PR checklist updates (#14705)Nick Brassel2021-10-061-13/+21
| | | | | | | | | | | | | | | | | | * Wording, clarification. * Apply suggestions from code review Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-0/+22
|\|
| * Add clarification for licensing. (#14704)Nick Brassel2021-10-051-0/+22
| | | | | | | | | | * Add clarification for licensing. * Errr, v2.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-052-8/+8
|\|
| * [Keyboard] Update Iris default keymap (#14701)Danny2021-10-042-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-058-0/+227
|\|
| * [Keyboard] Added DC MC 001 (#14661)Daniel Cormier2021-10-048-0/+227
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-059-0/+269
|\|
| * [Keyboard] add dztech duo_s keyboard (#14625)moyi46812021-10-049-0/+269
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-041-0/+74
|\|
| * Document examples on intercepting Mod-Tap (#14502)Albert Y2021-10-041-0/+74
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-044-31/+21
|\|
| * Allow community layouts to be specified in info.json (#14682)Zach White2021-10-044-31/+21
| | | | | | | | | | * move the community layout detection to python * fixup tests
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 04:06:50 +0000