summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-06Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert1-1/+16
2017-09-06add audio on/off audiosJack Humbert2-36/+57
2017-09-06Let's split hand mirroring supportRob Rogers1-1/+16
commit b7a1c6fe3f0709d176a7833387051b2323b16f17 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Wed Sep 6 08:28:00 2017 -0500 add hand swap config matrix for Let's Split commit 1d53113d96b711db549f735316c2ea3f7469021b Merge: 98f40e3 4edfa97 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Tue Sep 5 21:43:34 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 98f40e31c4a1728d826037b375cf336d550bf69a Merge: a825225 94f8b75 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Mon Sep 4 20:20:46 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit a825225810a6282f7229cdf6b1c05fd9c27e1808 Merge: 56846cb f0db2c0 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Thu Aug 31 19:47:25 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 56846cb0326f1c78cba47b8161f4d389e19202c3 Merge: 4deb6ca ba2ad57 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Sun Aug 27 15:05:16 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 4deb6ca77633c603f8a134946bb4edc7ed619b50 Merge: 6f85d1f 7960302 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Sat Aug 26 23:23:48 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 6f85d1ff7cfac0a4a70b133984cd681852b49df6 Merge: e6aff71 4b0c6dc Author: Rob Rogers <r2d2rogers@gmail.com> Date: Thu Aug 24 14:33:31 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit e6aff71807bf2dc41edbec91408a827c32ef73ef Merge: 9d38f6f d54360b Author: Rob Rogers <r2d2rogers@gmail.com> Date: Wed Aug 23 13:43:20 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 9d38f6fe83e08962b14fd5d8a70ff100302af598 Merge: d1c0a9f 3aa7fbc Author: Rob Rogers <r2d2rogers@gmail.com> Date: Tue Aug 22 22:13:05 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit d1c0a9f3b0d9ac466595b197cd8fbce3f1e42f8a Merge: bd8dbb9 5cab5e4 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Sun Aug 20 10:00:01 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit bd8dbb9d19344623f1b3cefc0a2b205864e9ba3c Author: Rob Rogers <r2d2rogers@gmail.com> Date: Sun Aug 20 09:59:45 2017 -0500 fix line endings another time ' ' commit 2602515eb22451feed3178966ffeed33c0f4548b Merge: 41e549e 71d1c02 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Wed Aug 16 21:31:28 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 41e549e3d527b58f92df28caf8daecae06e5ecf8 Merge: e624ea5 88198a9 Author: Rob Rogers <r2d2rogers@gmail.com> Date: Fri Aug 11 12:48:45 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit e624ea55a1f715d008661ae2e180ae55a09ef0c8 Merge: 5966f09 933701c Author: Rob Rogers <r2d2rogers@gmail.com> Date: Mon Aug 7 14:43:30 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 5966f096016ffce9c4802ade57d250d9f756bd73 Merge: 71c173d dd3803f Author: Rob Rogers <r2d2rogers@gmail.com> Date: Tue Aug 1 21:58:14 2017 -0500 Merge branch 'master' of github.com:qmk/qmk_firmware commit 71c173dee1aa16dd762897531c42d23f6da0159c Author: Rob Rogers <r2d2rogers@gmail.com> Date: Mon Jul 31 00:19:08 2017 -0500 line endings???
2017-09-06update planck stuffJack Humbert4-5/+5
2017-09-05Improve and simplify RGB Knight mode (#1677)David Stosik2-43/+20
* Simplify RGB Knight mode code, and make it look closer to KITT * Remove RGBLIGHT_EFFECT_DUALKNIGHT_LENGTH
2017-09-05Update feature_common_shortcuts.mdJack Humbert1-1/+1
2017-09-03Fix Kitt and its default behavior (#1674)David Stosik2-8/+6
2017-08-31Set proper backlight levelLukmanul Hakim1-1/+1
2017-08-30convert to unix line-endings [skip ci]QMK Bot2-4/+4
2017-08-30Alterations and documentation updates for j3rn Ergodox EZ keymap (#1656)Jonathan Arnett2-14/+15
* Add second set of AltSft and Alt * Insert the play key between previous and next * Update documentation
2017-08-30Port #1576 to Let's Split: EECONFIG_HANDEDNESS gets overridden when RGB is ↵David Stosik3-7/+3
enabled
2017-08-30rask's Satan and BananaSplit60 (#1654)Otto Rask3-0/+204
* Add rask's Satan layout * Add rask's Satan layout * Add rask's BananaSplit60 layout * Add rask's BS60 readme * Fix rask's BS60 readme image * Fix rask's BS60 readme image again
2017-08-30Fixed mitosis-mjt audio (#1653)Michael Terhar3-69/+50
* copied mjt keymaps from archive * All mjt boards now compile * fixed jd45-mjt breathing * Updates to fix SpaceFN but not tested yet. * Still missing either spacebar or an adjacent keypress. * Debugging rigged up for use with hid_listen. * Reverted the default keymap to use tap_layer_key rather than custom. Moved custom approach to keymap_debug.c * Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function. * Cleaned up JD45 keymap that uses tapkey. * Redid minivan keymap with numsym rather than raise/lower. Untested. * Created my MJT keymap for HHKB Enabled dynamic macros and moved somoe of the shortcuts around. * Minor keymap fixes to make them compile without errors. * Added home/end to right arrow cluster on DYN layer. * Added more keys to fn and dyn layers. * It wasn't using my custom layer last time somehow...? Now it will. * Compiled and installed at end of day on 8/23 * Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback. * Fixed volume controls... were reversed and disabled. * Added F13-F15 back to fkeys layer in Minivan * Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan. * Removed DYN layer. * Fixed diagram in planck numsym. * Cleanup for pull request. * Roadkit flip phone warning. * Replaced PLAY_NOTES_ARRAY to PLAY_SONG * reset the submodules * checked out specific commits for submodules * Removed debugging from JD45 shared config.h * Moved custom rules.mk to apropriate keymap Reset the shared rules.mk file. * Trailing return issue in rules.mk Gotta make for a smooth pull request :-) * Mitosis music troubleshooting Also updated the song playing function. Does not work currently. * Fixed mitosis audio * Put mitosis/rules.mk back to QMK master
2017-08-30add UC_OSX_RALT to make unicode use the Right Alt key on OSXMarco Fontani4-2/+10
2017-08-30Update drashna's keymap (#1649)drashna4-206/+104
* initial commit for my custom layout * fix switching into and out of numfun layer * enable tap dance to lock layers * enable layer indicator LEDs * remove Colemak2 layer because it was dumb * remove handler for nonexistent keycode * add new movement keys to lower layer * standardize indentation because I'm not a monster * add Woodpad keyboard with Michael's Tryggve layout * Add dvorak/colemak layers * add hash * Update keymap.c * Fixed OSL Symbol layer layout issue * Minor later tweak * Clean up actions * Diablo 3 macro keys remove * Fixed numbad issues * Remove Underglow toggle * Fix layer consistency * cleanup of code * line feed * small fixes * Major merge * Merge cleanup on my keymap * Cleanup * Update compile command * Swapped arrows * Additional cleanup * Revert "Woodpad" * update * minor update * staging for pull request * Finish removing layer underglow toggles
2017-08-30Update README.Fredric Silberberg1-2/+2
2017-08-30Small gaming layer and formatting updates to my nyquist config.Fredric Silberberg1-24/+24
2017-08-30Merge pull request #1574 from danamlund/masterJack Humbert5-0/+793
New clueboard keymap that is a tetris game
2017-08-30Add the new QMK submodule way in `/lib` and not `tmk_core/tool` wich is outdatedArthur SCHMITT1-2/+17
2017-08-28add a `git-submodule` make target.skullY1-0/+4
2017-08-27add rule shortcut via @samwho's suggesionJack Humbert1-4/+2
2017-08-27add bin targets - closes #1648, fixes #1647Jack Humbert2-0/+8
2017-08-27Keymaps for several of my boards (#1641)Michael Terhar40-0/+3417
* copied mjt keymaps from archive * All mjt boards now compile * fixed jd45-mjt breathing * Updates to fix SpaceFN but not tested yet. * Still missing either spacebar or an adjacent keypress. * Debugging rigged up for use with hid_listen. * Reverted the default keymap to use tap_layer_key rather than custom. Moved custom approach to keymap_debug.c * Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function. * Cleaned up JD45 keymap that uses tapkey. * Redid minivan keymap with numsym rather than raise/lower. Untested. * Created my MJT keymap for HHKB Enabled dynamic macros and moved somoe of the shortcuts around. * Minor keymap fixes to make them compile without errors. * Added home/end to right arrow cluster on DYN layer. * Added more keys to fn and dyn layers. * It wasn't using my custom layer last time somehow...? Now it will. * Compiled and installed at end of day on 8/23 * Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback. * Fixed volume controls... were reversed and disabled. * Added F13-F15 back to fkeys layer in Minivan * Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan. * Removed DYN layer. * Fixed diagram in planck numsym. * Cleanup for pull request. * Roadkit flip phone warning. * Replaced PLAY_NOTES_ARRAY to PLAY_SONG * reset the submodules * checked out specific commits for submodules * Removed debugging from JD45 shared config.h * Moved custom rules.mk to apropriate keymap Reset the shared rules.mk file. * Trailing return issue in rules.mk Gotta make for a smooth pull request :-)
2017-08-27make ergodone's led work wellToshiki Yagi2-12/+98
2017-08-27Updated readme to new standard.unknown1-128/+9
2017-08-27Updated my files and added debouncingunknown4-53/+211
2017-08-26Add mbsurfer Let's Split keymap with RGB layer indicators (#1638)Cory Shaw3-0/+298
2017-08-26Merge in gaming layout.Joe Wasson1-16/+32
2017-08-26Add split layout to more keyboards.Joe Wasson4-2/+4
2017-08-25Improve default layout of 9key and give example macroCory Shaw1-22/+40
2017-08-25Increase time for tap dancing on 9key defaultCory Shaw1-1/+1
2017-08-25Update Bishop Keyboards url to relaunched siteCory Shaw1-1/+1
2017-08-25Add 9key to keyboards readmeCory Shaw1-0/+1
2017-08-24Add split ansi layout and talljoe's keymap.Joe Wasson9-1/+148
2017-08-24update travis scriptJack Humbert1-1/+2
2017-08-24update ergodox linksJack Humbert1-2/+2
2017-08-24Fix broken linkMarkus Kohler1-1/+1
2017-08-24Creates a layouts/ folder for keymaps shared between keyboards (#1609)Jack Humbert451-1477/+1651
* include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches
2017-08-23update 9key readmeJack Humbert1-1/+1
2017-08-23update build scriptJack Humbert1-10/+5
2017-08-23Update keymap.cSteve Holt1-138/+156
2017-08-23Update config.hSteve Holt1-7/+4
2017-08-23Update MakefileSteve Holt1-1/+1
2017-08-23fix link bracketsJonathan Boyett1-1/+1
2017-08-23fix(9key): Fix layout of 9key readmeCory Shaw1-1/+1
2017-08-23update(9key): Add readme with updated formatCory Shaw1-0/+17
2017-08-23Add support for 9key by Bishop KeyboardsCory Shaw7-0/+196
2017-08-23JD40 MiniVan portJonathan Boyett4-0/+62
2017-08-22Adding MakefileRyan MacLean1-0/+1
Required for JIS layouts
2017-08-22Creating Mac Version of JIS KeymapRyan MacLean1-0/+58
Swapping command and alt, restoring fn+left for delete, subbing in grave for hhkb key.