summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Keymap] Feature/preonic/rev3/alfrdmalr (#7870)Alfred Maler2020-01-204-0/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP do not merge * first pass at custom preonic layout * add auto shift and reset via leader key * Update readme * update copyright notice * formatting changes * fix: use MO instead of process_record_user * added backslash and moved grave position * remove extraneous 'j' characer in NUMPAD template * update template formatting * remove process_record_user * swap "!" with "@" * fix readme formatting * update readme layout image
* [Keyboard] Add keyboard Getta25 (#7497)Salicylic-acid32020-01-2014-0/+771
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add keyboard Getta25 Add Getta25 keyboard. A 25 keys Tenkey. Salicylic-acid3 * Update keyboards/getta25/info.json * Update keyboards/getta25/readme.md * Update keyboards/getta25/readme.md * Update keyboards/getta25/readme.md * Update keyboards/getta25/info.json * Update keyboards/getta25/info.json * Update keyboards/getta25/info.json * Update keyboards/getta25/info.json * Update keyboards/getta25/keymaps/oled/glcdfont.c * Update keyboards/getta25/keymaps/oled/glcdfont.c * Keymap Update Remove unnecessary code blocks * Update keyboards/getta25/keymaps/oled/keymap.c * Update keyboards/getta25/keymaps/oled/keymap.c * Update keyboards/getta25/keymaps/oled/keymap.c
* Invert Num Lock LED state (#7945)clovervidia2020-01-201-1/+1
|
* format code according to conventions [skip ci]QMK Bot2020-01-202-6/+4
|
* Add VIA support for QMK backlight, QMK RGBLight (#7911)Wilba2020-01-2037-35/+500
| | | | | | * Add VIA support for QMK backlight, QMK RGBLight * clang-format changes
* curry layout (#7943)Akaash Suresh2020-01-202-0/+64
|
* Remove all references to "CUSTOM_MATRIX" as a diode direction (#7937)fauxpark2020-01-1933-49/+27
|
* Fix attribute heritance for long commands.Erovia2020-01-191-4/+7
| | | | | This is needed for inheritance to work with commands that have dashes in their names.
* Fix commandline arg merging, small improvementsErovia2020-01-191-3/+3
| | | | | | Commandline args should be merged with the submodule's config. Compare config values to None instead of False, so empty lines and False can be used as values.
* MILC: Fix/complete attribute heritanceErovia2020-01-191-2/+15
| | | | | If an undefined attribute of a submodule is accessed, fall back to same attribute of the submodule's parent.
* [Keyboard] Addition Eagle II keyboard (#7927)Spaceman2020-01-197-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add EagleII Keyboard * Update eagleii.c * Update eagleii.h * Update keymap.c * Update eagleii.h * Update keymap.c * Update keyboards/handwired/eagleii/config.h * Update keyboards/handwired/eagleii/config.h * Update keyboards/handwired/eagleii/rules.mk * Update config.h * Update rules.mk * Update eagleii.h * Update eagleii.h * Update keymap.c * Update info.json * Update keyboards/handwired/eagleii/rules.mk * Update keyboards/handwired/eagleii/rules.mk * Create readme.md * Update keyboards/handwired/eagleii/readme.md * Update keyboards/handwired/eagleii/config.h * Update keyboards/handwired/eagleii/readme.md * Update keyboards/handwired/eagleii/readme.md
* [Keyboard] Add mx5160 keyboard (#7142)Maarten Dekkers2020-01-198-0/+459
| | | | | | | | | | | | | | | | | | * Add mx5160 keyboard * Make necessary changes for merging rules.mk cleanup, QMK's built in alias for KC_TRNS and change readme blurb * Add info.json as well * Update readme, info.json * Change layout name, update led function * Fix info.json * Update rules.mk
* [Docs] Misc cleanups for OLED documentation (#7864)fauxpark2020-01-191-112/+115
|
* Fix unknown key 'IndentPPDirectives' on CI (#7933)Joel Challis2020-01-192-8/+13
|
* [Keyboard] Rebound keyboard add (#7886)Rossman3602020-01-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * create Rebound keyboard * proofread * update decade * layer enums * revert enum layer changes * line spacing and such * product ID and punctuation * terminating terminating slashes * layer enums * remove slashes * rules change, rgb and spacing * plural layouts rgb rulez
* [Keyboard] Rebound keyboard add (#7886)Rossman3602020-01-196-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | * create Rebound keyboard * proofread * update decade * layer enums * revert enum layer changes * line spacing and such * product ID and punctuation * terminating terminating slashes * layer enums * remove slashes * rules change, rgb and spacing * plural layouts rgb rulez
* [Keyboard] Add Tartan keyboard (#7917)Takuya Urakawa2020-01-199-0/+893
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * first commit * update keymap and key layout * Update for release * Update keyboards/tartan/config.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/keymaps/default/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/keymaps/default/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/keymaps/test/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/keymaps/test/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Delete tartan/keymaps/test * Update keyboards/tartan/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Delete tartan/keymaps/default/config.h * Update keyboards/tartan/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/tartan/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Delete unneccesary settings * Fix tartan/rules.mk * Delete unnecessary code from tartan.c * Rearrange layout order in tartan.h * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update usb config * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Delete unused defines * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/tartan/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: fauxpark <fauxpark@gmail.com>
* Remove tmk_core gitignore and gitmodulesfauxpark2020-01-192-13/+0
|
* Run clang-format manually to fix recently changed files (#7934)Joel Challis2020-01-1913-218/+170
| | | | | | | | * Run clang-format manually to fix recently changed files * Run clang-format manually to fix recently changed files - revert template files * Run clang-format manually to fix recently changed files - format off for ascii_to_keycode_lut
* Remove custom backlight code for PS2AVRGB boards (#7775)fauxpark2020-01-18101-2802/+474
| | | | | | | | | | | | | | * Remove custom backlight code for PS2AVRGB boards * Remove custom driver setting * BACKLIGHT_BREATHING goes in config.h, not here * Don't need to include backlight.c again here either * Turn on backlight for Canoe * Disable console on a few boards due to oversize
* Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards (#7915)fauxpark2020-01-1954-6/+120
| | | | | | | | | | * Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards * Define diode direction for failing boards * Matching parentheses * Put onekey diode directions in top level config
* Added keymap for Space65 (#7562)James Young2020-01-1811-4/+428
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit * Modified keymap and updated readme. * fixed numbering in readme * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Made requested changes in PR. * Rename README.md to readme.md * swapped media control keys * updated right alt key to apply shift key for emacs * updated R_Alt to remove shift * Updated readme * add layout 2 and rename existing folder to layout 4 - renamed existing folder with directional layout to layout 4 - udpated existing readme - Added layout_60_2 * update flash script per pull request review * Added keymap profile to space65 - This keymap profile is for MacOS with VIM key bindings - See readme for more information * Update keyboards/gray_studio/space65/keymaps/billiams/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/gray_studio/space65/keymaps/billiams/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/gray_studio/space65/keymaps/billiams/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/gray_studio/space65/keymaps/billiams/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/gray_studio/space65/keymaps/billiams/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * remove unnecessary code from keymap * updated keys and cleaned up readme Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
| * updated keys and cleaned up readmeWilliam Chang2020-01-012-21/+20
| |
| * Merge branch 'feature/billiams_space65' of github.com:billiams/qmk_firmware ↵William Chang2019-12-082-5/+5
| |\ | | | | | | | | | into feature/billiams_space65
| | * Update keyboards/gray_studio/space65/keymaps/billiams/keymap.cWilliam Chang2019-12-081-1/+1
| | | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
| * | remove unnecessary code from keymapWilliam Chang2019-12-081-40/+0
| |/
| * Added keymap profile to space65William Chang2019-12-073-0/+226
| | | | | | | | | | - This keymap profile is for MacOS with VIM key bindings - See readme for more information
| * update flash script per pull request reviewWilliam Chang2019-12-062-8/+2
| |
| * add layout 2 and rename existing folder to layout 4William Chang2019-11-208-3/+248
| | | | | | | | | | | | - renamed existing folder with directional layout to layout 4 - udpated existing readme - Added layout_60_2
| * Merge remote-tracking branch 'upstream/master'William Chang2019-11-206620-501433/+194898
| |\
| * \ Merge branch 'master' of https://github.com/qmk/qmk_firmwareWilliam Chang2019-07-132122-9404/+90836
| |\ \
| * \ \ Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-05-100-0/+0
| |\ \ \
| | * \ \ Merge pull request #2 from billiams/feature/billiamsWilliam Chang2019-05-091-1/+1
| | |\ \ \ | | | | | | | | | | | | Updated readme
| | | * | | Updated readmeWilliam Chang2019-05-091-1/+1
| | | | | |
| * | | | | fixed conflict in readmeWilliam Chang2019-05-107-21/+268
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'qmk-master'William Chang2019-05-09671-11435/+22563
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | resolved conflictsWilliam Chang2019-05-09671-11435/+22563
| |/| | | |
| * | | | | updated R_Alt to remove shiftWilliam Chang2019-04-252-4/+3
| | | | | |
| * | | | | updated right alt key to apply shift key for emacsWilliam Chang2019-04-252-3/+4
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-04-221-0/+0
| |\ \ \ \ \
| | * | | | | Rename README.md to readme.mdWilliam Chang2019-04-201-0/+0
| | | | | | |
| * | | | | | swapped media control keysWilliam Chang2019-04-222-7/+6
| |/ / / / /
| * | | | | Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-04-201-11/+11
| |\ \ \ \ \
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| | | | | | |
| | * | | | | Update README.mdWilliam Chang2019-04-201-5/+5
| | | | | | |
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| | | | | | |