summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-098-69/+102
|\
| * Add via support for 6key (#18082)Jacqueline Liang2022-09-098-69/+102
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-092-118/+118
|\|
| * Hillside 46 & 52: remove dead space from QMK Configurator renderings (#18315)James Young2022-09-092-118/+118
| | | | | | | | | | | | | | * Hillside 46 info.json: fix syntax error * Hillside 46 info.json: remove dead space * Hillside 52 info.json: remove dead space
* | Add Elite-Pi converter (#18236)Danny2022-09-086-3/+58
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-076-0/+281
|\|
| * Add Iris Rev. 6b (#18307)Danny2022-09-076-0/+281
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-074-60/+424
|\|
| * GeonWorks Frog Mini Hotswap Layout Rework (#18305)James Young2022-09-074-60/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fmh.h: add matrix diagram * info.json: apply friendly formatting * physically arrange LAYOUT_all macro Move position `K5D` (right half of Split Backspace) to the end of the top row. * rename LAYOUT_all to LAYOUT_60_tsangan_hhkb * add LAYOUT_60_ansi_tsangan * add LAYOUT_60_hhkb * add LAYOUT_60_ansi_wkl * add LAYOUT_60_ansi_wkl_split_bs_rshift * enable Community Layouts support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-074-66/+5
|\|
| * Update Iris VIA configuration (#18306)Danny2022-09-074-66/+5
| | | | | | | | | | | | | | * Update RGB matrix max brightness * Remove old VIA workaround code * Fix default encoder rotations for encoder map
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-071-1/+1
|\|
| * [Keyboard] Wearhaus66 correct matrix (#18284)mechlovin2022-09-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-072-1/+23
|\|
| * enable RGB matrix effects for drop ctrl (#18291)David Luo2022-09-072-1/+23
| |
* | Move Bluetooth-related function calls up to host/keyboard level (#18274)Ryan2022-09-076-64/+61
| | | | | | | | | | | | | | | | | | | | | | * Move Bluetooth-related function calls up to host/keyboard level * Remove pointless set_output() call * Move bluetooth (rn42) init to end of keyboard_init() * Enable SPI/UART for ChibiOS targets * Some more slight tweaks
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-071-2/+1
|\|
| * [Keymap] removed else in numlock led if statement (#18304)syntax-magic2022-09-071-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-072-0/+336
|\|
| * added a new kprepublic/bm40hsrgb keymap called dan (#18301)syntax-magic2022-09-072-0/+336
| | | | | | by syntax-magic
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-073-157/+0
|\|
| * Delete my keymaps (#18302)ddeklerk2022-09-073-157/+0
| |
* | Remove legacy define SERIAL_USE_MULTI_TRANSACTION (#18299)Dasky2022-09-078-8/+0
| |
* | 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