summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-25Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-07-25Merge pull request #558 from lindhe/masterJack Humbert
Fix misspelled command in Norwegian helper
2016-07-25Change Nordic ampersand code to match the EnglishAndreas Lindhé
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
2016-07-25Fix misspelled command in Norwegian helperAndreas Lindhé
2016-07-24Fixes midi functionalityJack Humbert
2016-07-24Merge pull request #554 from robertdale/music-recording-documentationJack Humbert
Added music recording/playing doc
2016-07-24Merge pull request #552 from robertdale/music-play-fixJack Humbert
Fixes issue #551 - ensure there's a recording to play before playing
2016-07-24Merge pull request #550 from Darthabel/fix_bepoJack Humbert
Fix some errors in bepo mapping
2016-07-24Merge pull request #549 from locksmithdon/patch-1Jack Humbert
Added LEADER_EXTERNS() call to readme.
2016-07-24Merge pull request #548 from CommandLineDesign/CMD-PreonicJack Humbert
CMD keymap for Preonic
2016-07-24Merge pull request #546 from sethbc/satan-cleanupJack Humbert
Satan cleanup
2016-07-24Merge pull request #534 from willwm/teckinesisErez Zukerman
Teckinesis for ErgoDox EZ
2016-07-24Remove images, per @ezuk request. =)Will Wolff-Myren
2016-07-24Merge pull request #542 from algernon/f/hold-the-danceErez Zukerman
Tap-dance: support for holding keys
2016-07-24Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman
ergodox_ez: Update my keymap to v1.3
2016-07-24added music recording/playing docRobert Dale
2016-07-24ensure there's a recording to play before playing; also enables the LGUI ↵Robert Dale
button to play a tone
2016-07-24Fix some errors in bepo mappingVivien Alger
2016-07-24Added LEADER_EXTERNS() call.Don Smith
This seems to be needed in most cases.
2016-07-23Updated ReadmeJonathan Lucas
2016-07-23Did a derp and forgot to set Trans on Arrow layercommandlinedesign
2016-07-23Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen positioncommandlinedesign
2016-07-23Tested, resolved Mouse issue, resolved numpad issuecommandlinedesign
2016-07-23Resolved errorscommandlinedesign
2016-07-23Init ReadmeJonathan Lucas
This needs a better description.
2016-07-23Create MakefileJonathan Lucas
This is untested, use caution.
2016-07-23Create CMD-Preonic KeymapJonathan Lucas
This is very Alpha-Mode, and has not been tested or even Made yet.
2016-07-23Merge pull request #1 from jackhumbert/masterJonathan Lucas
Update from parent
2016-07-23fix typo in readme and satan.hSeth Chandler
2016-07-23cleanup default layoutSeth Chandler
2016-07-23update sethbc keymapSeth Chandler
2016-07-22readme.md: Update the tap dance docsGergely Nagy
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22readme.md: algernon is strictly lowercaseGergely Nagy
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22tap-dance: Code cleanupGergely Nagy
Removes a number of duplicated code, by passing actions around instead of keycodes, so the various dance action functions do not have to look up the action, but the caller does that for them. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22tap-dance: Support user_data for the callbacksGergely Nagy
Refactored the code a little, so all callbacks now receive a `user_data` pointer, which can be anything. As an example, the key pairs from `ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions. This makes it easier to extend the tap dance functionality, and also simplifies the code a little. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22tap-dance: Support for holding keysGergely Nagy
With this change, tap dance will now store the pressed state of the tap-dance key, and allow one to make an action sooner, while the key is still held, and only unregister when the key is released. The registration must happen in the `on_dance_finished` callback, while unregistering goes to `on_reset`. The surrounding code makes sure not to call either multiple times. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-21Merge pull request #543 from VoodaGod/bone2planckJack Humbert
updated bone2planck
2016-07-21Merge pull request #541 from milestogo/masterJack Humbert
initial kinisis advantage build
2016-07-21Merge pull request #540 from replicaJunction/feature-atreus-keymapFunctionJack Humbert
Adjusted Atreus KEYMAP() function.
2016-07-21Merge pull request #538 from robertdale/preonic-map-correctionJack Humbert
Preonic: Corrected the ascii layout to match the coded layout
2016-07-21Merge pull request #536 from pvinis/debug-docJack Humbert
add some debugging doc, after i found out how to print debug messages
2016-07-21Merge pull request #530 from sethbc/masterJack Humbert
Misc. fixes from sethbc
2016-07-21Merge pull request #529 from CommandLineDesign/CMD60-newKeymapJack Humbert
Added CMD60 keymap
2016-07-21Merge pull request #525 from edasque/masterJack Humbert
Added Docker as a simple way to build firmwares
2016-07-21Merge pull request #522 from exiva/extrakey-macfixJack Humbert
Fix OS X Recognizing keyboard as Mouse/Tablet
2016-07-21Merge pull request #521 from exiva/makefile-waitJack Humbert
Make DFU wait for bootloader
2016-07-21Merge pull request #518 from jakllsch/upstreamJack Humbert
keymap_extras changes
2016-07-21Merge pull request #516 from pvinis/tap-dance-anywayJack Humbert
Tap dance anyway
2016-07-20adding traveller keyboardmilestogo
2016-07-20fixed include pathsJason Janse van Rensburg