Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							bc0bd11430 
							
						 
					 
					
						
						
							
							forgot media keys  
						
						
						
						
					 
					
						2016-08-19 10:24:48 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							225c73ed30 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into amj60  
						
						... 
						
						
						
						merge with upstream 
						
						
					 
					
						2016-08-19 09:49:56 +02:00 
						 
				 
			
				
					
						
							
							
								dbroqua 
							
						 
					 
					
						
						
						
						
							
						
						
							31120ed166 
							
						 
					 
					
						
						
							
							- Moved Brite function on esc to avoid conflict with ctrl key.  
						
						
						
						
					 
					
						2016-08-19 09:39:25 +02:00 
						 
				 
			
				
					
						
							
							
								dbroqua 
							
						 
					 
					
						
						
						
						
							
						
						
							578b7e969e 
							
						 
					 
					
						
						
							
							- Updated dbroqua layout for planck keyboard  
						
						
						
						
					 
					
						2016-08-19 09:19:55 +02:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							ed1291bfbd 
							
						 
					 
					
						
						
							
							Added compatibility for the Infinity ErgoDox to my Ergodox keymap.  
						
						... 
						
						
						
						Updated readme.md to reflect this change. 
						
						
					 
					
						2016-08-18 22:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Damien 
							
						 
					 
					
						
						
						
						
							
						
						
							a5e6da7aa8 
							
						 
					 
					
						
						
							
							Added dbroqua layout for planck keyboard  
						
						
						
						
					 
					
						2016-08-18 22:25:13 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							6c359cabbf 
							
						 
					 
					
						
						
							
							Merge pull request  #652  from iFreilicht/master  
						
						... 
						
						
						
						Added S60-X keyboard 
						
						
					 
					
						2016-08-18 10:34:22 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8f32595820 
							
						 
					 
					
						
						
							
							Merge pull request  #650  from Xyverz/master  
						
						... 
						
						
						
						Minor changes to keymaps and other files 
						
						
					 
					
						2016-08-18 10:31:17 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							21dc8381d1 
							
						 
					 
					
						
						
							
							made a correct default KEYMAP. moved the old one to KEYMAP_ANSI  
						
						... 
						
						
						
						fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying 
						
						
					 
					
						2016-08-18 15:57:17 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							fe90653886 
							
						 
					 
					
						
						
							
							smyll typo fixed  
						
						
						
						
					 
					
						2016-08-18 15:32:06 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							0e86c85241 
							
						 
					 
					
						
						
							
							amj60 variant of the readme  
						
						
						
						
					 
					
						2016-08-18 15:30:52 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							0edf7c7cad 
							
						 
					 
					
						
						
							
							first attempt at documentation for the amj60 board  
						
						
						
						
					 
					
						2016-08-18 15:22:34 +02:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9d4b8658 
							
						 
					 
					
						
						
							
							planck/circuit: Update after the latest tap-dance change  
						
						... 
						
						
						
						Fixes  #653 .
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
					
						2016-08-18 13:22:16 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							068e76bbf0 
							
						 
					 
					
						
						
							
							uniform whitespace  
						
						
						
						
					 
					
						2016-08-18 13:10:02 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							387bd772e1 
							
						 
					 
					
						
						
							
							initial commit for the AMJ60 PCB  
						
						
						
						
					 
					
						2016-08-18 13:06:16 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							dbfb27326b 
							
						 
					 
					
						
						
							
							Added info to docs  
						
						
						
						
					 
					
						2016-08-18 12:15:10 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							ed6ecff292 
							
						 
					 
					
						
						
							
							Merge pull request  #1  from jackhumbert/master  
						
						... 
						
						
						
						Merging from base Repo 
						
						
					 
					
						2016-08-18 12:02:31 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							73f13c8f26 
							
						 
					 
					
						
						
							
							Bugfixes  
						
						
						
						
					 
					
						2016-08-18 11:56:44 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							a72dc6da70 
							
						 
					 
					
						
						
							
							Final link fix  
						
						
						
						
					 
					
						2016-08-18 11:45:56 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							406ae1a2eb 
							
						 
					 
					
						
						
							
							More link fixing  
						
						
						
						
					 
					
						2016-08-18 11:43:32 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							aa71ebfbba 
							
						 
					 
					
						
						
							
							Fixed links again  
						
						... 
						
						
						
						Note to self: check before commiting. 
						
						
					 
					
						2016-08-18 11:41:52 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							d34c0a2fc1 
							
						 
					 
					
						
						
							
							Fixed dead link  
						
						
						
						
					 
					
						2016-08-18 11:40:05 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							738151d12a 
							
						 
					 
					
						
						
							
							Minor documentation changes  
						
						
						
						
					 
					
						2016-08-18 11:38:04 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							c5f13e5836 
							
						 
					 
					
						
						
							
							Fixed links again  
						
						
						
						
					 
					
						2016-08-18 11:16:10 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							a865995595 
							
						 
					 
					
						
						
							
							Fixed pictures and links  
						
						
						
						
					 
					
						2016-08-18 11:11:42 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							2618260b34 
							
						 
					 
					
						
						
							
							Documentation overhaul.  
						
						
						
						
					 
					
						2016-08-18 10:37:32 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							864e26f439 
							
						 
					 
					
						
						
							
							cleanup, readability , shift swap in ISO_SPLIT_RSHIFT  
						
						
						
						
					 
					
						2016-08-18 10:06:13 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Uhl 
							
						 
					 
					
						
						
						
						
							
						
						
							07924511f3 
							
						 
					 
					
						
						
							
							Small changes, renamed keymap  
						
						... 
						
						
						
						Added MicMute
Revived all dead keys
Removed OS Shift 
						
						
					 
					
						2016-08-18 10:01:46 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							64ecb15310 
							
						 
					 
					
						
						
							
							corrected the split rshift key to reality  
						
						... 
						
						
						
						fixed my keymap in the process to adjust to that 
						
						
					 
					
						2016-08-18 09:56:11 +02:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							aa37a57e0f 
							
						 
					 
					
						
						
							
							One last change to the readme.  
						
						
						
						
					 
					
						2016-08-18 00:38:25 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							eb81978ecb 
							
						 
					 
					
						
						
							
							One last formatting change  
						
						
						
						
					 
					
						2016-08-18 00:35:32 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							118ad691c4 
							
						 
					 
					
						
						
							
							more formatting changes  
						
						
						
						
					 
					
						2016-08-18 00:34:22 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							4dd641a128 
							
						 
					 
					
						
						
							
							Hopefully this fixes the layout diagrams.  
						
						
						
						
					 
					
						2016-08-18 00:27:54 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							035290b7d8 
							
						 
					 
					
						
						
							
							Added a readme, tidied up comments in the keymap.  
						
						
						
						
					 
					
						2016-08-18 00:22:56 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							47beb763e8 
							
						 
					 
					
						
						
							
							Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-(  
						
						
						
						
					 
					
						2016-08-18 00:05:24 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							67227e4c71 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Xyverz/qmk_firmware  
						
						
						
						
					 
					
						2016-08-17 23:55:58 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							385b827c85 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						... 
						
						
						
						this merge is necessary, 
						
						
					 
					
						2016-08-17 23:53:56 -07:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							f4f80a0e3a 
							
						 
					 
					
						
						
							
							Merge pull request  #645  from algernon/f/tap-dance/buffering  
						
						... 
						
						
						
						tap-dance rework 
						
						
					 
					
						2016-08-17 21:15:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							1442a882d4 
							
						 
					 
					
						
						
							
							Merge pull request  #640  from toneman77/iso_satan  
						
						... 
						
						
						
						heavily modified spacefn layout for iso boards using the satan PCB 
						
						
					 
					
						2016-08-17 21:11:59 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							f59b61332f 
							
						 
					 
					
						
						
							
							Merge pull request  #638  from premek/master  
						
						... 
						
						
						
						Split layout for planck 
						
						
					 
					
						2016-08-17 21:11:02 -04:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							ef95c10c66 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
					 
					
						2016-08-17 14:55:01 -07:00 
						 
				 
			
				
					
						
							
							
								Xyverz 
							
						 
					 
					
						
						
						
						
							
						
						
							e3486caf87 
							
						 
					 
					
						
						
							
							Create readme.md  
						
						
						
						
					 
					
						2016-08-17 14:54:05 -07:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							c024de4a87 
							
						 
					 
					
						
						
							
							wring keypress for german iso fixed. prettified  
						
						
						
						
					 
					
						2016-08-17 15:33:14 +02:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							29f64d7a93 
							
						 
					 
					
						
						
							
							tap-dance: Major rework, to make it more reliable  
						
						... 
						
						
						
						This reworks how the tap-dance feature works: instead of one global
state, we have a state for each tap-dance key, so we can cancel them
when another tap-dance key is in flight. This fixes  #527 .
Since we have a state for each key, we can avoid situation where a keyup
would mess with our global state. This fixes  #563 .
And while here, we also make sure to fire events only once, and this
fixes  #574 .
There is one breaking change, though: tap-dance debugging support was
removed, because dumping the whole state would increase the firmware
size too much. Any keymap that made use of this, will have to be
updated (but there's no such keymap in the repo).
Also, there's a nice trick used in this rework: we need to iterate
through tap_dance_actions in a few places, to check for timeouts, and so
on. For this, we'd need to know the size of the array. We can't discover
that at compile-time, because tap-dance gets compiled separately. We'd
like to avoid having to terminate the list with a sentinel value,
because that would require updates to all keymaps that use the feature.
So, we keep track of the highest tap-dance code seen so far, and iterate
until that index.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-08-17 15:05:58 +02:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							bc1059bc1e 
							
						 
					 
					
						
						
							
							Minor changes to Extend and Number layers.  
						
						... 
						
						
						
						Brought QWERTY layer in line with normal layer. Removed Undo function, as it interfered with Shift. Moved Tab and Shift-Tab, and added Insert. 
						
						
					 
					
						2016-08-16 21:55:33 -05:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							8e142d8cbe 
							
						 
					 
					
						
						
							
							no more warning thanks to iFreilicht's tip with undef  
						
						
						
						
					 
					
						2016-08-16 17:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							deedd2f408 
							
						 
					 
					
						
						
							
							in accordance to keymap_makefile_example.mk  
						
						
						
						
					 
					
						2016-08-16 16:44:12 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							03a24eb86a 
							
						 
					 
					
						
						
							
							minor grammer fixes  
						
						
						
						
					 
					
						2016-08-16 16:35:57 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ac91a040 
							
						 
					 
					
						
						
							
							big cleanup and minor refactoring. thanks iFreilicht.  
						
						
						
						
					 
					
						2016-08-16 16:32:42 +02:00 
						 
				 
			
				
					
						
							
							
								Přemek Vyhnal 
							
						 
					 
					
						
						
						
						
							
						
						
							2ebfdcac40 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
					 
					
						2016-08-16 01:07:34 +02:00