Commit Graph

732 Commits (240f8d9fe0a6dbd7f51b1bd4cb93d884b6870ce1)

Author SHA1 Message Date
tonyabra baddbc6b23 Simplified osx layout for ergodox ez 2016-01-24 23:33:26 -06:00
Yang Liu f277079dfa no message 2016-01-24 18:16:40 -08:00
Yang Liu 2d29795de8 add one more photo 2016-01-24 17:56:43 -08:00
Yang Liu 84657a9e4b Add a photo for the demonstration of RGB underflow 2016-01-24 17:54:35 -08:00
Yang Liu ba9ac457b2 Integrate WS2812 code into quantum core 2016-01-24 17:05:47 -08:00
Yang Liu 0a40654b82 Add support for WS2812 LEDs 2016-01-24 13:14:50 -08:00
Stephan Bösebeck f958b2e832 typo fix 2016-01-24 21:54:31 +01:00
Jack Humbert fd72a46c13 Makefile back to defaults 2016-01-23 20:52:01 -05:00
Jack Humbert 6a55a5fe48 not sure how this got here.. 2016-01-23 20:40:40 -05:00
Jack Humbert ae620fe856 rename file 2016-01-23 20:35:13 -05:00
Jack Humbert 5143c59bdf Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:34:05 -05:00
Jack Humbert 544a49329c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:33:35 -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
Jack Humbert a820533ab7 keymap.c changes, disable grep stuff 2016-01-20 00:15:29 -05:00
Jack Humbert eb61700912 better integrations 2016-01-20 00:06:52 -05: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
Jack Humbert f66a251e5d I guess I can reference #90 in the commit message 2016-01-16 01:08:50 -05:00
Jack Humbert c9a096dc99 added error for keymap file not existing 2016-01-16 00:57:35 -05:00
Jack Humbert dfe7004bc5 new keymap folder structure and makefile magic 2016-01-16 00:52:31 -05:00
Jack Humbert 4faddd3449 working 2016-01-16 00:06:51 -05:00
Jack Humbert 6e3c36360e sounds 2016-01-15 23:10:30 -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
Erez Zukerman 46f4494e55 Merge pull request #84 from sboesebeck/master
new alternative layout ADNW_Koy
2016-01-13 15:39:17 -05:00
Jack Humbert 8b76d1ba4c Merge pull request #83 from lxol/feature/hhkb-qmk
migrate hhkb to QMK firmware
2016-01-13 09:55:58 -05: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
Alex Olkhovskiy 0c9227f691 migrate hhkb to QMK firmware 2016-01-13 09:46:55 +00:00
Jack Humbert 4c100dbbef note seq, start-up beeps, function beeps 2016-01-13 00:25:31 -05: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 263344d42f beeps on lock keymap 2016-01-11 18:00:07 -05: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
Jack Humbert 5259f36d03 Merge pull request #66 from gdiegel/master
Fix for faulty fn layer
2016-01-02 11:58:40 -05: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
Gabriel Diegel 1cdcbc9865 Fix incorrect number of rows on fn layer. Add additional navigation keys
to fn layer
2016-01-02 10:31:47 +01: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
Gabriel Diegel d7d092de5f Use planck-style arrow keys 2015-12-20 23:05:15 +01: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