summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-141-13/+0
|\
| * Disable VIA protocol's EEPROM reset and bootloader jump commands (#11892)Nick Brassel2021-02-141-13/+0
| | | | | | | | | | * Disable VIA protocol's EEPROM reset and bootloader jump commands, and allow for reinstation through #define. * Removed at Wilba's suggestion.
* | bump to python 3.7 (#11408)Zach White2021-02-135-55/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-137-1/+633
|\|
| * Add basic ISO {Win,Mac} layouts for Durgod/K320 (#11778)Al Cutter2021-02-137-1/+633
| | | | | | | | | | | | | | | | | | | | | | | | * Add default ISO Windows layout for Durgod/K320 * Duplicate default_iso to default_iso_mac Swap the L{GUI,ALT} keys to match the mac layout, and remove the windows key lock functionality. * Remove windows-key lock in default_iso * Fixup wonky macro layout inherited from ansi keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-130-0/+0
|\|
| * Format code according to conventions (#11879)github-actions[bot]2021-02-130-0/+0
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-02-132-46/+46
|\|
| * Fix line endings for geminate60.[ch] (#11878)Ryan2021-02-122-46/+46
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-134-84/+88
|\|
| * [Keyboard] Update MOJO75 to support multi version (#11790)MelGeek2021-02-124-84/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md * Update info.json update the name of layout to consistent the keyboard. * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add Z70Ultra * Support Z70Ultra [Modified] info.json to support two different layouts [Add] rules.mk to support default folder * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * remove excessive arguments from LAYOUT_split_space * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Use macro replace with the literal for CS & SW * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add GPL for files * Update keymaps/default/keymap.c * Update keymaps/via/keymap.c * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Update MOJO75 to support multi version and Update the LED's ID of RGB Matrix 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 developQMK Bot2021-02-132-2/+14
|\|
| * [Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855)James Young2021-02-122-2/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-121-1/+1
|\|
| * [Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830)Carlos2021-02-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1211-0/+867
|\|
| * [Keyboard] geminate60 keyboard (#11670)Weirdo2021-02-1211-0/+867
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-122-0/+214
|\|
| * Adding custom keymap for Quark keyboard (#11744)Brian Marsh2021-02-122-0/+214
| | | | | | | | | | | | | | | | | | * adding pezhore keymap * Adding sarcasm/irony mark, unicode emoji * removing numpad layer enum Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+419
|\|
| * Add stuartfong1 Planck Layout (#11814)Stuart Fong2021-02-124-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Update readme.md * Update readme.md * Add GPL2+ compatible license header to config.h * Update keyboards/planck/keymaps/stuartfong1/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+0
|\|
| * Rename ki folder to kifinnsson (#11853)Christian Gurholt2021-02-124-0/+0
| | | | | | In preparation for migrating keymaps to userspace
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+421
|\|
| * added dear_vehicle_owner meme keymap to planck keyboard (#11478)Timothy Beck2021-02-124-0/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added default as a starting point * added readme per guidelines * made necessary changed to keymap to follow guidelines * changed debounce mode for more smooth usage at the cost of mem * increased polling interval * Revert "made necessary changed to keymap to follow guidelines" yikes! I modified the WRONG directory. reverted. This reverts commit 8ba3d97af538796d765c47b48537dbcf55c3dbc1. * reverted commit that modified file in incorrect directory. modified intended file. * added license tp config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-127-0/+273
|\|
| * [Keyboard] Add bastyl mini keyboard (#11782)Quentin2021-02-117-0/+273
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: NullSense <matas234@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-126-7/+9
|\|
| * [Keyboard] Fix noxary Product IDs (#11771)Rozakiin2021-02-116-7/+9
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ruari <ruari.armstrong@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1211-0/+493
|\|
| * [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)MelGeek2021-02-1111-0/+493
| | | | | | | | | | 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 developQMK Bot2021-02-111-1/+1
|\|
| * [Docs] Update feature_haptic_feedback.md (#11859)Kyle McCreery2021-02-111-1/+1
| | | | | | Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1016-488/+757
|\|
| * [Keymap] add noroadsleft userspace; add and update keymaps (#11686)James Young2021-02-1016-488/+757
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-103-0/+115
|\|
| * [Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)Joschua Gandert2021-02-103-0/+115
| | | | | | | | | | | | | | | | * Added german_gaming keymap for hidtech/bastyl * Apply suggestions from code review * Added missing brace
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-108-34/+98
|\|
| * Userspace updates (#11841)stanrc852021-02-108-34/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable LTO for smaller firmware size * delete since this was added to userspace rules.mk * readme updates and new images * Add -j to compile and flash commands in userpsace * Enable NKRO * Enable NKRO, VIA, LTO by default * Stanrc85-ansi readme update * Stanrc85-alice readme * quick RGB layer indicator fix in keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-109-0/+194
|\|
| * [Keyboard] Add keyboard yun65 (#11714)Spaceman2021-02-099-0/+194
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1022-0/+3591
|\|
| * [Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589)Mike Tsao2021-02-0922-0/+3591
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-101-1/+1
|\|
| * Play Keyboard Helen 80: fix matrix mapping (#11585)LSChyi2021-02-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-091-1/+1
|\|
| * Fix VENDOR_ID for ymd67 (#11838)Konstantin Shpits2021-02-101-1/+1
| |
* | Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre2021-02-09483-750/+48
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0912-0/+400
|\|
| * [Keyboard] Add Splitty keyboard (#11613)Nicolas Schodet2021-02-0912-0/+400
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 15:55:23 +0000