summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-244-0/+445
|\
| * [Keymap] addition for mjuma in keyboards/planck/keymaps (#10885)Mohammad Juma2021-01-244-0/+445
| | | | | | | | | | | | | | * Add planck layout * switch gaming toggle to TG * rename readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-242-0/+52
|\|
| * Increased dynamic keymap layers in via keymap (#11575)Vinam Arora2021-01-242-0/+52
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-241-4/+4
|\|
| * Fix preonic layout documentation (#11655)Damien2021-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Apple M5120] First iteration * Cleaned apple_m5120 files * Changes requested by PR * Update keyboards/apple_m5120/iso/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/apple_m5120/iso/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Updated Preonic default layout doc * Removed non related files Co-authored-by: dbroqua <dbroqua@mousur.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-244-1/+105
|\|
| * Add VIA support for dm9records/tartan (#11666)Anand2021-01-243-0/+104
| |
| * fix(feature_ps2_mouse): fix Scroll Button example (#11669)David H. Bronke2021-01-241-1/+1
| | | | | | Corrected macro in Scroll Button example so it compiles.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-242-4/+20
|\|
| * Update docs/getting_started_make_guide.md (#11373)Takeshi ISHII2021-01-242-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update docs/getting_started_make_guide.md Added description of some targets, including those added with #11338. * Added description of options added by #11324. * update docs/getting_started_make_guide.md * Added description of target. * Update docs/getting_started_make_guide.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Update docs/getting_started_make_guide.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update docs/getting_started_make_guide.md Co-authored-by: Drashna Jaelre <drashna@live.com> * add ':id=linux-udev-rules' to docs/faq_build.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Remove duplicated housekeeping in arm_atsam (#11672)Gentoli2021-01-241-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-242-2/+2
|\|
| * Fix number RGB RART4x4 dan matrix pin RART45 (#11582)Alabahuy2021-01-232-2/+2
| | | | | | | | | | * Update config.h * Update config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-249-0/+332
|\|
| * [Keyboard] adding support for new keyboard Dawn (#11564)David Dejaeghere2021-01-239-0/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit Dawn keyboard * fixing some matrix * final tweaks to keymaps and info.json layout * fix info.json missing delimiter * missing elements in info.json layout, resolved through lint * fixed missing link image in readme * Update keyboards/mechstudio/dawn/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: David <david@tarpit.be> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-233-29/+27
|\|
| * Fix typos and reword some sentences in FAQs (#11546)smiley2021-01-233-29/+27
| | | | | | | | | | | | | | | | | | * Fix minor typo in "General FAQ" "want to do brand it with QMK" -> "want to brand it with QMK" * Reword some of "Debugging FAQ" & "Miscellaneous FAQ". Mostly grammatical wording of some parts and missing capitalization
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2315-12/+400
|\|
| * [Keymap] Adding Fancy and Bongocat Keymap to Mercutio Keyboard (#11520)Kyle McCreery2021-01-2315-12/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit on new clean branch. Testing out functionality of oled and encoder for default features. * Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly. * Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR. * Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies. * Initial commit of branch specifically for implementing the more complicated fancy keymap as I expect the main PR to be approved first. * testing bongo cat out * Progress with intended OLED behavior. Needs to be cleaned up still. * Cleaned up bongocat and added WPM display on it. * Almost there. Need to rethink the layer checking in encoder. * Fixing all the merge issues I didn't check before doing the last commit. Learn from my mistakes, check your commits. * Fixed and updated fancy firmware and bongocat firmware. * Updating license year since I will be doing a PR anyway. * Update keyboards/mechwild/mercutio/keymaps/fancy/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2310-825/+213
|\|
| * Infinity60 refactor (#11650)Ryan2021-01-2310-825/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2338-286/+489
|\|
| * Program Yoink! refactor (#11636)James Young2021-01-2238-286/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split config.h for each variant * split rules.mk for each variant * split source and header files for each variant * move keymaps to the appropriate variant * update keyboard readme * update keymap readmes * differentiate Staggered and Ortho USB Device Strings * clean up formatting in info.json * split info.json files for each variant * break up the info.json for readability * correct key positioning and board dimensions * correct key object sequences * add weak encoder function to keyboard level Allows Configurator-compiled firmware to have encoder functionality. * add variant-specific readme files and bootloader instructions
* | Remove QMK_KEYBOARD_CONFIG_H (#11576)Joel Challis2021-01-2227-125/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-228-42/+83
|\|
| * Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO (#11657)James Young2021-01-228-42/+83
| | | | | | | | | | * Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO * update readme formatting
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2210-303/+214
|\|
| * Woodpad refactor (#11651)Ryan2021-01-2310-303/+214
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2216-550/+563
|\|
| * [Keyboard] Pinky refactor (#11643)James Young2021-01-2216-550/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * QMK Configurator layout support for Pinky 3-row and 4-row versions * refactor default keymaps - use an enum for layer names - remove redundant definitions - qmk cformat pass - modify pinky/4 via keymap to mirror pinky/4 default functionality * remove LAYOUT_kc macros This usage is not endorsed by QMK as it has been found to be confusing to novice users. * add VIA support to pinky/3 * update config.h files Removes unnecessary definitions for Backlight, RGB Underglow, Magic config and MIDI. * update main rules.mk file Updates the rules.mk file to match the formatting of the current QMK-provided template. Removes sample bootloader comments, feature rules that are no longer included in the template, and updates the in-line comments. * update and split keyboard readme Updates the main readme file's formatting, adds instructions to access bootloader mode, and adds more specific readmes for each version. * add line breaks between rows in the info.json files * rename layout macros for Community Layout forward compatibility The layouts of the Pinky3 and Pinky4 aren't currently Community Layouts, but support for them could be added with a rules.mk edit should the layouts be added to QMK.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-221-0/+73
|\|
| * [Keymap] Breeze keymap eithanshavit (#11640)Eithan Shavit2021-01-221-0/+73
| | | | | | Co-authored-by: Eithan Shavit <eithan@fb.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2236-270/+588
|\|
| * [Keymap] Cleanup and updating of drashna keymap code (#11516)Drashna Jaelre2021-01-2236-270/+588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update other keyboards for rgb matrix changes * Remove customized bootmagic code * Fix corne layout compilation error * Fix compiler errors with all keymaps * Add Simple Visualizer for ergodox infinity * Fix compile issue with Corne * Fix keymap stuff * Add alias for mouse layer * Add Halmak Keyboard layout * Updates for Kyria * Add support for oled interval * Change RGB stuff [CHANGE] Fix coexistence issues * Fix rgb_stuff * Add custom ploopyco mouse keymap * Decrease default dwell time * Updates based on last breaking changes update * Disable command on dactyl * Update ergodox to use proper commands for rgb matrix indicators * Update all rgb matrix indicator functions * Update rules for dactyl-manuform * Reduce wait time for mouse layer off event * Add more info to logger * Add wrappers for get_tapping term * Move version.h include into only file that actually needs it * Update rgb sleep stuff * Update key print function * Change DM keymap settings * Change pin for DM Manuform * Add Proton C stuff for Corne keymap * more arm corne tinkering * Even more arm stuff for corne * Cleanup corne stuff * redirect default keymap to drashna because I am a very bad man * change corne rgb priority * Update tractyl manuform to not conflict * Add more secret stuff * more dactyl tweaks * Add more options to split transport * Changes of oled support * Change split settings * Improve keylogger formatting more * tweak oled stuff * Oled and such tweaks * Reduce brightness due to leds * Decrease brightness more * Only run layer code if master
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-221-1/+90
|\|
| * Isometria 75: Configurator/CLI fixes (#11612)James Young2021-01-211-1/+90
| | | | | | | | | | | | | | | | | | * info.json: human-friendly formatting * info.json: update key object labels Some of the characters in the original file don't play nicely with `qmk info -l` on Windows. * info.json: correct key object order
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-211-4/+18
|\|
| * Add 3rd encoder to VIA keymap (#11580)Danny2021-01-211-4/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-211-1/+0
|\|
| * Remove rules.mk in leafcutterlabs/bigknob:default (#11652)jakobkg2021-01-211-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-211-0/+0
|\|
| * update CI list about helix keyboardsmtei2021-01-211-0/+0
| | | | | | | | | | | | | | | | * exclude 'helix/rev3_4rows' from CI Since helix/rev3_4rows is almost the same as helix/rev3_5rows, there is no point in checking with travis-ci. * include 'helix/pico/back' to CI helix pico and helix rev2 are still available. I would like to check both by travis-ci, but here I will add a check only for helix pico.
* | Keep track of encoder activity (#11595)Nick Brassel2021-01-214-8/+46
| | | | | | | | | | * Keep track of encoder activity, provide API for either matrix/encoder. * Fixup build when no RGBLIGHT or Backlight enabled.
* | ChibiOS conf migrations... take 11 (#11646)Nick Brassel2021-01-21102-1140/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |