summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172)James Young2021-04-12210-210/+210
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-121-1/+2
|\
| * Merc updates (#12289)Kyle McCreery2021-04-121-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-124-44/+98
|\|
| * Update layout option for lazydesigners/THE40 (#12312)jackytrabbit2021-04-124-44/+98
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-111-2/+2
|\|
| * Update readme.md (#12502)Joseph Whom2021-04-111-2/+2
| | | | | | Noticed a letter missing in "compiling".
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-102-2/+1
|\|
| * Reverse K0E and K0G (#12491)Álvaro A. Volpato2021-04-102-2/+1
| | | | | | Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1013-4/+374
|\|
| * [Keyboard] Add afternoonlabs/oceanbreeze (#12299)Eithan Shavit2021-04-0913-4/+374
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1015-434/+334
|\|
| * [Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217)Ryo Maeda2021-04-0915-434/+334
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-093-15/+69
|\|
| * [Keyboard] ergosaurus - add VIA support, enabled RGB (#12126)littleferris2021-04-093-15/+69
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0911-0/+454
|\|
| * [Keyboard] Added senselessclay had60 (#12093)hadi2021-04-0911-0/+454
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-093-1/+42
|\|
| * Add VIA keymap for Kawii9 (#12521)kiwikey2021-04-093-1/+42
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0967-80/+2526
|\|
| * Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977)mechlovin2021-04-0967-80/+2526
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: vuhopkep <boy9x0@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0812-0/+402
|\|
| * Add new handwired keyboard (Ergocheap) (#11857)Adrian2021-04-0812-0/+402
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-9/+58
|\|
| * Update info.json to correctly. (#12507)Kosuke Adachi2021-04-071-9/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-0/+82
|\|
| * Add info.json for CK60i (#12318)Ryan2021-04-071-0/+82
| |
* | Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel2021-04-063-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-041-1/+1
|\|
| * Disarray ProductID change (#12440)SneakboxKB2021-04-041-1/+1
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-036-339/+353
|\|
| * [Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)Takeshi ISHII2021-04-046-339/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows * Made the layout data easier to read. * helix/rev2/keymaps/five_rows/keymap.c * helix/rev3_5rows/keymaps/five_rows/keymap.c * The following two were made the same. * keymaps/five_rows/config.h * keymaps/five_rows/oled_display.c The binary of the compilation result has not changed. * update keyboards/helix/rev2/keymaps/five_rows/rules.mk KEYBOARD_LOCAL_FEATURES_MK was moved to the end. * add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0312-0/+1198
|\|
| * Added Epoch80 (#12307)kb-elmo2021-04-0312-0/+1198
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-04-032-77/+77
|\|
| * [CI] Format code according to conventions (#12468)github-actions[bot]2021-04-032-77/+77
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-24/+6
|\|
| * kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young2021-04-023-24/+6
| | | | | | QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-3/+3
|\|
| * keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg2021-04-023-3/+3
| | | | | | | | | | | | | | | | | | | | The right-most top-most key on the Kinesis Advantage keyboard is labeled “Progrm” and was meant to enter the Teensy bootloader as per the comment. However, the keycode was set to KC_1, which just produces a “1”. It should be RESET instead. This commit fixes KC_1 to RESET in all files where the fix is needed. The other files have already been fixed independently.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-44/+15
|\|
| * [Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor2021-04-021-44/+15
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+66
|\|
| * [Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm2021-04-023-2/+66
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+336
|\|
| * [Keyboard] Add pkb65 keyboard (#12230)MCKeebs2021-04-029-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+50
|\|
| * [Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin2021-04-023-2/+50
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+265
|\|
| * [Keyboard] Added wilba.tech WT70-JB (#12347)Wilba2021-04-029-0/+265
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 17:56:31 +0000