summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-084-20/+611
|\|
| * DYZ TKL touch-up (#14744)James Young2021-10-074-20/+611
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Move converter specific tmk_core protocols (#14743)Joel Challis2021-10-079-2/+1552
| |
* | 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-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
| |
* | 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-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Purge uGFX. (#14720)Nick Brassel2021-10-0711-786/+1
| | | | | | | | | | | | | | * Purge uGFX. * Remove remnants of visualizer. * Remove remnants of uGFX.
* | 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.
* | 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-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-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-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-045-0/+227
|\|
| * [Keyboard] Add Iris Rev. 6 (#14683)Danny2021-10-035-0/+227
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-032-35/+36
|\|
| * [Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680)Drashna Jaelre2021-10-031-34/+35
| |
| * [Keyboard] Disable RGBLIGHT on mokey64 (#14681)Drashna Jaelre2021-10-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-031-0/+3
|\|
| * [Keyboard] Add anti-ghosting support to Model M Converter (#14049)tiltowait2021-10-031-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-031-4/+4
|\|
| * [Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589)Christian Sandven2021-10-031-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0212-0/+558
|\|
| * [Keyboard] Adding kbnordic nordic60 (#14555)4pplet2021-10-0212-0/+558
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0214-0/+707
|\|
| * [Keyboard] Add JP60 keyboard (#14219)ai032021-10-0214-0/+707
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0218-25/+789
|\|
| * [Keyboard] Add Olly BB PCB (#14545)mechlovin2021-10-0212-0/+754
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Modify mokey64 (#14612)rhmokey2021-10-026-25/+35
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-026-144/+851
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 16:22:59 +0000