summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1927-0/+799
|\
| * [Keyboard] Add Amber80 Solder & VCL65 Solder (#15945)Sắn2022-04-1827-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 Charnley2022-04-183-0/+129
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-194-5/+90
|\|
| * [Keyboard] Add converter/a1200/mistress1200 variant (#16634)8bits4ever2022-04-184-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 developQMK Bot2022-04-183-37/+7
|\|
| * [Keyboard] Fix resume1800 - Dynamic layer count undefined (#16877)jack2022-04-183-37/+7
| |
* | Expose API for hardware unique ID (#16869)Joel Challis2022-04-181-0/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1811-0/+486
|\|
| * [Keyboard] Add CrimsonKeyboards' Resume1800 (#16842)DeeDesired2022-04-1811-0/+486
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1810-114/+10
|\|
| * [Keyboard] sandbox - fix keymaps (#16873)jack2022-04-1810-114/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1810-0/+578
|\|
| * [Keyboard] Add deskpad (#15602)Md. Mashur Shalehin Sakib2022-04-1810-0/+578
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-181-3/+10
|\|
| * Ploopy Trackball Mini: only define DPI options as needed (#16160)alaviss2022-04-181-3/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1819-0/+785
|\|
| * [Keyboard] Add the Ciel (#16816)Ramon Imbao2022-04-1810-0/+538
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add digicarpice (#16791)Brandon Claveria2022-04-189-0/+247
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: swiftrax <swiftrax@github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1824-59/+712
|\|
| * [Keyboard] SharkPCB release Beta compatibility (#16713)Álvaro A. Volpato2022-04-1824-59/+712
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1828-0/+762
|\|
| * [Keyboard] Add sandbox keyboard (#16021)yfuku2022-04-1828-0/+762
| | | | | | | | | | Co-authored-by: precondition <57645186+precondition@users.noreply.github.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-04-1713-503/+211
|\|
| * Anne Pro 2 Refactor (#16864)James Young2022-04-1713-503/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move RGB Matrix rules to keyboard level * move PERMISSIVE_HOLD config to keyboard level * annepro2.c: convert tabs to spaces * refactor rules.mk files Reformats each version's `rules.mk` file to be arranged more similarly to those of the rest of the keyboards in QMK. No logic change. * annepro2.c: allow compilation without RGB Matrix Wraps the `led_enabled` definition and the `KC_AP_RGB_*` keycodes in `#ifdef RGB_MATRIX_ENABLE`, allowing successful compilation if the user sets `RGB_MATRIX_ENABLE = no`. * rework readme files Reworks the main `readme.md` file to be more friendly to GitHub viewing, and removes the single-line version-specific readme files (exposes the main readme to QMK Configurator users). * info.json: update maintainer value * info.json: apply friendly formatting
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1610-2/+279
|\|
| * [Keyboard] Add Phase One keyboard (#16430)moyi46812022-04-168-0/+277
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Fix Xorg segfault with KeebCats PCBs (#16434)Amber Cronin2022-04-162-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1611-12/+16
|\|
| * [Keyboard] Update X-Bows Keyboard (#16765)X-Bows Tech2022-04-1611-12/+16
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Shulin <mumu@x-bows.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-161-3/+3
|\|
| * Resolve layout macro inconsistencies for rmkeebs/rm_numpad (#16856)Joel Challis2022-04-161-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1419-0/+473
|\|
| * [Keyboard] Add avalanche (#16407)Will Winder2022-04-1419-0/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add avalanche * PR feedback * Update keyboards/avalanche/v1/config.h * Update keyboards/avalanche/v1/v1.h * Update keyboards/avalanche/v2/config.h * Update keyboards/avalanche/v2/v2.h * Update keyboards/avalanche/v3/config.h * Update keyboards/avalanche/v3/v3.h * Apply suggestions from code review * Remove rules.mk comment and fix other comments. * Shared encoder code, follow conventions in rules.mk files. * Remove config files which do not change defaul behavior.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-144-3/+60
|\|
| * [Keyboard] Add via support for creatkeebs/glacier (#16747)Tim Liu2022-04-144-3/+60
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-149-6/+10
|\|
| * [Keyboard] move/rename obro to Meridian RGB (#16828)holtenc2022-04-149-6/+10
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-131-4/+2
|\|
| * [Keyboard] Fix kay65 - Missing keycode (#16849)jack2022-04-131-4/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-132-54/+53
|\|
| * [Keyboard] Fix waffling80 - Missing comma (#16848)jack2022-04-132-54/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1312-0/+547
|\|
| * [Keyboard] The inaugural commit for Leeloo's firmware. (#16599)ClicketySplit2022-04-1312-0/+547
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-133-0/+410
|\|
| * [Keymap] bépo layout on Lily58L (#16243)N L2022-04-133-0/+410
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1312-0/+586
|\|
| * [Keyboard] Add RM_Numpad (#15983)Rucker Machine2022-04-1312-0/+586
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: jason <jrucker2004@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1310-0/+523
|\|
| * [Keymap] Add thattolleyguy keymaps (#15351)Tyler Tolley2022-04-1310-0/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | * Adding personal keymaps * Update licenses * Fix RGB settings * Define used animations Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>