summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-298-0/+343
|\
| * [Keyboard] Added sandwich/keeb68 to keyboards (#15007)SandwichRising2022-01-288-0/+343
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2910-0/+254
|\|
| * [Keyboard] Add misterdeck 3d-printed handwired stream deck (#15556)Chris Broekema2022-01-2810-0/+254
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Adjust tap_code16 to account for TAP_HOLD_CAPS_DELAY (#15635)Ga682022-01-281-3/+6
| | | | | | Co-authored-by: Ga68 <github.ga68.e@grxme.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-294-42/+82
|\|
| * [Keymap] Further improvements to ifohancroft ErgoDox keymap (#15672)IFo Hancroft2022-01-284-42/+82
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-292-8/+0
|\|
| * [Keyboard] Fix Nasu Indicators (#15878)yiancar2022-01-282-8/+0
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2910-0/+323
|\|
| * [Keyboard] Add keyprez unicorn (#15998)Christian Sandven2022-01-2810-0/+323
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-291-1/+4
|\|
| * [Docs] Update Encoder docs about multiple encoders (#16036)Monksoffunk2022-01-281-1/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2920-23/+23
|\|
| * Remove missing and trailing commas in info.json files. (#16088)Gabriel Harel2022-01-2820-23/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2925-63/+533
|\|
| * [Keyboard] Adds Elongate Revision Delta PCB support (#15498)Álvaro A. Volpato2022-01-2825-63/+533
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-284-0/+149
|\|
| * [Keymap] Added personal 36 key layout for 40percentclub's nori (#15980)wyethGR2022-01-284-0/+149
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-1/+3
|\|
| * [Docs] OLED documentation edits (#15977)Albert Y2022-01-271-1/+3
| | | | | | | | | | * Clarify OLED_TIMEOUT * Add a section on logo file location
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2722-0/+764
|\|
| * Add support for Mode SeventyFive (#16030)Álvaro A. Volpato2022-01-2722-0/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial M75H support * Remove BSLS key * Add M75S initial support * Define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR to allow VIA * Add layer 1 for M75H * Add layer 1 for M75H * Fix layouts * Add BOOTLOADER and remove BOOTLOADER address from rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-272-29/+36
|\|
| * [Keyboard] fixed led_config: missing key, missing/wrong flags (#16048)p4yne2022-01-272-29/+36
| | | | | | | | | | | | | | | | | | | | | | * fixed ledmap: missing key, missing/wrong flags * Update keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * corrected c&p error user name in GPL header Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-3/+2
|\|
| * Fixes for slovak language-specific keycodes (#16019)KraXen722022-01-271-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-271-27/+28
|\|
| * [Keyboard] Fix compilation issues for creatkeebs thera (#16071)Drashna Jaelre2022-01-271-27/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-272-3/+2
|\|
| * Mehkee96 LED state & count + transposed keys fixes (#16061)Damien Guard2022-01-272-3/+2
| | | | | | | | | | | | | | | | | | * Fix transposed keys at top right of board. * Correct LED on state * Correct number of LEDs * Default LED state is fine
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2717-702/+682
|\|
| * Keychron QMK Configurator Refactor (#16034)James Young2022-01-2617-702/+682
| |
* | Deprecate split transactions status field (#16023)Stefan Kerkmann2022-01-267-91/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2717-503/+496
|\|
| * Krush65 Solder Refactor (#16065)James Young2022-01-2612-431/+344
| |
| * CK60: LAYOUT_60_iso compatibility (#16066)James Young2022-01-265-72/+152
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-278-0/+304
|\|
| * [Keyboard] Creatkeebs (#15766)Tim Liu2022-01-268-0/+304
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Remove unused suspend_idle (#16063)Joel Challis2022-01-264-30/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-261-2/+2
|\|
| * CU65: Fix VIA keymap (#16062)Ryan2022-01-261-2/+2
| |
* | Enable a default task throttle for split pointing. (#15925)Dasky2022-01-264-7/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2652-711/+639
|\|
| * Krush60 Solder Refactor (#16029)James Young2022-01-2652-711/+639
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * solder.h: add matrix diagram * solder.h: remove unnecessary comments * rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this. - denotes use of Split Backspace - move Backslash keycode to home row * info.json: remove trailing whitespace * info.json: clean up Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source). * solder.h: align positional arguments Helps me proof-read the layouts at a glance. No logic change. * fix syntax errors in keymaps * remove ISO layouts As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift. * rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`. * rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`. * rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`. * rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`. * rename keymaps based on layout macro used Making this easier to track in my head while I work on it. * info.json: fix syntax errors * rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs - renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs` - removes `layout_aliases` entry from `info.json` (creates incompatible data conflict) * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan` * info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry Causes an incompatible data conflict. * add second layer to 60_ansi keymap * update via keymap Now matches the behaviour of the default keymap. * fix syntax errors in keymaps, take 2 * add RGB and Navigation keycodes Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps.
* | More keyboard rules.mk cleanups (#16044)Ryan2022-01-2521-59/+28
| | | | | | | | | | * More keyboard rules.mk cleanups * Found a couple more
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-252-2/+2
|\|
| * [Keyboard] Fix orientation issues for Ploopy pointing devices (#16035)Drashna Jaelre2022-01-252-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-251-2/+3
|\|
| * Fix joystick button off-by-one error (#16037)Ryan2022-01-251-2/+3
| |