summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-15[CI] Format develop (#11893)Joel Challis
2021-02-14initial add S20 keyboard into polycarbdiet folder (#11865)Galib, Muhammad
2021-02-14csc027/windows-terminal-shortcuts (#11867)csc027
* Fixed some comments in the defines file. * Replaced the Git command layer with a Windows Terminal shortcut layer. * Added numbered tab switching to the Windows Terminal layer. * Added 'new tab' and 'command pane' commands to the Windows Terminal layer. * Shortened the USB polling interval for the Iris to 1 millisecond. * Disabled old style macros and functions for the Iris.
2021-02-14[Docs] Japanese translation of adc_driver.md (#10971)umi
* add adc_driver.md translation * update based on comment * update based on comment * update based on comment
2021-02-14[Docs] Japanese translation of feature_unicode.md (#10985)umi
* add feature_unicode.md translation * consolidate sentence end * update based on comment * update based on comment * update based on comment * update based on comment
2021-02-14ChibiOS conf upgrade for keebio/dsp40/rev1 (#11846)Nick Brassel
2021-02-13[Keyboard] YMDK YMD40 v2 (#11835)James Young
* [Keyboard] YMDK YMD40 v2 * fork default keymap into default and factory - factory keymap is as assigned by the extracted JSON provided by the vendor - default keymap is based on the Planck * add AUDIO_SUPPORTED rule per drashna * modify factory keymap's readme Recommend users copy the default keymap instead.
2021-02-13[Keyboard] NEO Keys Palette G67 Hotswap & Soldered (#11850)James Young
2021-02-13unscramble Durgod k320 keymap / fix Issue #11883 (#11885)Joshua Diamond
* unscramble Durgod k320 keymap / fix Issue #11883 * fix a few keymaps
2021-02-14Refactor platform logic within print.h (#11863)Joel Challis
* Remove GCC check from debug * Remove platform logic from common.mk * Refactor platform logic within print.h * restore debug.c format * headers * Rename function pointer type * review comments * Update tmk_core/common/printf.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Format Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-02-14LED Matrix: add led_matrix_types.h and implement g_led_config (#11741)Ryan
* LED Matrix: add led_matrix_types.h and implement g_led_config * Set correct flags for non-"modifier" LEDs * Clean up docs a little * Add license headers for [led,rgb]_matrix_types.h
2021-02-14Split gpio and atomic to platform (#11792)Joel Challis
2021-02-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-14Disable VIA protocol's EEPROM reset and bootloader jump commands (#11892)Nick Brassel
* Disable VIA protocol's EEPROM reset and bootloader jump commands, and allow for reinstation through #define. * Removed at Wilba's suggestion.
2021-02-13bump to python 3.7 (#11408)Zach White
2021-02-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-13Add basic ISO {Win,Mac} layouts for Durgod/K320 (#11778)Al Cutter
* 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
2021-02-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-13Format code according to conventions (#11879)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-13Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-02-12Fix line endings for geminate60.[ch] (#11878)Ryan
2021-02-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Keyboard] Update MOJO75 to support multi version (#11790)MelGeek
* 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>
2021-02-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855)James Young
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830)Carlos
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Keyboard] geminate60 keyboard (#11670)Weirdo
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Adding custom keymap for Quark keyboard (#11744)Brian Marsh
* adding pezhore keymap * Adding sarcasm/irony mark, unicode emoji * removing numpad layer enum Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Add stuartfong1 Planck Layout (#11814)Stuart Fong
* 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>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Rename ki folder to kifinnsson (#11853)Christian Gurholt
In preparation for migrating keymaps to userspace
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12added dear_vehicle_owner meme keymap to planck keyboard (#11478)Timothy Beck
* 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
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Add bastyl mini keyboard (#11782)Quentin
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>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Fix noxary Product IDs (#11771)Rozakiin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ruari <ruari.armstrong@gmail.com>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)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-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Docs] Update feature_haptic_feedback.md (#11859)Kyle McCreery
Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf.
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10[Keymap] add noroadsleft userspace; add and update keymaps (#11686)James Young
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10[Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)Joschua Gandert
* Added german_gaming keymap for hidtech/bastyl * Apply suggestions from code review * Added missing brace
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot