summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove legacy define USE_SERIAL_PD2 (#18298)Dasky2022-09-0750-94/+8
|
* Merge remote-tracking branch 'origin/master' into developJoshua Diamond2022-09-061-2/+28
|\
| * keymaps/stapelberg: keypad layer for multimedia keys, wake on escape (#18295)Michael Stapelberg2022-09-061-2/+28
| | | | | | This makes more keys function as printed on the actual keyboard :)
| * Fungo rev1: fix QMK Configurator key sequence (#18293)James Young2022-09-061-91/+77
| | | | | | | | | | * info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence
| * Discourage use of ENCODER_MAP at keyboard level (#18286)Joel Challis2022-09-062-1/+6
| | | | | | | | | | | | | | | | | | * Discourage use of ENCODER_MAP at keyboard level * Update docs/feature_encoders.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Resolve conflict merging master to develop (#18297)Joshua Diamond2022-09-063-92/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Discourage use of ENCODER_MAP at keyboard level (#18286) * Discourage use of ENCODER_MAP at keyboard level * Update docs/feature_encoders.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Fungo rev1: fix QMK Configurator key sequence (#18293) * info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Remove legacy USE_SERIAL define (#18292)Dasky2022-09-06276-966/+46
| | | | | | | | | | * Remove legacy USE_SERIAL define * tidy up missed comments
* | Remove `UNICODE_KEY_OSX` and `UC_OSX` (#18290)Ryan2022-09-0622-34/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-062-361/+436
|\|
| * Mars 6.5 Layout Additions (#18282)James Young2022-09-062-361/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * add LAYOUT_65_ansi_blocker * add LAYOUT_65_ansi_blocker_split_bs * add LAYOUT_65_iso_blocker * add LAYOUT_65_iso_blocker_split_bs * enable Community Layouts support * info.json: correct maintainer value
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-061-1/+1
|\|
| * Remove use of legacy keycode (#18281)Joel Challis2022-09-061-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-052-18/+27
|\|
| * EU ISOlation: fix QMK Configurator key sequence (#18272)James Young2022-09-052-18/+27
| | | | | | | | | | | | | | | | | | | | | | * eu_isolation.h: physically arrange layout macros Whitespace only; no logic changes. * info.json: apply friendly formatting Add line breaks between physical rows. * info.json: correct key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-055-22/+59
|\|
| * Fix compilation error for GH60 satan HHKB 7u layout (#18250)AMing Lau2022-09-055-22/+59
| | | | | | | | | | | | | | | | | | * Fix compilation error for GH60 satan HHKB 7u layout * Update keyboards/gh60/satan/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Rename keyboards with uppercase letters (#18268)Ryan2022-09-0429-21/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-033-4/+444
|\|
| * dyz60_hs Layout Additions (#18261)James Young2022-09-033-4/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dyz60_hs: add matrix diagram * add LAYOUT_60_ansi * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_iso * add LAYOUT_60_iso_split_bs_rshift * enable Community Layouts support * readme.md: correct keyboard references Replace `dyz60` with `dyz60_hs` as needed.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-033-3/+3
|\|
| * Fix a couple of boards still using `usb.device_ver` (#18258)Ryan2022-09-033-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-032-3/+3
|\|
| * Clean up data driven mappings syntax (#18257)Ryan2022-09-032-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-031-30/+43
|\|
| * [Docs] Update 'Process Record' according to the code (#18209)coliss862022-09-031-30/+43
| | | | | | | | | | * [doc] Update 'Process Record' according to the code * [doc] fix link
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0317-28/+168
|\|
| * [Keyboard] RS60 Rev2 change to eeprom emulation (#18201)Xelus222022-09-0317-28/+168
| | | | | | by xelus
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0311-0/+568
|\|
| * [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923)Vino Rodrigues2022-09-0311-0/+568
| | | | | | by vinorodrigues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-031-35/+35
|\|
| * Add absolute key positions to microdox info.json (#18238)Tim Traversy2022-09-031-35/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0358-72/+59
|\|
| * Remove more RESET keycode references (#18252)Joel Challis2022-09-0358-72/+59
| |
* | Adjust `EXTRAKEY_ENABLE` ifdefs for `send_extra()` (#18249)Ryan2022-09-024-8/+8
| |
* | Simplify extrakeys sending at the host driver level (#18230)Ryan2022-09-0212-149/+70
| | | | | | | | | | | | | | | | | | * Simplify extrakeys sending at the host driver level * There are two arguments here * Wrong syntax * Adjust keyboards which use a custom host driver
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-022-0/+0
|\|
| * [Keymap] Fixing location of my Keymap for the Gentleman65 (#18246)Brian2022-09-022-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-023-54/+60
|\|
| * [Keymap] Fix bootmagic compilation issue with Drashna keymaps (#18223)Drashna Jaelre2022-09-023-54/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0211-0/+354
|\|
| * [Keyboard] Add Lunakey Pico (#18202)Yoichiro Tanaka2022-09-0111-0/+354
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-028-0/+424
|\|
| * [Keyboard] Add Shoc Keyboard (#18143)Jannik Becker2022-09-018-0/+424
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Prevent USB peripheral fault when restarting USB on WB32 MCUs (#18058)Joy Lee2022-09-013-0/+10
| | | | | | Co-authored-by: Joy <chang.li@westberrytech.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-021-1/+1
|\|
| * Install correct package on Fedora (#18243)Joel Challis2022-09-011-1/+1
| |
* | Better handle EEPROM reset keycode (#18244)Drashna Jaelre2022-09-011-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0111-0/+725
|\|
| * [Keyboard] Add Ingrained Keyboard (#15928)jpuerto962022-09-0111-0/+725
| | | | | | | | | | | | | | 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> Co-authored-by: Juan Puerto <jpuerto@psc.edu> Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-012-11/+2
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 02:43:28 +0000