summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-291-1/+3
|\
| * Redefinition of MIN is avoided in midi.c (#18203)3araht2022-08-291-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-299-0/+362
|\|
| * [Keyboard] Add sinanju WK (#17736)Felix Jen2022-08-299-0/+362
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2918-0/+717
|\|
| * [Keyboard] Add Peaker keyboard (#17920)Felix Jen2022-08-299-0/+364
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Trailblazer Avalon (#17568)Felix Jen2022-08-299-0/+353
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-291-0/+107
|\|
| * [Keymap] Add csolje 42 keymap for the cantor (#18125)Christian Solje2022-08-291-0/+107
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Christian Solje <csolje@gn.com>
* | Fix incorrect `bluetooth.driver` rules.mk mapping (#18205)Ryan2022-08-292-3/+2
| |
* | [Core] Introduce pointing device specific debug messages (#17663)Stefan Kerkmann2022-08-299-59/+50
| |
* | Use `TAP_CODE_DELAY` for encoder mapping by default (#18098)Nick Brassel2022-08-282-4/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2925-1/+1243
|\|
| * [Keyboard] Add handwired Split 5x7 (#18128)Stefan2022-08-2817-0/+699
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add Nearfield, fix typo in Le Chiffre Readme (#17914)TJ2022-08-288-1/+544
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-297-110/+116
|\|
| * [Keyboard] Update dynamis keyboard (#17625)bbrfkr2022-08-287-110/+116
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-296-0/+133
|\|
| * [Keyboard] Add chord/zero (#18190)Simon Hengel2022-08-286-0/+133
| |
* | Fix mouse report comparison failing on shared EP (#18060)Drzony2022-08-281-5/+3
| | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-291-1/+1
|\|
| * Swap KC_VOLD and KC_VOLU on GMMK2 to correct places (#18193)NGatti19972022-08-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-293-1/+21
|\|
| * Expose Moonlander split detection to user code (#18040)biesigrr2022-08-293-1/+21
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-291-1/+1
|\|
| * Update junonum keymap: add AG_NORM recovery (#18170)Juno Nguyen2022-08-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-284-0/+109
|\|
| * Add an ez_maker directpins for rp2040 (#17908)Jeff Epler2022-08-284-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add an ez_maker directpins for rp2040 This allows all exposed pins on the Raspberry Pi Pico to be used as up to 26 individual keys. Keys use a common ground arrangement. The firmware is also expected to work on generic RP2040 boards, check manufacturer pinout diagrams or use trial and error to find out the GP#s of the pins. * Update keyboards/ez_maker/directpins/rp2040/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Changes based on review comments Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-282-0/+42
|\|
| * [Keymap] Add Miryoku keymap for Hillside 48 (#18191)Davide Masserut2022-08-282-0/+42
| |
* | Remove deprecated USBasp and bootloadHID bootloader types (#18195)Ryan2022-08-283-6/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2832-295/+714
|\|
| * [Keymap] Drashna keymap updates for 0.18.0 (#18184)Drashna Jaelre2022-08-2832-295/+714
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | kegen/gboy: add manufacturer string (#18196)Ryan2022-08-281-1/+2
| |
* | Handle escaping of manufacturer/product strings (#18194)Ryan2022-08-285-2/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-283-14/+35
|\|
| * Clean up schema syntax (#18192)Ryan2022-08-283-14/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2842-509/+501
|\|
| * [Keyboard] mechwild/bde cleanup and refactor (#18149)Less/Rikki2022-08-2842-509/+501
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-289-0/+391
|\|
| * [Keyboard] Add Kegen G-Boy (#18048)Matt Chan2022-08-289-0/+391
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2811-69/+56
|\|
| * More spidey3 userspace cleanup (#18049)Joshua Diamond2022-08-2811-69/+56
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-281-1/+2
|\|
| * Exclude uf2 files in VS Code (#18186)Albert Y2022-08-281-1/+2
| |
* | Switch over MANUFACTURER and PRODUCT to string literals (#18183)Ryan2022-08-2863-928/+113
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2821-101/+142
|\|
| * Clean-up of `#define _ADJUST 16` instances (#18182)James Young2022-08-2721-101/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enum layer_names: 40percentclub/nori default keymap * enum layer_names: ergotravel default keymap * enum layer_names: handwired/atreus50 default keymap * enum layer_names: handwired/ortho5x13 default keymap * enum layer_names: keebio/levinson default keymap * enum layer_names: keebio/nyquist default keymap * enum layer_names: keebio/rorschach default keymap * enum layer_names: keebio/viterbi default keymap * enum layer_names: keebio/wavelet default keymap * enum layer_names: lets_split default keymap * enum layer_names: maple_computing/launchpad reference keymaps Update `default` and `default_rgb` keymaps. * enum layer_names: maple_computing/minidox default keymap * enum layer_names: miniaxe reference keymaps Update `default` and `underglow` keymaps. * enum layer_names: omkbd/ergodash/mini default keymap * enum layer_names: omkbd/ergodash/rev1 default keymap * enum layer_names: orthodox default keymap * enum layer_names: unikeyboard/divergetm2 default keymap * enum layer_names: woodkeys/scarletbandana default keymap * add _Static_assert to keymap_introspection.c
* | Branch point for 2022 Nov 26 Breaking ChangeNick Brassel2022-08-281-0/+4
|/
* Merge remote-tracking branch 'upstream/develop'Nick Brassel2022-08-284323-19813/+42712
|\