summaryrefslogtreecommitdiff
path: root/keyboards
AgeCommit message (Collapse)Author
2021-04-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-12Merc updates (#12289)Kyle McCreery
2021-04-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-12Update layout option for lazydesigners/THE40 (#12312)jackytrabbit
2021-04-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-11Update readme.md (#12502)Joseph Whom
Noticed a letter missing in "compiling".
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-10Reverse K0E and K0G (#12491)Álvaro A. Volpato
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09[Keyboard] Add afternoonlabs/oceanbreeze (#12299)Eithan Shavit
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-04-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217)Ryo Maeda
2021-04-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09[Keyboard] ergosaurus - add VIA support, enabled RGB (#12126)littleferris
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09[Keyboard] Added senselessclay had60 (#12093)hadi
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09Add VIA keymap for Kawii9 (#12521)kiwikey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-09Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977)mechlovin
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>
2021-04-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-08Add new handwired keyboard (Ergocheap) (#11857)Adrian
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-07Update info.json to correctly. (#12507)Kosuke Adachi
2021-04-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-07Add info.json for CK60i (#12318)Ryan
2021-04-06Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel
2021-04-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-04Disarray ProductID change (#12440)SneakboxKB
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>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-04[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)Takeshi ISHII
* 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.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-03Added Epoch80 (#12307)kb-elmo
2021-04-03Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-04-03[CI] Format code according to conventions (#12468)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg
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.
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Add pkb65 keyboard (#12230)MCKeebs
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-02[Keyboard] Added wilba.tech WT70-JB (#12347)Wilba
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-03Merge remote-tracking branch 'origin/master' into developQMK Bot