Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							3e462fac31 
							
						 
					 
					
						
						
							
							added missing F keys in flipped layer  
						
						
						
						
					 
					
						2016-07-25 20:21:32 +02:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							17a7570e08 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-07-25 12:55:46 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							5e2e8c89e8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into iso_split_rshift  
						
						... 
						
						
						
						whatever 
						
						
					 
					
						2016-07-25 12:49:38 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8b94e26d7c 
							
						 
					 
					
						
						
							
							Fixes midi functionality  
						
						
						
						
					 
					
						2016-07-24 22:07:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							670327f1d0 
							
						 
					 
					
						
						
							
							Merge pull request  #548  from CommandLineDesign/CMD-Preonic  
						
						... 
						
						
						
						CMD keymap for Preonic 
						
						
					 
					
						2016-07-24 21:56:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							384d9cd6bb 
							
						 
					 
					
						
						
							
							Merge pull request  #546  from sethbc/satan-cleanup  
						
						... 
						
						
						
						Satan cleanup 
						
						
					 
					
						2016-07-24 21:56:23 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							4885225159 
							
						 
					 
					
						
						
							
							Merge pull request  #534  from willwm/teckinesis  
						
						... 
						
						
						
						Teckinesis for ErgoDox EZ 
						
						
					 
					
						2016-07-24 18:04:59 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							f4cb84c940 
							
						 
					 
					
						
						
							
							Remove images, per @ezuk request. =)  
						
						
						
						
					 
					
						2016-07-24 14:33:17 -07:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							36f2e22283 
							
						 
					 
					
						
						
							
							Merge pull request  #535  from algernon/ergodox-ez/algernon  
						
						... 
						
						
						
						ergodox_ez: Update my keymap to v1.3 
						
						
					 
					
						2016-07-24 11:34:33 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a41e43aa 
							
						 
					 
					
						
						
							
							Updated Readme  
						
						
						
						
					 
					
						2016-07-23 21:26:01 -07:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							c826bcfc39 
							
						 
					 
					
						
						
							
							Did a derp and forgot to set Trans on Arrow layer  
						
						
						
						
					 
					
						2016-07-23 21:08:00 -07:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							4480a74a4b 
							
						 
					 
					
						
						
							
							Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position  
						
						
						
						
					 
					
						2016-07-23 21:02:23 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							4e0bf283f6 
							
						 
					 
					
						
						
							
							added readme  
						
						
						
						
					 
					
						2016-07-24 05:11:07 +02:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							c1fb82623c 
							
						 
					 
					
						
						
							
							Tested, resolved Mouse issue, resolved numpad issue  
						
						
						
						
					 
					
						2016-07-23 20:02:45 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							1bfd57e234 
							
						 
					 
					
						
						
							
							moved insert  
						
						
						
						
					 
					
						2016-07-24 05:02:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							58f092cf87 
							
						 
					 
					
						
						
							
							moved ctrl  
						
						
						
						
					 
					
						2016-07-24 04:52:35 +02:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							fbafb9449e 
							
						 
					 
					
						
						
							
							Resolved errors  
						
						
						
						
					 
					
						2016-07-23 19:32:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							34bce6f206 
							
						 
					 
					
						
						
							
							fixed stupid errors  
						
						
						
						
					 
					
						2016-07-24 04:08:40 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							9b3708f830 
							
						 
					 
					
						
						
							
							Init Readme  
						
						... 
						
						
						
						This needs a better description. 
						
						
					 
					
						2016-07-23 18:52:52 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							3c7075011b 
							
						 
					 
					
						
						
							
							Create Makefile  
						
						... 
						
						
						
						This is untested, use caution. 
						
						
					 
					
						2016-07-23 18:50:41 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							b5761df57b 
							
						 
					 
					
						
						
							
							Create CMD-Preonic Keymap  
						
						... 
						
						
						
						This is very Alpha-Mode, and has not been tested or even Made yet. 
						
						
					 
					
						2016-07-23 18:47:36 -07:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							75f0922711 
							
						 
					 
					
						
						
							
							fix typo in readme and satan.h  
						
						
						
						
					 
					
						2016-07-23 20:55:20 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							ef533be2d6 
							
						 
					 
					
						
						
							
							cleanup default layout  
						
						
						
						
					 
					
						2016-07-23 20:52:27 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							81fe3d962c 
							
						 
					 
					
						
						
							
							update sethbc keymap  
						
						
						
						
					 
					
						2016-07-23 20:37:41 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							723857bf8a 
							
						 
					 
					
						
						
							
							Table for Fn  
						
						... 
						
						
						
						layer. 
						
						
					 
					
						2016-07-22 18:19:07 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a39eaa7fb5 
							
						 
					 
					
						
						
							
							Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.  
						
						
						
						
					 
					
						2016-07-22 17:46:23 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							5631f1436c 
							
						 
					 
					
						
						
							
							converted funtions to QMK aliases  
						
						
						
						
					 
					
						2016-07-22 11:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							197244e47f 
							
						 
					 
					
						
						
							
							more cosmetic changes (whitespace)  
						
						
						
						
					 
					
						2016-07-22 08:14:08 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f014b1dd 
							
						 
					 
					
						
						
							
							purely cosmetic changes  
						
						
						
						
					 
					
						2016-07-22 08:13:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8e1d96983a 
							
						 
					 
					
						
						
							
							Merge pull request  #543  from VoodaGod/bone2planck  
						
						... 
						
						
						
						updated bone2planck 
						
						
					 
					
						2016-07-21 21:29:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							66fed12c98 
							
						 
					 
					
						
						
							
							Merge pull request  #541  from milestogo/master  
						
						... 
						
						
						
						initial kinisis advantage build 
						
						
					 
					
						2016-07-21 21:05:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							5249b4451c 
							
						 
					 
					
						
						
							
							Merge pull request  #540  from replicaJunction/feature-atreus-keymapFunction  
						
						... 
						
						
						
						Adjusted Atreus KEYMAP() function. 
						
						
					 
					
						2016-07-21 21:04:45 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0bba5981 
							
						 
					 
					
						
						
							
							Merge pull request  #538  from robertdale/preonic-map-correction  
						
						... 
						
						
						
						Preonic: Corrected the ascii layout to match the coded layout 
						
						
					 
					
						2016-07-21 21:03:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9f9baff4 
							
						 
					 
					
						
						
							
							Merge pull request  #530  from sethbc/master  
						
						... 
						
						
						
						Misc. fixes from sethbc 
						
						
					 
					
						2016-07-21 21:01:35 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb100f87d 
							
						 
					 
					
						
						
							
							First draft of the 'impossible' layout.  
						
						
						
						
					 
					
						2016-07-21 18:19:08 -04:00 
						 
				 
			
				
					
						
							
							
								Josh Colbeck 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa180f463 
							
						 
					 
					
						
						
							
							Added reset keys  
						
						
						
						
					 
					
						2016-07-20 23:15:15 -05:00 
						 
				 
			
				
					
						
							
							
								milestogo 
							
						 
					 
					
						
						
						
						
							
						
						
							24e4e6dd18 
							
						 
					 
					
						
						
							
							adding traveller keyboard  
						
						
						
						
					 
					
						2016-07-20 21:12:00 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							b0e9dbecee 
							
						 
					 
					
						
						
							
							fixed include paths  
						
						
						
						
					 
					
						2016-07-20 17:05:23 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							32f5b34ad2 
							
						 
					 
					
						
						
							
							reformat  
						
						
						
						
					 
					
						2016-07-20 16:58:10 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							3d7244e604 
							
						 
					 
					
						
						
							
							updated bone2planck  
						
						
						
						
					 
					
						2016-07-20 16:42:09 +02:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							15ee180f0e 
							
						 
					 
					
						
						
							
							Created readme and added screenshots  
						
						
						
						
					 
					
						2016-07-20 00:38:56 -05:00 
						 
				 
			
				
					
						
							
							
								milestogo 
							
						 
					 
					
						
						
						
						
							
						
						
							1984861338 
							
						 
					 
					
						
						
							
							initial kinisis advantage build  
						
						
						
						
					 
					
						2016-07-19 22:35:38 -07:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							8ee9c486fd 
							
						 
					 
					
						
						
							
							Adjusted Atreus KEYMAP() function.  
						
						... 
						
						
						
						This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.
This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function. 
						
						
					 
					
						2016-07-19 17:46:03 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							2a4947b28b 
							
						 
					 
					
						
						
							
							Modified Atreus layout to account for keymap() function  
						
						
						
						
					 
					
						2016-07-19 17:39:15 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb2cf375b 
							
						 
					 
					
						
						
							
							Adjusted Atreus KEYMAP() function.  
						
						... 
						
						
						
						This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.
This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function. 
						
						
					 
					
						2016-07-19 17:33:10 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							377bcb00fb 
							
						 
					 
					
						
						
							
							Added Gaming layer and removed Dvorak  
						
						... 
						
						
						
						Also added tap/hold functions on central keys 
						
						
					 
					
						2016-07-19 17:01:21 -05:00 
						 
				 
			
				
					
						
							
							
								Robert Dale 
							
						 
					 
					
						
						
						
						
							
						
						
							9c26498f49 
							
						 
					 
					
						
						
							
							added Midi On/Off; Enter is actually transparent  
						
						
						
						
					 
					
						2016-07-19 08:43:41 -04:00 
						 
				 
			
				
					
						
							
							
								Robert Dale 
							
						 
					 
					
						
						
						
						
							
						
						
							47223ebee4 
							
						 
					 
					
						
						
							
							Corrected the ascii layout to match the coded layout  
						
						
						
						
					 
					
						2016-07-19 08:00:03 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							5cd6d607fc 
							
						 
					 
					
						
						
							
							changed ctrl back to enter. "j" interfered with my vimming  
						
						
						
						
					 
					
						2016-07-19 09:17:31 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							1988c180e3 
							
						 
					 
					
						
						
							
							small cosmetic change  
						
						
						
						
					 
					
						2016-07-19 09:16:55 +02:00