summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
|\|
| * Remove non promicro pins from converters (#18239)Joel Challis2022-09-012-11/+2
| |
* | Add unicode mode change callbacks (#18235)Joshua Diamond2022-08-316-28/+63
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3139-0/+5283
|\|
| * Add giabalanai keyboard (#10125)3araht2022-08-3139-0/+5283
| | | | | | by 3araht
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-319-0/+622
|\|
| * Added personal Iris Rev6a layout and Milk 2% layout (#17600)Ryan Neff2022-08-319-0/+622
| | | | | | by JellyTitan
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-312-0/+65
|\|
| * Add bepo variant to massdrop/thekey keymaps (#18129)Benjamin Collet2022-08-312-0/+65
| | | | | | by mrBen
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3112-90/+76
|\|
| * Bandominedoni encoder fix (#18229)3araht2022-08-3112-90/+76
| | | | | | by 3araht
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3121-156/+84
|\|
| * [Keyboard] Updates to Work Louder keyboards (#18232)Drashna Jaelre2022-08-3121-156/+84
| | | | | | | | by Drashna
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3112-0/+726
|\|
| * [Keyboard] add tg67 (#18225)JX2022-08-3112-0/+726
| |
* | Ensure all keyboards have a bootloader set (#18234)Ryan2022-08-3115-5/+16
| |
* | Move bootloader.mk to platforms (#18228)Ryan2022-08-3111-100/+180
| |
* | [Core] Rework PS/2 driver selection (#17892)Marek Kraus2022-08-3126-60/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Core] Rework PS/2 driver selection Enabling and selecting PS/2 driver was using old approach, so it was reworked to current approach, inspired by Serial and WS2812 driver selections. * [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection * [Docs] Update PS/2 documentation to use new PS/2 driver selection * Fix indentation * [Core] Add PS2 to data driver * Fix oversight in property name Co-authored-by: Drashna Jaelre <drashna@live.com> * Add PS/2 pins to data driven mappings Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-311-1/+1
|\|
| * `qmk lint`: fix TypeError (#18226)Ryan2022-08-311-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3012-0/+403
|\|
| * [Keyboard] CannonKeys Malicious Ergo (#17076)Andrew Kannan2022-08-3012-0/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Malicious Ergo keyboard to QMK * Update layout * update info.json * update info.json again * Update info.json again * i h8 info.json * its default not all * Update keyboards/cannonkeys/malicious_ergo/config.h * Add bootloader instructions and license header * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/readme.md * Remove rotation from info.json * Remove labels * Update keyboards/cannonkeys/malicious_ergo/readme.md * Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h * Revise info.json again * whitespace fix * Apply suggestions from code review Move pid/vid into info json Fix rounding errors in info json Thanks to fauxpark and noroadsleft!
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3026-0/+893
|\|
| * [Keyboard] Add NK65B (#18211)yiancar2022-08-3013-0/+441
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
| * [Keyboard] Add NK87B (#18210)yiancar2022-08-3013-0/+452
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-301-2/+2
|\|
| * [Keyboard] Fix layout macro for Cannonkeys Atlas keyboard (#18216)Drashna Jaelre2022-08-301-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-301-1/+0
|\|
| * fix boardsource/lulu (#18217)jack2022-08-301-1/+0
| |
* | Use a macro to compute the size of arrays at compile time (#18044)Jeff Epler2022-08-3091-165/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ARRAY_SIZE and CEILING utility macros * Apply a coccinelle patch to use ARRAY_SIZE * fix up some straggling items * Fix 'make test:secure' * Enhance ARRAY_SIZE macro to reject acting on pointers The previous definition would not produce a diagnostic for ``` int *p; size_t num_elem = ARRAY_SIZE(p) ``` but the new one will. * explicitly get definition of ARRAY_SIZE * Convert to ARRAY_SIZE when const is involved The following spatch finds additional instances where the array is const and the division is by the size of the type, not the size of the first element: ``` @ rule5a using "empty.iso" @ type T; const T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) @ rule6a using "empty.iso" @ type T; const T[] E; @@ - sizeof(E)/sizeof(T) + ARRAY_SIZE(E) ``` * New instances of ARRAY_SIZE added since initial spatch run * Use `ARRAY_SIZE` in docs (found by grep) * Manually use ARRAY_SIZE hs_set is expected to be the same size as uint16_t, though it's made of two 8-bit integers * Just like char, sizeof(uint8_t) is guaranteed to be 1 This is at least true on any plausible system where qmk is actually used. Per my understanding it's universally true, assuming that uint8_t exists: https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1 * Run qmk-format on core C files touched in this branch Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-301-6/+16
|\|
| * Expand on the differences between Caps Word and Caps Lock (#18139)precondition2022-08-301-6/+16
| | | | | | | | | | | | | | * Expand on the differences between Caps Word and Caps Lock * Add the equiv default KC_ next to intl alias * It's configurable so it's not a problem
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3011-21/+81
|\|
| * Add boardsource/lulu RP2040 support (#18200)jack2022-08-3011-21/+81
| | | | | | by waffle87
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3020-503/+600
|\|
| * [Keyboard] Kangaroo Rev2 (#18199)Xelus222022-08-2914-28/+118
| |
| * [Keyboard] jacky_studio/piggy60 refactor (#18197)Less/Rikki2022-08-296-475/+482
| |
* | 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
| |