summaryrefslogtreecommitdiff
path: root/keyboards
AgeCommit message (Collapse)Author
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14Dactyl manuform 5x6 2 5 keymap (#11353)Jan Christoph Ebersbach
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys * fix(keymap): add missing readme * chore: add gpl2 license header * chore: add gpl2 license header * docs[dactyl_manuform_5x6_2_5]: reformat readme Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14[Keyboard] CyberGear Macro25 (#12518)Marius Kavoliunas
* add cybergear macro25 keyboard * add readme and fix file namings * rename readme.md * separate default and via keymaps * add info.json * unify info.json and key coordinates * remove via json * add missing via layers * Update keyboards/cybergear/macro25/keymaps/via/rules.mk * Update keyboards/cybergear/macro25/macro25.c * Update keyboards/cybergear/macro25/macro25.h * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * remove unnecessary config.h parameters * Update keyboards/cybergear/macro25/config.h * remove MATRIX_ROWS and COLS from config.h * Apply suggestions from code review set to LAYOUT_ortho_2x5 and fix grammar
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13[Keyboard] Add Caffeinated Studios Serpent65 (#12578)J.Flanagan
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young
2021-04-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13[Keymap] ANAVI Macro Pad 2 add Google Meet keymap (#12449)Leon Anavi
This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts for Google Meet: - left key: turn on/off the microphone (mute button) - right key: turn on/off the camera Signed-off-by: Leon Anavi <leon@anavi.org>
2021-04-13Terrazzo: Fix wrong LED Matrix function names (#12561)Ryan
2021-04-13[Keymap] Add kzar keymap for Kinesis Advantage (#12444)Dave Vandyke
2021-04-12Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172)James Young
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.