Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							7b2cdca744 
							
						 
					 
					
						
						
							
							Merge pull request  #307  from sboesebeck/master  
						
						... 
						
						
						
						minor change to default layouts 
						
						
					 
					
						2016-05-13 21:50:28 -04:00 
						 
				 
			
				
					
						
							
							
								Tobias Matt 
							
						 
					 
					
						
						
						
						
							
						
						
							65645fb8ca 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-05-13 10:08:29 +02:00 
						 
				 
			
				
					
						
							
							
								cwhits 
							
						 
					 
					
						
						
						
						
							
						
						
							69f05e1afd 
							
						 
					 
					
						
						
							
							[planck] adds button for toggling output in plover app ( #323 )  
						
						... 
						
						
						
						* [planck] toggle plover output in app when toggling plover layer on keyboard
* [planck] moved plover toggle to separate key
* [planck] renamed toggle button 
						
						
					 
					
						2016-05-12 15:08:53 -04:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							f70dec3ee9 
							
						 
					 
					
						
						
							
							Remove unused variable on the keymap.  
						
						
						
						
					 
					
						2016-05-11 14:01:15 -07:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							d09d2da1c2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-05-11 22:05:19 +02:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d52fda9e 
							
						 
					 
					
						
						
							
							Add an initial Readme to the keymap.  
						
						
						
						
					 
					
						2016-05-11 13:04:53 -07:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							25382cb6f2 
							
						 
					 
					
						
						
							
							Fix compute_gradient_color  
						
						
						
						
					 
					
						2016-05-11 22:06:26 +03:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							5845eb05b5 
							
						 
					 
					
						
						
							
							[Erez & Jack] Documents audio output  
						
						
						
						
					 
					
						2016-05-10 20:48:14 -04:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							4a041f65e2 
							
						 
					 
					
						
						
							
							Tweak some key positions and changed macro location.  
						
						... 
						
						
						
						After using the layout a while I learn that the - and = positions should be
swapped since I keep typing = when I intend to type -.
I also, removed the only macro from the top left on the right hand to put the
power button there and since I never use the arrow keys on the separated groups
of keys, I added 4 macros there to get a feel for it. 
						
						
					 
					
						2016-05-10 16:32:18 -07:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							75384689b2 
							
						 
					 
					
						
						
							
							Add custom config.h and revert the changes on the global one.  
						
						... 
						
						
						
						Some options I defined on the config.h file don't make much sense to other
keymaps so I revert the global config.h and add those options on the keymap
custom one. 
						
						
					 
					
						2016-05-10 16:17:30 -07:00 
						 
				 
			
				
					
						
							
							
								James ‘Twey’ Kay 
							
						 
					 
					
						
						
						
						
							
						
						
							a46a0ed4f3 
							
						 
					 
					
						
						
							
							keymaps/twey: fix documentation  
						
						
						
						
					 
					
						2016-05-10 22:33:06 +01:00 
						 
				 
			
				
					
						
							
							
								James ‘Twey’ Kay 
							
						 
					 
					
						
						
						
						
							
						
						
							373e441d86 
							
						 
					 
					
						
						
							
							keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead  
						
						
						
						
					 
					
						2016-05-10 22:30:17 +01:00 
						 
				 
			
				
					
						
							
							
								James ‘Twey’ Kay 
							
						 
					 
					
						
						
						
						
							
						
						
							b5c5b71828 
							
						 
					 
					
						
						
							
							keymaps/twey: Add more history keys to media layer; stop using toggleable media layer  
						
						
						
						
					 
					
						2016-05-10 22:23:36 +01:00 
						 
				 
			
				
					
						
							
							
								Peter 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e0b4e105 
							
						 
					 
					
						
						
							
							Update build guide with instructions to copy the whole keymap folder ( #315 )  
						
						
						
						
					 
					
						2016-05-09 19:23:51 -04:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							c2ffedd65c 
							
						 
					 
					
						
						
							
							Update the .hex file on the keymap folder.  
						
						
						
						
					 
					
						2016-05-09 15:27:57 -07:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							3e43298d79 
							
						 
					 
					
						
						
							
							Revert the Makefile to the original one.  
						
						... 
						
						
						
						Make sure I customize things as much as possible inside the keymap itself. 
						
						
					 
					
						2016-05-09 15:27:57 -07:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							85f5eaec39 
							
						 
					 
					
						
						
							
							Change the access to the extra layer to be simetric.  
						
						... 
						
						
						
						Instead of having a key on the left side for one layer and a key on the right
side for the other layer, I put two dedicated layers on each side to get to the
proper layers. 
						
						
					 
					
						2016-05-09 15:27:57 -07:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							6d343f3559 
							
						 
					 
					
						
						
							
							Add my personal keymap for OSX use.  
						
						... 
						
						
						
						This keymap was created to have a feel keys on a different place and to have as
fewer layers as possible.
Currently I have only 2 extra layers and only one of them is really required to
have all possible keys available.
Check out the README.md file for more information. 
						
						
					 
					
						2016-05-09 15:27:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							3f02637f4d 
							
						 
					 
					
						
						
							
							Backlight Breathing for Planck and Atomic  
						
						... 
						
						
						
						* Updated personal layouts
* tweaked personal
* Nightly - Audio Cleanup
Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP
* nightly - collapsed code
* Added check for note playing to LEDs
* Usability tweaks
* TWEAE
* nightly
added extra kcs to keymap common
* turned on Plank audio
* Added backlight breathing to atomic
* reverted accidental merge
* adds backlight pulse to planck 
						
						
					 
					
						2016-05-09 13:17:15 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							684793360c 
							
						 
					 
					
						
						
							
							quantum accommodates more than 16 columns  
						
						
						
						
					 
					
						2016-05-09 00:36:23 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							35a72ca5e1 
							
						 
					 
					
						
						
							
							Adds next tab/prev tab back to symb layer and updates legend  
						
						
						
						
					 
					
						2016-05-08 13:55:30 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac27dd574 
							
						 
					 
					
						
						
							
							A little more tweaking  
						
						
						
						
					 
					
						2016-05-08 13:45:26 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							897396b58f 
							
						 
					 
					
						
						
							
							Tweaks layers 1 & 2 in my experimental layout  
						
						
						
						
					 
					
						2016-05-08 13:39:17 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							2ce9644caa 
							
						 
					 
					
						
						
							
							Merge pull request  #311  from adiabatic/ergodox-zweihander-osx  
						
						... 
						
						
						
						Add KC_LABK and KC_RABK (< and >) 
						
						
					 
					
						2016-05-06 18:28:43 -04:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							05db327b70 
							
						 
					 
					
						
						
							
							Add KC_L[LR]ABK to top-level README  
						
						
						
						
					 
					
						2016-05-06 06:22:26 -07:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							7566ac4241 
							
						 
					 
					
						
						
							
							Merge pull request  #310  from nrrkeene/master  
						
						... 
						
						
						
						Lock layers by pressing both shift keys 
						
						
					 
					
						2016-05-06 09:13:30 -04:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							c702a522b0 
							
						 
					 
					
						
						
							
							Rearrange code layer on Zweihander  
						
						... 
						
						
						
						Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons. 
						
						
					 
					
						2016-05-06 05:47:55 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							08f3142463 
							
						 
					 
					
						
						
							
							Add KC_LABK and KC_RABK (< and >)  
						
						
						
						
					 
					
						2016-05-06 05:40:02 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4f693cad 
							
						 
					 
					
						
						
							
							zweihander: add ⌘X, ⌘C, ⌘V to media thumb keys  
						
						
						
						
					 
					
						2016-05-06 05:19:17 -07:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							481c74cc56 
							
						 
					 
					
						
						
							
							The Ordinary Layout is the layout you are looking for. Come and see.  
						
						
						
						
					 
					
						2016-05-05 23:18:48 -05:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							90a6534729 
							
						 
					 
					
						
						
							
							The Ordinary Layout is extraordinarily familiar and powerful  
						
						
						
						
					 
					
						2016-05-05 23:10:51 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							78bd31f28e 
							
						 
					 
					
						
						
							
							Uses @eltang's famous macro! Still not perfect though :(  
						
						
						
						
					 
					
						2016-05-05 23:18:46 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							bf6f3fe7f4 
							
						 
					 
					
						
						
							
							[Erez & Jack] Updates docs with one-shot information and config_user.h  
						
						
						
						
					 
					
						2016-05-05 23:18:04 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							9bb368a5fb 
							
						 
					 
					
						
						
							
							[Jack & Erez] Defines MOD_HYPR and MOD_MEH  
						
						
						
						
					 
					
						2016-05-05 22:44:24 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							cd30f971ae 
							
						 
					 
					
						
						
							
							[Jack & Erez] Creates a makefile.mk and a config file for the experimental layout  
						
						
						
						
					 
					
						2016-05-05 22:24:09 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9d1c4279 
							
						 
					 
					
						
						
							
							[Jack & Erez] Enables config_user.h per keymap  
						
						
						
						
					 
					
						2016-05-05 22:23:32 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							8ffc73fcbd 
							
						 
					 
					
						
						
							
							[Jack & Erez] Adds an option for user-specific config.h files  
						
						
						
						
					 
					
						2016-05-05 22:21:39 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							f293bf2340 
							
						 
					 
					
						
						
							
							[Jack & Erez] Removes duplicate reference, sorts whitespace  
						
						
						
						
					 
					
						2016-05-05 22:19:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							41b3e399b1 
							
						 
					 
					
						
						
							
							adds keycode shortcuts for OSL and OSM  
						
						
						
						
					 
					
						2016-05-05 21:50:51 -04:00 
						 
				 
			
				
					
						
							
							
								Thiago Alves 
							
						 
					 
					
						
						
						
						
							
						
						
							74e97eefd7 
							
						 
					 
					
						
						
							
							Adds oneshot layer and oneshot tap toggling ( #308 )  
						
						... 
						
						
						
						This commit is mostly a cherry-pick from `ahtn` at
https://github.com/tmk/tmk_keyboard/pull/255 .
These are the changes:
* Adds ACTION_LAYER_ONESHOT
* Adds ONESHOT_TAP_TOGGLE
* Mentions sticky keys in the docs on oneshot. 
						
						
					 
					
						2016-05-05 21:41:37 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Duckering 
							
						 
					 
					
						
						
						
						
							
						
						
							d4520cd3ac 
							
						 
					 
					
						
						
							
							Referencing the hex file ( #309 )  
						
						... 
						
						
						
						Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;) 
						
						
					 
					
						2016-05-05 18:27:28 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							356dba7e61 
							
						 
					 
					
						
						
							
							updates atreus's column mapping  
						
						
						
						
					 
					
						2016-05-05 12:05:09 -04:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							2e02886a1e 
							
						 
					 
					
						
						
							
							remove typo  
						
						
						
						
					 
					
						2016-05-05 16:52:40 +02:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							a096d205aa 
							
						 
					 
					
						
						
							
							making default osx more ELG conform  
						
						
						
						
					 
					
						2016-05-05 16:48:51 +02:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							7060e10669 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-05-05 16:28:47 +02:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							5daf24b1a5 
							
						 
					 
					
						
						
							
							The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out.  
						
						
						
						
					 
					
						2016-05-04 22:17:47 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							dbb1c2f281 
							
						 
					 
					
						
						
							
							Merge pull request  #305  from nrrkeene/master  
						
						... 
						
						
						
						Custom handling for shift keys, improved media layer 
						
						
					 
					
						2016-05-04 22:31:00 -04:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							660511f050 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-05-04 08:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							31a697bc05 
							
						 
					 
					
						
						
							
							Merge pull request  #304  from adiabatic/ergodox-zweihander-osx  
						
						... 
						
						
						
						zweihander: comment out action_get_macro() 
						
						
					 
					
						2016-05-03 22:27:39 -04:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							6bafe44486 
							
						 
					 
					
						
						
							
							zweihander: comment out action_get_macro()  
						
						
						
						
					 
					
						2016-05-03 19:19:47 -07:00