Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 38 | -0/+1569 |
|\ | |||||
| * | kin80 (#16754) | Dmitry Nosachev | 2022-04-19 | 38 | -0/+1569 |
| | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | [CI] Format code according to conventions (#16888) | QMK Bot | 2022-04-19 | 1 | -3/+3 |
| | | |||||
* | | Update wb32-dfu (#16438) | Joy Lee | 2022-04-19 | 3 | -1/+53 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 4 | -0/+302 |
|\| | |||||
| * | Dactyl manuform 5x6 5 via (#16741) | LegoWolf | 2022-04-19 | 4 | -0/+302 |
| | | |||||
* | | Add hacky via support for RGB Matrix (#16086) | Drashna Jaelre | 2022-04-19 | 2 | -4/+105 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 11 | -0/+1920 |
|\| | |||||
| * | New custom keymap for Glorious GMMK Pro ANSI layout (#16199) | gourdo1 | 2022-04-19 | 11 | -0/+1920 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 14 | -219/+282 |
|\| | |||||
| * | boardsource/microdox V2 (#16569) | jack | 2022-04-19 | 14 | -219/+282 |
| | | |||||
* | | Fixes #16705 : digital rain follows val (#16716) | KoenGoe | 2022-04-19 | 1 | -7/+15 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 13 | -9/+96 |
|\| | |||||
| * | Fix broken build for users/curry (#16492) | Allen Choi | 2022-04-19 | 13 | -9/+96 |
| | | |||||
* | | [Core] Use a mutex guard for split shared memory (#16647) | Stefan Kerkmann | 2022-04-19 | 6 | -20/+82 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 7 | -0/+308 |
|\| | |||||
| * | Add initial support for the Makey Makey Classic (#16658) | jpe230 | 2022-04-19 | 7 | -0/+308 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 15 | -0/+321 |
|\| | |||||
| * | [Keyboard] New kbd 1k (#15509) | MakotoKurauchi | 2022-04-19 | 15 | -0/+321 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 4 | -0/+312 |
|\| | |||||
| * | Add my planck layout (#13143) | Abhinav | 2022-04-19 | 4 | -0/+312 |
| | | | | | | | | | | | | | | | | | | * Add my planck layout * Add copyright * Address requested changes * Fix dipswitch return type | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 13 | -0/+676 |
|\| | |||||
| * | [Keymap] A Colemak keymap for the crkbd keyboard (#16550) | Álvaro Cortés | 2022-04-19 | 13 | -0/+676 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 2 | -28/+140 |
|\| | |||||
| * | Change helix:yshrsmz keymap to use split_common (#16537) | Takeshi ISHII | 2022-04-19 | 2 | -28/+140 |
| | | |||||
* | | Add support for multiple sensors to pmw3360 (#15996) | uqs | 2022-04-19 | 4 | -84/+123 |
| | | |||||
* | | move keyhive exclusive boards into /keyhive (#16084) | peepeetee | 2022-04-19 | 148 | -19/+19 |
| | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | move 麦田 boards into /mt (#16095) | peepeetee | 2022-04-19 | 59 | -9/+9 |
| | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | move z150_bh at101_bh omnikey_bh to viktus/ (#16004) | peepeetee | 2022-04-19 | 22 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 27 | -0/+799 |
|\| | |||||
| * | [Keyboard] Add Amber80 Solder & VCL65 Solder (#15945) | Sắn | 2022-04-18 | 27 | -0/+799 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Keymap] Add andrewcharnley keymap for GMMK Pro (#15320) | Andrew Charnley | 2022-04-18 | 3 | -0/+129 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-19 | 4 | -5/+90 |
|\| | |||||
| * | [Keyboard] Add converter/a1200/mistress1200 variant (#16634) | 8bits4ever | 2022-04-18 | 4 | -5/+90 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 3 | -37/+7 |
|\| | |||||
| * | [Keyboard] Fix resume1800 - Dynamic layer count undefined (#16877) | jack | 2022-04-18 | 3 | -37/+7 |
| | | |||||
* | | Preinstall python dependencies before executing `qmk`. (#16874) | Nick Brassel | 2022-04-18 | 1 | -1/+3 |
| | | |||||
* | | Fixup AVR builds. (#16875) | Nick Brassel | 2022-04-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | * Fixup AVR builds. * Update platforms/avr/hardware_id.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Expose API for hardware unique ID (#16869) | Joel Challis | 2022-04-18 | 7 | -0/+93 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 11 | -0/+486 |
|\| | |||||
| * | [Keyboard] Add CrimsonKeyboards' Resume1800 (#16842) | DeeDesired | 2022-04-18 | 11 | -0/+486 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 10 | -114/+10 |
|\| | |||||
| * | [Keyboard] sandbox - fix keymaps (#16873) | jack | 2022-04-18 | 10 | -114/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 10 | -0/+578 |
|\| | |||||
| * | [Keyboard] Add deskpad (#15602) | Md. Mashur Shalehin Sakib | 2022-04-18 | 10 | -0/+578 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Fix one-shot locked modifiers (#16114) | Denis Savran | 2022-04-18 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | * Fix state updates of one-shot locked modifiers Activating additional one-shot locked modifiers removed previously enabled locked modifiers from the state. `get_oneshot_locked_mods` returned zero when two or more one-shot locked modifiers were enabled and then one was disabled. * Do not delete one-shot locked modifiers on a one-shot layer toggle Non-locked one-shot modifiers are not removed so this behavior adds inconsistency. Also the one-shot locked modifiers state was reset without unregistering any modifiers. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 1 | -3/+10 |
|\| | |||||
| * | Ploopy Trackball Mini: only define DPI options as needed (#16160) | alaviss | 2022-04-18 | 1 | -3/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-04-18 | 19 | -0/+785 |
|\| | |||||
| * | [Keyboard] Add the Ciel (#16816) | Ramon Imbao | 2022-04-18 | 10 | -0/+538 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> |