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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								71ee3eb2e7 
								
							 
						 
						
							
							
								
								All dfu dependencies in place, multi-line syntax to make it easy to add/read  
							
							 
							
							
							
						 
						
							2016-01-12 21:41:43 -06:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								6e837f6fef 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
						 
						
							2016-01-12 22:52:32 +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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								de01abdf8c 
								
							 
						 
						
							
							
								
								Merge pull request  #79  from agriffis/cleanup-default  
							
							 
							
							... 
							
							
							
							Minor cleanup to refer to SYMB and MDIA in default ergodox_ez keymap rather than hard-coding numbers. 
							
						 
						
							2016-01-10 10:14:56 -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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								1633c5d493 
								
							 
						 
						
							
							
								
								Merge pull request  #74  from sethherr/patch-3  
							
							 
							
							... 
							
							
							
							Fix homebrew references 
							
						 
						
							2016-01-06 12:22:48 -05: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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								670256c943 
								
							 
						 
						
							
							
								
								Merge pull request  #71  from andruby/andrew_osx  
							
							 
							
							... 
							
							
							
							Andrew's OSX ergodox ez keymap 
							
						 
						
							2016-01-06 00:01:56 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								ee424f8608 
								
							 
						 
						
							
							
								
								Adding update of vagrant VM every time it is booted  
							
							 
							
							
							
						 
						
							2016-01-05 22:39:49 -06: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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sébastien Pérochon 
								
							 
						 
						
							
							
							
							
								
							
							
								48eff6dd89 
								
							 
						 
						
							
							
								
								quantum: Add French keymap for OSX (keymap_french_osx)  
							
							 
							
							
							
						 
						
							2016-01-05 10:49:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Justin Garrison 
								
							 
						 
						
							
							
							
							
								
							
							
								6da712ce5e 
								
							 
						 
						
							
							
								
								added jgarr keymap for custom dvorak layout :yay:  
							
							 
							
							
							
						 
						
							2016-01-04 09:18:06 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								ab7d6dca41 
								
							 
						 
						
							
							
								
								Adding Vagrantfile for easier compile environment setup  
							
							 
							
							
							
						 
						
							2016-01-03 22:21:30 -06: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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								0f2c7730d4 
								
							 
						 
						
							
							
								
								Merge pull request  #68  from waveform80/daves-comments  
							
							 
							
							... 
							
							
							
							Added comments to LED stuff and included .hex file 
							
						 
						
							2016-01-02 14:22:43 -05: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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								41d4cf05ef 
								
							 
						 
						
							
							
								
								Merge pull request  #67  from waveform80/daves-keymap  
							
							 
							
							... 
							
							
							
							Dave's custom keymap 
							
						 
						
							2016-01-02 11:58:27 -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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								9c5f30ed83 
								
							 
						 
						
							
							
								
								Merge pull request  #63  from MattLeBeauViewpoint/master  
							
							 
							
							... 
							
							
							
							Small change to filename spelling in README 
							
						 
						
							2015-12-31 20:07:37 -05: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 
								
							 
						 
						
							
							
							
							
								
							
							
								c760a273fb 
								
							 
						 
						
							
							
								
								Added note about avr-libc also being required at least for arch  
							
							 
							
							
							
						 
						
							2015-12-30 23:22:29 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								f68f1c7432 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:dragon788/qmk_firmware_ez  
							
							 
							
							
							
						 
						
							2015-12-28 14:45:13 -06: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