Commit Graph

7421 Commits

Author SHA1 Message Date
Jason Janse van Rensburg
a41a7a9100 include base config.h instead of copying it 2016-07-26 16:19:34 +02:00
Jason Janse van Rensburg
8244fa40cc added config.h, and missing Ins of filpped navigation layer 2016-07-26 14:58:17 +02:00
Joshua T
5607b716ba Merge remote-tracking branch 'upstream/master' 2016-07-26 01:49:24 -05:00
Joshua T
876a6bdd4c Modified Atreus extend and Ergodox.
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
2016-07-26 01:44:57 -05: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
Jason Janse van Rensburg
27d27b179b Merged branch master into bone2planck 2016-07-25 22:55:28 +02:00
Jason Janse van Rensburg
3e462fac31 added missing F keys in flipped layer 2016-07-25 20:21:32 +02: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
Toni
5e2e8c89e8 Merge remote-tracking branch 'origin/master' into iso_split_rshift
whatever
2016-07-25 12:49:38 +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
Jason Janse van Rensburg
4e0bf283f6 added readme 2016-07-24 05:11:07 +02:00
commandlinedesign
c1fb82623c Tested, resolved Mouse issue, resolved numpad issue 2016-07-23 20:02:45 -07:00
Jason Janse van Rensburg
1bfd57e234 moved insert 2016-07-24 05:02:06 +02:00
Jason Janse van Rensburg
58f092cf87 moved ctrl 2016-07-24 04:52:35 +02:00
commandlinedesign
fbafb9449e Resolved errors 2016-07-23 19:32:02 -07:00
Jason Janse van Rensburg
34bce6f206 fixed stupid errors 2016-07-24 04:08:40 +02:00
Jason Janse van Rensburg
62d4ce73ec Merged branch master into bone2planck 2016-07-24 04:08:01 +02:00
Jonathan Lucas
9b3708f830 Init Readme
This needs a better description.
2016-07-23 18:52:52 -07:00
Jonathan Lucas
3c7075011b Create Makefile
This is untested, use caution.
2016-07-23 18:50:41 -07:00
Jonathan Lucas
b5761df57b Create CMD-Preonic Keymap
This is very Alpha-Mode, and has not been tested or even Made yet.
2016-07-23 18:47:36 -07:00
Jonathan Lucas
4059a16118 Merge pull request #1 from jackhumbert/master
Update from parent
2016-07-23 18:44:01 -07:00
Seth Chandler
75f0922711 fix typo in readme and satan.h 2016-07-23 20:55:20 -04:00
Seth Chandler
ef533be2d6 cleanup default layout 2016-07-23 20:52:27 -04:00
Seth Chandler
81fe3d962c update sethbc keymap 2016-07-23 20:37:41 -04:00
Stephen Christie
723857bf8a Table for Fn
layer.
2016-07-22 18:19:07 -04:00