summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-0/+186
|\|
| * Bliss Hotdox keymaps (#13160)Benjamin Chausse2022-02-193-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bliss Hotdox keymaps * Update keyboards/hotdox/keymaps/bliss/keymap.c * Update keyboards/hotdox/keymaps/bliss/keymap.c * Add GPL License to keymap.c file Changes to be committed: modified: keymap.c * make changes requested by fauxpark * Update keyboards/hotdox/keymaps/bliss/readme.md * Update keyboards/hotdox/keymaps/bliss/keymap.c * Update keyboards/hotdox/keymaps/bliss/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-208-0/+266
|\|
| * Add kikkou keyboard (#15291)Matthew Dias2022-02-198-0/+266
| | | | | | | | | | | | | | | | | | | | * Add kikkou keyboard * Apply suggestions from code review * Update keyboards/kikkou/rules.mk * Apply suggestions from code review1
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-1913-17/+23
|\|
| * Fix a couple of boards being wrongly identified as AVR (#16377)Ryan2022-02-192-1/+7
| |
| * [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373)Simon2022-02-1711-16/+16
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-02-1722-1980/+531
|\|
| * `mokey/xox70`: clean up layouts (#16375)Ryan2022-02-175-310/+531
| |
| * [Keyboard] Remove Helix/rev1 (#16389)Takeshi ISHII2022-02-1717-1672/+0
| |
* | Bodge for helix build failures (#16376)Joel Challis2022-02-163-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-151-2/+2
|\|
| * Update USB VID and PID for Aya (#16363)Dan Nixon2022-02-151-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-153-3/+3
|\|
| * Add extra braces for trackball keymaps (#16361)Ryan2022-02-153-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-157-15/+9
|\|
| * Fix multiple definition errors for trackball "boards" with no keys (#16350)Ryan2022-02-157-15/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-141-25/+25
|\|
| * Xenon: correct QMK Configurator key sequence (#16332)James Young2022-02-131-25/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-1413-48/+1450
|\|
| * Mode M75S Layout Additions, Configurator Data and Code Touch-Up (#16327)James Young2022-02-1313-48/+1450
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * m75s.h: correct matrix position identifier `K5C` is actually on row 4, so it should be `K4C`. * m75s.h: add matrix diagram * add QMK Configurator data * polish whitespace - convert tabs to spaces - update indent to four spaces - remove trailing whitespace * update readme Didn't seem to be fully updated after being copied from the M65S codebase. * add LAYOUT_ansi with keymap ANSI layout with 2u Backspace. * add LAYOUT_iso with keymap ISO layout with 2u Backspace. * add LAYOUT_ansi_tsangan with keymap ANSI layout with 2u Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan with keymap ISO layout with 2u Backspace and 7u Spacebar. * add LAYOUT_ansi_split_bs with keymap ANSI layout with Split Backspace. * add LAYOUT_iso_split_bs with keymap ISO layout with Split Backspace. * add LAYOUT_ansi_tsangan_split_bs with keymap ANSI layout with Split Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan_split_bs with keymap ISO layout with Split Backspace and 7u Spacebar.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-142-331/+331
|\|
| * Digicarp65: fix layouts (#16328)Ryan2022-02-142-331/+331
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-123-128/+348
|\|
| * [Keyboard] Convert Maxr1998/Phoebe to use info.json where possible (#16309)Max Rumpf2022-02-113-128/+348
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-129-0/+657
|\|
| * [Keyboard] Lulu keyboard by boardsource (#15951)cole smith2022-02-119-0/+657
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] move g heavy industry boards into /gboards (#16040)peepeetee2022-02-1189-22/+22
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-1210-0/+522
|\|
| * [Keymap] Add uqs' keymaps for various boards and ploopy mouse (#16265)uqs2022-02-1110-0/+522
| |
* | move montex to IDOBAO vendor folder (#15668)peepeetee2022-02-129-2/+2
| | | | | | | | | | * move montex to IDOBAO vendor folder * move montex to montex/v1
* | move @satt99 's comet46 to satt/ (#16059)peepeetee2022-02-1228-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-121-0/+105
|\|
| * Add wren configurator data (#16321)Joel Challis2022-02-121-0/+105
| |
* | move mechkeys keyboards into the mechkeys/ vendor folder (#15760)peepeetee2022-02-1179-13/+13
| | | | | | | | | | | | | | * move mechkeys keyboards to mechkeys/ * fix compilation * fix default folder
* | move @takashiski 's keebs into /takashiski (#16089)peepeetee2022-02-1150-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-111-1/+1
|\|
| * handwired/promethium: fix missing include (#16317)Ryan2022-02-111-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-111-1/+1
|\|
| * mechlovin/kay60: fix mismatched layout name (#16314)Ryan2022-02-111-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-116-34/+85
|\|
| * maxr1998/pulse4k: Move Combo code to keymap level (#16301)Ryan2022-02-116-34/+85
| | | | | | | | | | * maxr1998/pulse4k: Move Combo code to keymap level * Reorder code
* | [Keyboard] move latincompass's boards to /latincompass (#16039)peepeetee2022-02-1065-8/+8
| |
* | move id80 and id75 to v1 to accommodate for id75 v2 and id80 v3 (#15992)peepeetee2022-02-1033-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move id80 to a v1 to acommondate for v2 and a future v3 * move id75 to v1 * fix manufacturer and product fields, enable backlight * move user keymap * Fix DEFAULT_FOLDER * Update build command Co-authored-by: zvecr <git@zvecr.com>
* | move ID87 to IDOBAO vendor folder (#15667)peepeetee2022-02-1010-3/+3
| | | | | | | | | | * move ID87 to IDOBAO vendor folder * move to v1 to acommondate for v2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-104-37/+154
|\|
| * Mode 75H Touch-UP (#16310)James Young2022-02-104-37/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * m75h.h: correct matrix position identifier `K5C` is actually on row 4, so it should be `K4C`. * m75h.h: add matrix diagram * add QMK Configurator data * polish whitespace - convert tabs to spaces - update indent to four spaces - remove trailing whitespace
* | Remove manual enable of LTO within user keymaps (#15378)Joel Challis2022-02-1012-13/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-105-10/+15
|\|
| * keyten kt60-M: rename LAYOUT to LAYOUT_60_tsangan_hhkb (#16307)James Young2022-02-105-10/+15
| | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_60_tsangan_hhkb * info.json: correct maintainer value Field is meant to reference the maintainer's GitHub username. * rules.mk: enable Community Layout support