_/qmk_firmware
1
0
Fork 0
Code Releases Activity
2103 commits 1 branch 0 tags 126 MiB
Commit graph

412 commits

Author SHA1 Message Date
Maciej Piechotka
cf986ba504 Add waits to prevent KVM from hanging 2016-03-17 08:18:03 -07:00
Maciej Piechotka
fb3b7f32c0 Put frequently used keys in shell (-=) under thumb 2016-03-17 08:18:03 -07:00
Maciej Piechotka
5d8f4ff957 Add missing breaks in mpiechotka ergodox_ez keyboard 2016-03-17 08:18:03 -07:00
Miguel Palhas
8aa559b825 Adds naps62's layout 2016-03-15 11:40:15 +00:00
Alex Johnstone
e4b7ce41e3 Started my keymap 2016-03-11 22:27:03 -08:00
yoyoerx
58bbfc5fa6 PR190hotfix.sh, fresh hexes, makeallhex.sh script 2016-03-11 11:16:19 -05:00
yoyoerx
641859df84 Addressed void* return warning in all keymaps 2016-03-10 11:28:34 -05:00
Stephan Bösebeck
3119778e0c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-08 23:56:50 +01:00
Erez Zukerman
7d3ebd7b40 Adds a readme with a link to the blog post 2016-03-08 03:50:57 +02:00
Nicholas Keene
9d06063a23 The Ordinary Layout, designed to be similar to traditional keyboards, by Nicholas Keene, released to the public domain, no rights reserved 2016-03-06 23:12:29 -06:00
Stephan Bösebeck
46ddbd1fe2 forgot F6 2016-03-02 08:43:21 +01:00
Stephan Bösebeck
fbfb034337 updated version, changed F-Key-Layout, minor change in code layer 2016-03-02 08:40:38 +01:00
Stephan Bösebeck
861429aa44 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-02 08:32:13 +01:00
Jack Humbert
d33681aa22 Merge pull request #157 from DidierLoiseau/typematrix 
Small fixes and improvements to tm2030 layout
 2016-02-21 13:35:08 -05:00
Didier Loiseau
a40273c7d7 Updated tm2030 keymap.hex 2016-02-21 19:10:03 +01:00
Didier Loiseau
e336af79eb Fixed compilation warnings due to missing return statements 2016-02-21 18:56:21 +01:00
Stephan Bösebeck
f0dfe8ab97 testing moving the 6 to the left, having one key more on the right used for hash now 
feels a bit more natural to me. Need to investigate further.
 2016-02-15 14:13:29 +01:00
Erez Zukerman
2c29ce3cfe Merge pull request #141 from XenoBits/master 
Ergodox EZ new keymap for C# developers
 2016-02-12 08:50:01 -05:00
Maxime Millet
9eea6850f9 Another readme.md improvement 2016-02-12 12:01:36 +01:00
Maxime Millet
8f1bafece5 Improved readme 2016-02-12 12:00:13 +01:00
Maxime Millet
8c051f2d05 Added C# developer keymap 2016-02-12 11:54:27 +01:00
Erez Zukerman
f4fc7fd4d5 Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-definitions 
Norwegian Colemak Ergodox and Norwegian key definitions
 2016-02-11 20:40:47 -05:00
joar
2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 2016-02-11 16:28:28 +01:00
Erez Zukerman
9f6966f765 More tweaks to experimental layout 2016-02-11 16:55:10 +02:00
Erez Zukerman
9e075e28be Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-02-11 16:39:40 +02:00
Erez Zukerman
ec4428b1c6 Merge pull request #138 from Willyfrog/master 
ergodox_ez for emacs + mac + altgr users
 2016-02-10 15:40:25 -05:00
Guillermo Vayá
f96186ed9c add image 2016-02-10 19:04:26 +01:00
Guillermo Vayá
3c805548d9 added .hex file 2016-02-10 09:47:11 +01:00
Maciej Piechotka
03f61dcdb4 Add mpiechotka ergodox ez keymap 2016-02-09 23:37:02 -08:00
Erez Zukerman
cd90dd9f6d Corrects typo 2016-02-08 15:22:56 +02:00
Erez Zukerman
67f14d938b Merge pull request #130 from jacobono/jacobono 
Jacobono
 2016-02-08 08:01:54 -05:00
Erez Zukerman
ac84fa47fc Updates documentation, adds Cmd/Win dual-function key 2016-02-08 14:56:19 +02:00
Didier Loiseau
a2f6ab16c0 FN macro: use layer_invert() instead of modifying layer_state directly 
- fixes stuck keys from the temporary layers
  (see also jackhumbert/qmk_firmware#78)
- removed the workaround for jackhumbert/qmk_firmware#81
  (using layer_invert() fixes the problem)
 2016-02-07 23:33:37 +01:00
Didier Loiseau
7ba42b994b Fixed inconsistency between comment and actual numeric layer 
- KC_INS should only be present on Fn layer
 2016-02-07 23:33:37 +01:00
DidierLoiseau
47fc8b8dbd Fixed link to Magic doc in Dvorak section 2016-02-07 23:31:27 +01:00
Daniel Mijares
b5b9885df7 add hex file 2016-02-06 13:59:30 -05:00
Daniel Mijares
f5c1d6d1db my personal ergodox keymap layout 
with pngs of layout and readme
 2016-02-06 11:38:20 -05:00
Erez Zukerman
3c683aa9f2 Fixes CM_SCLN and updates docs for Colemak 2016-02-05 16:28:24 +02:00
Erez Zukerman
1b0d0c6848 Tweaks symbol layer (see changleog) 2016-02-05 16:22:21 +02:00
Charles Maresh
a9ad5c55c8 Disable console for improved performance 
Commenting out the line is the only way to disable the console, as the
value of CONSOLE_ENABLE isn't checked. There are only checks for its
existence; setting it to `yes` or `no` doesn't change the compilation.
 2016-02-03 17:05:49 -06:00
Erez Zukerman
f24c69d177 Refreshes default keymap for single tap L1 switch 2016-02-01 15:37:27 +02:00
Guillermo Vayá
34eb5dfb97 new emacs + osx + deadkeys layout 2016-01-31 11:44:41 +01:00
Stephan Bösebeck
602090a430 some fixes in readme 2016-01-31 00:21:34 +01:00
Stephan Bösebeck
1531350125 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-31 00:17:25 +01:00
coderkun
a75cc8463f add build instructions to readme 2016-01-30 12:37:09 +01:00
coderkun
38f8ed9a0c correct link and some minor details in readme file 2016-01-30 12:29:30 +01:00
coderkun
d959f23e5e add readme file for coderkun’s Neo2 layout 2016-01-30 12:26:32 +01:00
coderkun
7f4eb72b9d add layers for poor man’s QWERTZ and poor man’s Neo including Neo’s layer 4 2016-01-30 12:06:31 +01:00
Stephan Bösebeck
bf64046a04 fixed some copy paste errors 2016-01-29 23:43:56 +01:00
Stephan Bösebeck
7b989a962e added a egoshooter layer 2016-01-29 23:31:58 +01:00
Stephan Bösebeck
93a74d9cb1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-29 07:46:48 +01:00
Christoph Schmitz
21c4dfe983 Added .hex file. 2016-01-28 20:22:48 +01:00
Christoph Schmitz
9bb20de578 Fixed graphics. 2016-01-28 20:20:19 +01:00
Christoph Schmitz
a38fa4b727 Added media layer. 2016-01-28 20:17:45 +01:00
Christoph Schmitz
9abd1eea79 Added links. 2016-01-28 20:05:58 +01:00
Christoph Schmitz
28d2b93b0a Added documentation. 2016-01-28 19:55:14 +01:00
Christoph Schmitz
c8e7f9bbfc Made all layer change keys momentary. Removed Hyper and Meh in favor of layer 1 and 2 on both halves. 2016-01-28 19:53:58 +01:00
Stephan Bösebeck
f153374517 added new macros 2016-01-28 15:58:19 +01:00
Stephan Bösebeck
2776251ffc playing more with cursor keys 2016-01-28 15:37:52 +01:00
Stephan Bösebeck
4beb0115ff playing a bit with cursor keys 2016-01-28 14:56:55 +01:00
Christoph Schmitz
fdad7ecff9 Switched up and down keys to be closer to the vi etc. world. 2016-01-27 22:05:11 +01:00
Christoph Schmitz
0c66ca026e Fixed circonflex key. 2016-01-27 20:24:14 +01:00
Christoph Schmitz
bf257e3b37 Fixed regarding Ctrl and Alt keys. 2016-01-27 20:14:11 +01:00
Christoph Schmitz
1308135655 Added a German layout inspired by the Kinesis Ergo Elan and based on the "german" keymap. 2016-01-27 19:47:42 +01:00
Stephan Bösebeck
f6dab10288 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-25 21:47:57 +01:00
tonyabra
baddbc6b23 Simplified osx layout for ergodox ez 2016-01-24 23:33:26 -06:00
Stephan Bösebeck
f958b2e832 typo fix 2016-01-24 21:54:31 +01:00
Jack Humbert
6a55a5fe48 not sure how this got here.. 2016-01-23 20:40:40 -05:00
Jack Humbert
c753bfcc14 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio 2016-01-23 20:32:51 -05:00
Stephan Bösebeck
42a22af446 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-23 22:41:05 +01:00
DidierLoiseau
3e31fa4c50 Fixed rendering of the Layer Switching section 2016-01-23 19:29:14 +01:00
DidierLoiseau
606d63e602 Fixed small issues in README.md 
- fixed rendering of the basic layer on GitHub
- fixed missing Calculator, Mail & Browser Home keys in Fn Layer
 2016-01-23 19:18:37 +01:00
Didier Loiseau
b0d7d9d922 Added keymap.hex 2016-01-23 18:59:06 +01:00
Didier Loiseau
294bd25615 Moved layout description to README.md and added more details 2016-01-23 18:56:32 +01:00
Didier Loiseau
96b9089d9f Added Calculator, Mail and Browser Home application keys. 2016-01-23 18:16:19 +01:00
Didier Loiseau
67583b2f4a Renamed "Numbers Layer" to "Numeric Layer" 2016-01-23 18:04:45 +01:00
Didier Loiseau
e5f84058bb Implemented new folders structure. 
moved keymap_typematrix.c to tm2030/keymap.c
 2016-01-23 16:59:33 +01:00
Didier Loiseau
ad2a4c3203 Merge remote-tracking branch 'jackhumbert/master' into typematrix 2016-01-23 16:44:59 +01:00
Olivier Lechevalier
51fec6647a Add colemak keymap to Ergodox EZ. 2016-01-23 14:09:42 +09:00
Evan Pitstick
caf82bcace Single tap enable ACTION_LAYER_TAP_TOGGLE layer 2016-01-22 07:33:56 -05:00
Stephan Bösebeck
f95e3e701c new hex file 2016-01-22 08:22:59 +01:00
Stephan Bösebeck
9d03f48643 reinstalled lost file, updated with some tweaks 2016-01-22 08:22:23 +01:00
Stephan Bösebeck
610b77f1f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-22 08:19:39 +01:00
Stephan Bösebeck
f0a873aca1 changed some places, disabled layer3, in file it's ADNW now 2016-01-22 08:18:13 +01:00
Erez Zukerman
776017aa26 Adds the hex files too 2016-01-22 03:53:53 +02:00
Erez Zukerman
1598a8c46a Introduces new subdirectory structure 2016-01-22 03:51:59 +02:00
Stephan Bösebeck
a07a8079da added koy layer to default, but disabled it 2016-01-21 09:50:06 +01:00
Stephan Bösebeck
ce9086c507 replaced qwertz with adnw-koy as default 2016-01-21 09:37:58 +01:00
Stephan Bösebeck
fa53ad5136 swapping modeswitch and Acut-Chars on thumb block 2016-01-21 09:13:44 +01:00
Erez Zukerman
7f84ab6ad9 Adds a bunch of compiled files 2016-01-20 05:49:38 +02:00
Erez Zukerman
922545240b renames readme 2016-01-20 05:34:00 +02:00
Erez Zukerman
6b0ca4aee4 Renames hex 2016-01-20 05:31:56 +02:00
Erez Zukerman
d97daecbf7 Updates Markdown image link 2016-01-20 05:30:35 +02:00
Erez Zukerman
f25bb0ef52 Adds a readme and hex for my experimental layout 2016-01-20 05:26:10 +02:00
Erez Zukerman
5adc810e8c New per-folder format for ErgoDox EZ keymaps 2016-01-20 05:19:50 +02:00
Erez Zukerman
1454e4664d Makes ' into a dual-action key for LGui 2016-01-19 17:55:47 +02:00
Erez Zukerman
9afa3772de Adds an experimental keymap for my own use 2016-01-19 17:37:36 +02:00
Erez Zukerman
393f26f250 Merge pull request #73 from dragon788/dragon_mod 
Requesting some comments and review on my changes
 2016-01-18 19:38:32 -05:00
Didier Loiseau
fb18130408 Implemented Dvorak layer 2016-01-17 15:02:33 +01:00
dragon788
e04464c7ab Having media layer defined causes toggles to 'stick' rather than be momentary in my experience 2016-01-16 12:31:13 -06:00
dragon788
6940a961fd Resetting keymap_default.c to origin/master not just my fork's master 2016-01-16 12:21:49 -06:00
dragon788
a19f149eb2 Moving my layout to its own file, made plover layout file, restoring default keymap to its default status 2016-01-16 12:15:06 -06:00
Jonathan Arnett
10ab4eff06 Merge branch 'master' into j3rn-keymap 2016-01-16 09:54:46 -05:00
Jonathan Arnett
2de371564d Added keymap_j3rn_README.md 2016-01-16 09:49:21 -05:00
Didier Loiseau
93e350caa1 Added shifts on the thumbs 2016-01-16 00:38:13 +01:00
Erez Zukerman
9487e92a6e Merge pull request #89 from coderkun/master 
add coderkun’s ErgodoxEZ keymap (Neo2)
 2016-01-15 15:28:10 -05:00
coderkun
bd9aebc84a merge upstream 2016-01-15 20:19:45 +01:00
coderkun
57bf227f6d add basic layer 2 2016-01-15 19:09:13 +01:00
Jonathan Arnett
79940c5825 Change lower-left control to momentary L1 
There's so many control keys in this keymap, one needed to go. So, I changed
the lower-left control key to be a momentary L1, just like the same key on the
right side.
 2016-01-15 11:36:27 -05:00
Jonathan Arnett
8585269a07 Version 1.0.0 2016-01-15 11:36:21 -05:00
Stephan Bösebeck
7783b47b8b updated cheat sheet, hex file 2016-01-15 16:04:55 +01:00
Stephan Bösebeck
e44c30f203 using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination 2016-01-15 15:55:00 +01:00
Stephan Bösebeck
831a21899f updating layout png 2016-01-13 14:04:46 +01:00
Stephan Bösebeck
6215ce2a89 adding fixed hex file 2016-01-13 13:37:29 +01:00
Stephan Bösebeck
2bde3f550f typo fix 2016-01-13 13:30:01 +01:00
Stephan Bösebeck
eea41339b9 added adnw layout 2016-01-13 13:17:28 +01:00
Stephan Bösebeck
7ef03c59db typo and copy past fix 2016-01-13 13:16:05 +01:00
Stephan Bösebeck
06bdd4869f minor fix 2016-01-13 11:53:09 +01:00
Stephan Bösebeck
c9a76723ac bugfix 2016-01-13 11:45:35 +01:00
Stephan Bösebeck
ddab0dc32c updated ANDW layout 2016-01-13 11:38:24 +01:00
Stephan Bösebeck
8e17ca0339 Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-01-13 11:24:54 +01:00
Stephan Bösebeck
684c6849f9 andw layout added 2016-01-13 11:21:55 +01:00
Erez Zukerman
a085265aaa Disables debug console by default for improved performance 2016-01-12 22:32:29 +02:00
coderkun
e4d087c7c0 add basic layer 1 2016-01-12 07:01:02 +01:00
coderkun
6050971d01 add neo2 keymap for ergodoxEZ 2016-01-12 06:28:24 +01:00
Jack Humbert
29de37d5c0 pwm audio 2016-01-11 16:53:33 -05:00
Didier Loiseau
d3e4cc9af6 Implement cut/copy/paste as macros 
Workaround for jackhumbert/qmk_firmware#81
+ added macro names
+ removed unused macro 0
 2016-01-10 19:49:08 +01:00
Didier Loiseau
d9b1c8d360 Added fn-eject, fn-power .. fn-pause keys 
Eject does not work though, see jackhumbert/qmk_firmware#82
and tmk/tmk_keyboard#250
 2016-01-10 19:15:33 +01:00
Erez Zukerman
5e376cb595 Merge pull request #80 from agriffis/kinesis-clone 
Add ergodox_ez keymap to match Kinesis Contoured.
 2016-01-10 10:57:13 -05:00
Aron Griffis
386ca6531b Rename to keymap_kines-ish.c and add README 2016-01-10 10:25:16 -05:00
Stephan Bösebeck
2311754a89 added mouse wheel support, CMD-V/CMD-C instead of CTRL 2016-01-10 00:02:05 +01:00
Stephan Bösebeck
6ccf3d2da1 removed left space key in favor of a backspace 2016-01-09 23:47:26 +01:00
Stephan Bösebeck
6f9cd2d489 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-09 23:37:34 +01:00
Aron Griffis
8607859c77 Add ergodox_ez keymap to match Kinesis Contoured. 
This keymap attempts to match the Kinesis Contoured (aka Advantage) default
layout as closely as possible. See
http://www.kinesis-ergo.com/wp-content/uploads/2013/06/advantage_layout_win.pdf

Apart from the obvious mappings, this keymap also:

* removes the dual-purpose momentary layer/normal keys: Z, /, and Grv;
  because the author--coming from a Kinesis keyboard--finds the delays and
  accidental modifiers to be more disconcerting than helpful.

* puts Esc in the bottom left since there's no place for it in the top
  left to match the Kinesis.

* changes the bottom-right key into an L2 toggle since there's otherwise no
  way to get to L2.

* adds PrScr, ScrLk and Pause to the L1 keymap, down the left side, since
  they're present on the Kinesis but not available in the default
  ergodox_ez keymap.
 2016-01-09 13:17:25 -05:00
Aron Griffis
25b4a98a75 Refer to SYMB and MDIA in default ergodox_ez keymap. 2016-01-09 12:35:42 -05:00
Didier Loiseau
bfda6ee417 Split fn layer from numbers layer to better match the TM behaviour 
- removed access to layer 2 from ";" key
- "fn" key toggles both layers 1 & 2
- replaced media and mouse layer by fn layer
- renamed symbol layer to numbers layer
- moved all F-keys together on left hand
 2016-01-09 18:21:21 +01:00
Didier Loiseau
38a0e62a10 Layer 1: restore backspace, ralt and ctl on right hand 
- home replaced by KC_TRNS to make backspace available
- prev/next moved left to space to restore ralt
- arrows moved down to have reversed T-shape
- added ctl on bottom right KpEnter, to match layer 0
- removed alt from mute, as it was already no more in layer 0
 2016-01-09 18:15:49 +01:00
Didier Loiseau
56070d424b Added description of the layout and main differences with real TM 2016-01-09 18:15:48 +01:00
Didier Loiseau
2818acefe6 Make bottom row more similar to the TM 
- keep home/end at the same location
- RAlt as first key on the bottom right row
- left/right arrows moved on the thumb, near the other arrows
- added Alt on App
- added Alt on Mute in Layer 1
- removed ALT from left spaces to avoid issues when pressing too slowly
 2016-01-09 18:15:48 +01:00
Didier Loiseau
8677ec0c9f Use 3rd led as caps-lock indicator 2016-01-09 18:10:24 +01:00
Didier Loiseau
ac94577cbe TypeMatrix keymap: Layer 1 (Fn Layer) 2016-01-09 18:10:24 +01:00
Didier Loiseau
900c1f991d Initial TypeMatrix keymap: Layer 0 2016-01-09 18:10:10 +01:00
Didier Loiseau
00c3ecc238 Initial TypeMatrix keymap: Layer 0 2016-01-08 23:57:37 +01:00
Jack Humbert
11ce694557 Merge pull request #77 from chwilk/master 
Keymap to approximate Kinesis Advantage line of keyboards
 2016-01-08 11:54:40 -05:00
chwilk
92dcabe099 Moving around modifiers to match KA better 2016-01-08 10:47:14 -06:00
Seth Herr
1d463d961f Fix homebrew references 
Replaces #64
 2016-01-06 09:41:42 -06:00
Stephan Bösebeck
d74332c11d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-06 14:28:13 +01:00
Jack Humbert
9f4716a4b1 Merge pull request #60 from rothgar/dvorak 
added dvorak keymap and layout picture
 2016-01-06 00:04:59 -05:00
Jack Humbert
ff8f171cc1 Merge pull request #70 from sperochon/ergodox_ez_fr 
Ergodox_ez french OS X
 2016-01-06 00:02:27 -05:00
Andrew Fecheyr
a4a4952f4b Andrew's OSX ergodox ez keymap 2016-01-05 11:44:08 +01:00
Sébastien Pérochon
bee19e5261 ergodox_ez: Add keymap_osx_fr hex file 2016-01-05 10:56:10 +01:00
Sébastien Pérochon
14b4a01e7e ergodox_ez: Add French keymap for OSX (keymap_osx_fr) based on keymap_default_osx 2016-01-05 10:49:49 +01:00
Justin Garrison
6da712ce5e added jgarr keymap for custom dvorak layout :yay: 2016-01-04 09:18:06 -08:00
Stephan Bösebeck
3bb3e7a72c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-04 00:02:08 +01:00
dragon788
a07d2df99c Added calculator shortcut button to numpad/symbol layer 2016-01-02 21:16:45 -06:00
dragon788
ae842a5a0f Fixed Plover layer label and updated keymap 2016-01-02 18:46:31 -06:00
dragon788
45fec698d8 Added proper link back to Plover layout source 2016-01-02 15:12:00 -06:00
dragon788
4c3ecbc0b7 Added plover layer 2016-01-02 15:05:33 -06:00
Dave Jones
dcc9948fae Added comments to LED stuff and included .hex file 2016-01-02 18:23:49 +00:00
Dave Jones
7ba06c9e0d Dave's custom keymap 
This moves the keys closer to a traditional layout with some redundancy
around the middle to compensate for fast non-traditional typists like
myself who tend to wander from the home row a fair bit. Navigation keys
are provided in layer 2 (accessed by left thumb button), programming
symbols and classic numeric keypad in layer 1 (accessed by right thumb
button). Permanent layer switching is provided with a smaller thumb
button. Ctrl provided in place of caps lock (because no-one needs
caps/num lock), space, backspace, enter, shift all in traditional
positions with layer 1 providing things like equals, tilde and
apostrophe (an attempt to re-use existing muscle memory).

LEDs are pimped to the point of being silly (fading in/out on layer
switch, rolling on reboot ... because I can). Power and reset keys
provided on left thumb pad in layer 2.

No meh or hyper as I haven't found a burning need for them yet.
 2016-01-02 11:19:52 +00:00
MattLeBeauViewpoint
f1dea975d2 Small change to filename spelling in README 
Edited filename to remove plural case in example so that prefix is
correctly parsed in step 6.
 2015-12-31 10:16:51 -08:00
dragon788
d901511f76 Fixed button conflicts on mouse/media layer 2015-12-30 23:53:38 -06:00
dragon788
24e30249a4 Moving everything around, tap delays driving me nuts 2015-12-30 23:03:33 -06:00
Justin Garrison
14a5b4b5c8 added dvorak keymap and layout picture 2015-12-30 00:19:55 -08:00
dragon788
d1f8d0104b Merge branch 'master' of github.com:jackhumbert/qmk_firmware 
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
 2015-12-28 14:44:49 -06:00
Stephan Bösebeck
381ca294fe minor fixes, added backtick to left thumbblock 2015-12-25 00:00:30 +01:00
dragon788
b61ea5dfaf Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis-like 2015-12-23 22:05:59 -06:00
Jack Humbert
9814343336 Merge pull request #56 from sboesebeck/master 
fix number pad for german keys
 2015-12-23 12:01:27 -05:00
Erez Zukerman
58e237d2dc Updates readme 2015-12-23 15:28:13 +02:00
Stephan Bösebeck
7115196ddf fix number pad for german keys 2015-12-23 13:32:15 +01:00
Jack Humbert
694fe4e1e2 Merge pull request #55 from sboesebeck/master 
fixed some typos, learned, DE_-keycodes are for Win, not OSX
 2015-12-22 17:51:32 -05:00
Stephan Bösebeck
d3e54552fb fixed some typos, learned, DE_-keycodes are for Win, not OSX 2015-12-22 23:49:27 +01:00
Jack Humbert
b1fbd4c9ca Merge pull request #53 from sboesebeck/master 
minor updates
 2015-12-21 19:31:31 -05:00
Stephan Bösebeck
370e9028ac new firmware file containing current changes 2015-12-22 01:25:57 +01:00
Stephan Bösebeck
5f0965ce39 added png file for layout documentation 2015-12-22 01:23:53 +01:00
Stephan Bösebeck
d35b563816 minor changes, fixes 2015-12-22 01:18:03 +01:00
Technovangelist
42ca2e6684 swapped the space and enter to get the space under where the thumb is. 2015-12-21 10:20:02 -05:00
Technovangelist
a67ef035b8 first attempt at a working workman layout for the ergodoxez 2015-12-21 09:52:10 -05:00
chwilk
2b1a256825 Added keymap variant to approximate Kin Adv 2015-12-20 22:09:26 -06:00
Jack Humbert
e70cdb0693 Merge pull request #47 from pnutster/master 
OSX Kinesis-like Mapping
 2015-12-19 23:50:05 -05:00
Piet Nutbey
cc79f17424 Fixed keymap "graphic" 2015-12-19 23:24:59 -05:00
Piet Nutbey
ac3513b79f corrected folder 2015-12-19 22:50:48 -05:00
Piet Nutbey
190562288c OSX Kinesis-like Mapping 
OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point.
 2015-12-19 21:38:56 -05:00
Stephan Bösebeck
737afc9dc7 added hex file 2015-12-20 01:00:23 +01:00
Stephan Bösebeck
203528869d typo fix 2015-12-20 00:59:13 +01:00
Stephan Bösebeck
f35609bd89 minor change 2015-12-20 00:57:35 +01:00
Stephan Bösebeck
1b579212d4 added hex file and readme 2015-12-20 00:54:43 +01:00
Stephan Bösebeck
56104858fc first version for german osx layout 2015-12-20 00:49:19 +01:00
Jack Humbert
e0acb8a0ee Merge pull request #45 from matzebond/master 
German keymap + ErgoDox keymaps
 2015-12-19 14:26:14 -05:00
Erez Zukerman
11f0724951 Further clarifies README 2015-12-19 19:00:59 +02:00
Matthias Schmitt
7b7870bae1 Add neo2 keymap and neo2 ergodox layout 2015-12-19 01:41:23 +01:00
Matthias Schmitt
3dbcad51d1 Add german keymap and german ergodox layout 2015-12-19 01:22:12 +01:00
Erez Zukerman
7f22b67f8a Updates readme 2015-12-18 16:03:47 +02:00
Jack Humbert
0a58ce3881 jack's ergodox layout 2015-12-17 22:44:09 -05:00
Erez Zukerman
f4efa110f8 Fixes media keys on OSX layout 2015-12-18 04:08:27 +02:00
Erez Zukerman
c7c414b2fb Adds a new default keymap for OSX with working prev/next keys 2015-12-18 03:48:41 +02:00
Erez Zukerman
7923f212e1 Moves compiled default keymap + legends to keymaps directory 2015-12-18 03:42:47 +02:00
Erez Zukerman
4f4553cb90 A compiled version which sends left click in mouse mode 2015-12-16 19:03:30 +02:00
Josh McCall
4e290a7d59 Left click was mapped to scroll wheel. This fixes that. :) 2015-12-16 10:21:42 -06:00
Josh McCall
c63c615ff8 add left click and vim keys 2015-12-16 04:12:57 -06:00
Erez Zukerman
1edb050d20 Adds Hyper on the left side 2015-11-10 04:43:20 +02:00
Erez Zukerman
926ce2262f Uses App key as Alt when held 2015-11-10 04:39:53 +02:00
Erez Zukerman
f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 2015-11-10 04:14:59 +02:00
Erez Zukerman
80397187cd Enabled NKRO by default, drops irrelevant makefile options 2015-11-10 03:56:52 +02:00
Jack Humbert
6485c7d7da nkro info 2015-11-05 12:07:03 -05:00
Erez Zukerman
4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 2015-10-29 00:16:53 +02:00
Erez Zukerman
f024a462cd Fixes rolling combos for mod-tap keys 2015-10-28 04:19:13 +02:00
Erez Zukerman
d3db8d62f6 More work on ErgoDox EZ default keymap 2015-10-28 04:07:15 +02:00
Erez Zukerman
2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 2015-10-28 02:55:28 +02:00
Jack Humbert
909d30553f updated EZ makefile with tmk_core changes 2015-10-27 21:13:10 -04:00
Jack Humbert
6f3141965e new project script 2015-10-27 14:33:18 -04:00
Erez Zukerman
0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 2015-10-27 00:54:46 +02:00