Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up some user keymaps specifying MCU (#11966) | Ryan | 2021-02-22 | 19 | -1398/+31 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 5 | -0/+134 |
|\ | |||||
| * | [Keymap] Add via support to Durgod K320 (#11960) | Maxime Coirault | 2021-02-21 | 5 | -0/+134 |
| | | | | | | Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] Rebound: change vendor and product ID for VIA (#11965) | Ross Montsinger | 2021-02-21 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 2 | -55/+55 |
|\| | |||||
| * | [Keyboard] Pill60: fix default keymap shift key, fix info.json to default ↵ | Ikta | 2021-02-20 | 2 | -55/+55 |
| | | | | | | | | keymap (#11919) | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 4 | -0/+149 |
|\| | |||||
| * | [Keymap] Adding my v60 Type R keymap (#11911) | IFo Hancroft | 2021-02-20 | 4 | -0/+149 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 4 | -0/+129 |
|\| | |||||
| * | [Keymap] My Prime_E Keymap (#11899) | IFo Hancroft | 2021-02-20 | 4 | -0/+129 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 8 | -0/+294 |
|\| | |||||
| * | [Keymap] My Idobo Keymap (#11897) | IFo Hancroft | 2021-02-20 | 4 | -0/+151 |
| | | |||||
| * | [Keymap] My ErgoDash Keymap (#11895) | IFo Hancroft | 2021-02-20 | 4 | -0/+143 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 3 | -0/+373 |
|\| | |||||
| * | [Keymap] Bongo Cat + WPM Counter OLED keymap (#11871) | Jonathan Law | 2021-02-20 | 3 | -0/+373 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 3 | -0/+196 |
|\| | |||||
| * | [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785) | MelGeek | 2021-02-20 | 3 | -0/+196 |
| | | | | | | | | | | 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> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 5 | -31/+228 |
|\| | |||||
| * | [Keyboard] Update MJ63 architecture to support multi version (#11788) | MelGeek | 2021-02-20 | 5 | -31/+228 |
| | | | | | | | | | | 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> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 13 | -10/+445 |
|\| | |||||
| * | [Keyboard] Add DimplePlus 7u Layout (#11816) | James Skeen | 2021-02-20 | 3 | -10/+118 |
| | | | | | | Co-authored-by: James Skeen <skeen@macbook.attlocal.net> | ||||
| * | [Keyboard] Add MIO keyboard (#11852) | Naoto Takai | 2021-02-20 | 10 | -0/+327 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 10 | -0/+448 |
|\| | |||||
| * | [Keyboard] Added Ketch support (#11656) | Ethan Madden | 2021-02-20 | 10 | -0/+448 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-21 | 1 | -157/+162 |
|\| | |||||
| * | ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139) | LucW | 2021-02-20 | 1 | -157/+162 |
| | | | | | | Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net> | ||||
* | | added unix60, moved togehter with southpaw75 into fr4 folder (#11195) | mkdl | 2021-02-20 | 14 | -0/+182 |
| | | | | | | | | | | 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> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 9 | -0/+243 |
|\| | |||||
| * | Added ConsoleKeyboard (#11950) | gazeddy | 2021-02-21 | 9 | -0/+243 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 1 | -2/+2 |
|\| | |||||
| * | Fix minor typo (#11962) | Jonathan Haddock | 2021-02-20 | 1 | -2/+2 |
| | | |||||
* | | tmk_core/common/action.c: refactor for code size; merge multiple `case`s ↵ | Liyang HU | 2021-02-20 | 2 | -72/+21 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 21 | -0/+447 |
|\| | |||||
| * | [Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821) | Leon Anavi | 2021-02-20 | 21 | -0/+447 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 11 | -0/+339 |
|\| | |||||
| * | [Keyboard] Concertina (#11922) | Viktor Eikman | 2021-02-20 | 11 | -0/+339 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 3 | -2/+51 |
|\| | |||||
| * | Add via support to Dozen0 (#11932) | yynmt | 2021-02-20 | 3 | -2/+51 |
| | | | | | | | | | | | | | | | | | | | | | | * Change VID and PID * Add via kyemap * Update keymap.c * Update keymap.c Co-authored-by: yynmt <yynmt@yynmt.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 1 | -2/+2 |
|\| | |||||
| * | Update ortho.h (#11945) | melonbred | 2021-02-20 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 1 | -4/+4 |
|\| | |||||
| * | assign each key an LED for reactive modes (#11949) | stanrc85 | 2021-02-20 | 1 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 4 | -0/+108 |
|\| | |||||
| * | adding personal keymaps (#11952) | Chase Nordengren | 2021-02-20 | 4 | -0/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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> | ||||
* | | Output selection: Remove "USB and BT" option (#11940) | Ryan | 2021-02-20 | 2 | -30/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 5 | -66/+184 |
|\| | |||||
| * | Iron180: layout macro and Configurator rework (#11948) | James Young | 2021-02-20 | 5 | -66/+184 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-20 | 13 | -0/+1711 |
|\| | |||||
| * | Adding new handwired ortho 5x14 keyboard (#11597) | Richard Nunez | 2021-02-20 | 13 | -0/+1711 |
| | | | | | | Co-authored-by: Richard Nunez <richard.nunez@macrossplusinc.com> |