Commit Graph

2676 Commits (2d59c97ec16914835c55a409b460ecc79eba152d)

Author SHA1 Message Date
Christopher Browne 2d59c97ec1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-28 12:42:21 -04:00
Jack Humbert 80667e898a Merge pull request #572 from algernon/f/tap-dance-debug
tap-dance: Add some debugging support
2016-07-28 12:28:30 -04:00
Jack Humbert e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build
Fix bone2planck build
2016-07-28 12:27:46 -04:00
Jack Humbert a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings
kill warnings filling up travis buildlog
2016-07-28 12:27:11 -04:00
Jack Humbert 36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
update NO_AMP to NO_AMPR
2016-07-28 12:26:43 -04:00
Jack Humbert f96a2a74ea Merge pull request #566 from SmackleFunky/master
Allow toggling out of plover layer
2016-07-28 12:26:11 -04:00
Jack Humbert 9171ce1d17 Merge pull request #559 from Talljoe/fix-compiler-warning
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
2016-07-28 12:24:42 -04:00
Jack Humbert 8d98f37fbb Merge pull request #564 from mazinbokhari/master
Move to keyboards
2016-07-28 12:24:03 -04:00
Christopher Browne 911d0a040e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-27 12:57:54 -04:00
Gergely Nagy b21e8b97ac tap-dance: Add some debugging support
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-27 14:49:19 +02:00
Seth Chandler 180a3da44d remove unnecessary includes 2016-07-27 02:32:15 -04:00
Seth Chandler 95ef3f864e fix numerous errors in bone2planck keymap 2016-07-27 02:30:17 -04:00
Seth Chandler 368d0bdf68 kill warnings filling up travis buildlog 2016-07-27 02:21:09 -04:00
Seth Chandler 13bb3a7379 update NO_AMP to NO_AMPR 2016-07-27 02:06:19 -04:00
SmackleFunky fdd07991de Allow toggling out of plover layer 2016-07-27 04:44:24 +00:00
Mazin Bokhari 3fd1c9d72b Move to keyboards 2016-07-26 22:43:04 -05:00
Erez Zukerman 93f366fa7d Merge pull request #562 from michaelklos/doc
Added Tap Dance Example
2016-07-26 21:54:10 -04:00
Erez Zukerman 685c8ba64c Merge pull request #533 from mazinbokhari/master
Add my layout optimized for working in emacs, vim, command line, etc.
2016-07-26 21:52:39 -04:00
Michael Klos 7e69de061a Added Tap Dance Example
Added (simple) Tap Dance example implementation steps.
2016-07-26 18:41:35 -04:00
Christopher Browne 2a349e96bb Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-26 16:35:44 -04:00
Jack Humbert b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
erlo muvman 26510e6de8 Delete default.png 2016-07-25 20:16:11 -05:00
erlo muvman 3779e1988e Delete default_highres.png 2016-07-25 20:16:07 -05:00
erlo muvman 97efac0f1c Update readme.md 2016-07-25 20:14:19 -05:00
erlo muvman 6e2d7ebd80 Update readme.md 2016-07-25 20:12:48 -05:00
erlo muvman 048e8b7849 Update readme.md 2016-07-25 20:06:58 -05:00
Christopher Browne 17a7570e08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-25 12:55:46 -04:00
Jack Humbert f9aadd17e8 Merge pull request #558 from lindhe/master
Fix misspelled command in Norwegian helper
2016-07-25 11:16:54 -04:00
Andreas Lindhé 283ebbe142 Change Nordic ampersand code to match the English
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
2016-07-25 12:50:56 +02:00
Andreas Lindhé b6fa762234 Fix misspelled command in Norwegian helper 2016-07-25 11:29:54 +02:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert 4aa7d2e206 Merge pull request #554 from robertdale/music-recording-documentation
Added music recording/playing doc
2016-07-24 21:58:23 -04:00
Jack Humbert 24bd931962 Merge pull request #552 from robertdale/music-play-fix
Fixes issue #551 - ensure there's a recording to play before playing
2016-07-24 21:58:01 -04:00
Jack Humbert 41f15d8c34 Merge pull request #550 from Darthabel/fix_bepo
Fix some errors in bepo mapping
2016-07-24 21:57:38 -04:00
Jack Humbert 46f84157ce Merge pull request #549 from locksmithdon/patch-1
Added LEADER_EXTERNS() call to readme.
2016-07-24 21:57:15 -04:00
Jack Humbert 670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic
CMD keymap for Preonic
2016-07-24 21:56:50 -04:00
Jack Humbert 384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup
Satan cleanup
2016-07-24 21:56:23 -04:00
Erez Zukerman 4885225159 Merge pull request #534 from willwm/teckinesis
Teckinesis for ErgoDox EZ
2016-07-24 18:04:59 -07:00
Will Wolff-Myren f4cb84c940 Remove images, per @ezuk request. =) 2016-07-24 14:33:17 -07:00
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 2016-07-24 12:56:28 -07:00
Erez Zukerman 1e944a4991 Merge pull request #542 from algernon/f/hold-the-dance
Tap-dance: support for holding keys
2016-07-24 11:36:05 -07:00
Erez Zukerman 36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon
ergodox_ez: Update my keymap to v1.3
2016-07-24 11:34:33 -07:00
Robert Dale 812007a241 added music recording/playing doc 2016-07-24 10:23:33 -04:00
Robert Dale 3ea738e450 ensure there's a recording to play before playing; also enables the LGUI button to play a tone 2016-07-24 10:00:39 -04:00
Vivien Alger 7b4d30ee50 Fix some errors in bepo mapping 2016-07-24 10:57:49 +02:00
Don Smith a4034b75c0 Added LEADER_EXTERNS() call.
This seems to be needed in most cases.
2016-07-24 19:18:22 +12:00
Jonathan Lucas e6a41e43aa Updated Readme 2016-07-23 21:26:01 -07:00
commandlinedesign c826bcfc39 Did a derp and forgot to set Trans on Arrow layer 2016-07-23 21:08:00 -07:00
commandlinedesign 4480a74a4b Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position 2016-07-23 21:02:23 -07:00
commandlinedesign c1fb82623c Tested, resolved Mouse issue, resolved numpad issue 2016-07-23 20:02:45 -07:00