summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972)Joshua Diamond
2021-02-22Clean up some user keymaps specifying MCU (#11966)Ryan
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keymap] Add via support to Durgod K320 (#11960)Maxime Coirault
Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Rebound: change vendor and product ID for VIA (#11965)Ross Montsinger
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Pill60: fix default keymap shift key, fix info.json to default ↵Ikta
keymap (#11919)
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] Adding my v60 Type R keymap (#11911)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] My Prime_E Keymap (#11899)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] My Idobo Keymap (#11897)IFo Hancroft
2021-02-20[Keymap] My ErgoDash Keymap (#11895)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] Bongo Cat + WPM Counter OLED keymap (#11871)Jonathan Law
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785)MelGeek
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Update MJ63 architecture to support multi version (#11788)MelGeek
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Add DimplePlus 7u Layout (#11816)James Skeen
Co-authored-by: James Skeen <skeen@macbook.attlocal.net>
2021-02-20[Keyboard] Add MIO keyboard (#11852)Naoto Takai
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Added Ketch support (#11656)Ethan Madden
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139)LucW
Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
2021-02-20added unix60, moved togehter with southpaw75 into fr4 folder (#11195)mkdl
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21Added ConsoleKeyboard (#11950)gazeddy
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20Fix minor typo (#11962)Jonathan Haddock
2021-02-20tmk_core/common/action.c: refactor for code size; merge multiple `case`s ↵Liyang HU
into one (#11943) * tmk_core/common/report.h: define `enum mouse_buttons` in terms of `#define MOUSE_BTN_MASK()` * tmk_core/common/action.c: collapse multiple `case KC_MS_BTN[1-8]:` into single `MOUSE_BTN_MASK(action.key.code - KC_MS_BTN1)` We all love tapping on our keyboards but this is taking the piss. This saves ~134 bytes on my ATmega32.
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821)Leon Anavi
ANAVI Macro Pad 2 is an open source mini mechanical keyboard with 2 keys and backlit. Powered by ATtiny 85 microcontroller and with microUSB connector. Designed with KiCad. Provides the following keymaps for ANAVI Macro Pad 2: - Default (with a, b and combo to control the LEDs) - Copy & paste - Tap dance example with a, b and c - Mute - Volume - Zoom - Jitsi Meet Co-authored-by: Drashna Jaelre <drashna@live.com> Signed-off-by: Leon Anavi <leon@anavi.org> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Concertina (#11922)Viktor Eikman
* [Keyboard] Concertina * Added a novel handwired keyboard. * Concertina lint * Perfunctory changes to pass CI. * Concertina line width * Changes from code review: GPL headers, modernization, full-width representation of matrix to match info.json.
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20Add via support to Dozen0 (#11932)yynmt
* Change VID and PID * Add via kyemap * Update keymap.c * Update keymap.c Co-authored-by: yynmt <yynmt@yynmt.com>
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20Update ortho.h (#11945)melonbred
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20assign each key an LED for reactive modes (#11949)stanrc85
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20adding personal keymaps (#11952)Chase Nordengren
* adding personal keymaps * Update keyboards/xd60/keymaps/semicolonsnet/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * added license * added license Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-20Output selection: Remove "USB and BT" option (#11940)Ryan
2021-02-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20Iron180: layout macro and Configurator rework (#11948)James Young