Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							b9987d65f9 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/qmk/qmk_firmware  
						
						
						
						
					 
					
						2017-06-23 23:07:01 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							2c65a17752 
							
						 
					 
					
						
						
							
							add other mcu bootloaders  
						
						
						
						
					 
					
						2017-06-23 23:05:42 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							dfa6417ae3 
							
						 
					 
					
						
						
							
							Merge pull request  #1422  from nstickney/master  
						
						... 
						
						
						
						update ErgoDox "Familiar" layout 
						
						
					 
					
						2017-06-23 21:48:17 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							918aea5b47 
							
						 
					 
					
						
						
							
							Update _summary.md  
						
						
						
						
					 
					
						2017-06-23 21:29:35 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f2f44a6f 
							
						 
					 
					
						
						
							
							Create isp_flashing_guide.md  
						
						
						
						
					 
					
						2017-06-23 21:29:04 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							1524c2cb16 
							
						 
					 
					
						
						
							
							Merge pull request  #1418  from npoirey/master  
						
						... 
						
						
						
						Frenchdev v1 
						
						
					 
					
						2017-06-23 18:05:33 -04:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							8ad12b1eb7 
							
						 
					 
					
						
						
							
							Updated frenchdev readme  
						
						
						
						
					 
					
						2017-06-23 23:59:30 +02:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							dcf9fa1aaa 
							
						 
					 
					
						
						
							
							Update the ugfx submodule  
						
						
						
						
					 
					
						2017-06-24 00:37:27 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							f912c74fe7 
							
						 
					 
					
						
						
							
							Change inline to static inline  
						
						
						
						
					 
					
						2017-06-24 00:34:16 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							574ca7f59c 
							
						 
					 
					
						
						
							
							Delete emulator drivers  
						
						
						
						
					 
					
						2017-06-24 00:34:16 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							da19852964 
							
						 
					 
					
						
						
							
							Add function for getting the LCD backlight brightness  
						
						
						
						
					 
					
						2017-06-24 00:34:16 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							ff49259a1a 
							
						 
					 
					
						
						
							
							Include config.h from visualizer.h  
						
						
						
						
					 
					
						2017-06-24 00:34:16 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							b0094e631e 
							
						 
					 
					
						
						
							
							Change remote url of uGFX to relative path  
						
						
						
						
					 
					
						2017-06-24 00:34:16 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							6c9b4743f7 
							
						 
					 
					
						
						
							
							Include config.h before visualizer.h  
						
						
						
						
					 
					
						2017-06-24 00:33:23 +03:00 
						 
				 
			
				
					
						
							
							
								Stick 
							
						 
					 
					
						
						
						
						
							
						
						
							e43e58aad1 
							
						 
					 
					
						
						
							
							updated README.md  
						
						
						
						
					 
					
						2017-06-23 16:28:06 -05:00 
						 
				 
			
				
					
						
							
							
								Stick 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e4d6f8d0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-06-23 16:02:44 -05:00 
						 
				 
			
				
					
						
							
							
								Stick 
							
						 
					 
					
						
						
						
						
							
						
						
							37987837b1 
							
						 
					 
					
						
						
							
							added media keys; many bug fixes  
						
						
						
						
					 
					
						2017-06-23 16:02:01 -05:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f151b8e9 
							
						 
					 
					
						
						
							
							Refactoring frenchdev  
						
						
						
						
					 
					
						2017-06-23 21:35:33 +02:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							de80e2c756 
							
						 
					 
					
						
						
							
							Moved frenchdev to handwired  
						
						
						
						
					 
					
						2017-06-23 21:25:46 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ce43781a 
							
						 
					 
					
						
						
							
							Merge pull request  #1421  from 333fred/update-layout  
						
						... 
						
						
						
						Update my layout 
						
						
					 
					
						2017-06-23 14:43:51 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							91f3a73a28 
							
						 
					 
					
						
						
							
							Merge pull request  #1419  from Wraul/phantom-improvements  
						
						... 
						
						
						
						Phantom improvements 
						
						
					 
					
						2017-06-23 14:43:32 -04:00 
						 
				 
			
				
					
						
							
							
								Fredric Silberberg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6794495336 
							
						 
					 
					
						
						
							
							Doc updates  
						
						
						
						
					 
					
						2017-06-23 11:36:14 -07:00 
						 
				 
			
				
					
						
							
							
								Fredric Silberberg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2b26abf9a9 
							
						 
					 
					
						
						
							
							Copy/paste additions.  
						
						
						
						
					 
					
						2017-06-23 11:24:55 -07:00 
						 
				 
			
				
					
						
							
							
								Fredric Silberberg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							946f4854c5 
							
						 
					 
					
						
						
							
							Added backlight control keys  
						
						
						
						
					 
					
						2017-06-23 11:07:28 -07:00 
						 
				 
			
				
					
						
							
							
								Fredric Silberberg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a2fbd671ad 
							
						 
					 
					
						
						
							
							Added a few more VS macros and another ctrl  
						
						
						
						
					 
					
						2017-06-23 11:07:28 -07:00 
						 
				 
			
				
					
						
							
							
								Fredric Silberberg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7389beb18c 
							
						 
					 
					
						
						
							
							Small keymap layout updates  
						
						
						
						
					 
					
						2017-06-23 11:07:28 -07:00 
						 
				 
			
				
					
						
							
							
								Mathias Andersson 
							
						 
					 
					
						
						
						
						
							
						
						
							dd9b00543b 
							
						 
					 
					
						
						
							
							Update Phantom readme  
						
						... 
						
						
						
						Added basic description of the keyboard and some build and configuration
instructions.
Also moved the RGB underlight modification instructions to the readme. 
						
						
					 
					
						2017-06-23 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								Mathias Andersson 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca335cf5b 
							
						 
					 
					
						
						
							
							Adjust Phantom for standard PCB  
						
						... 
						
						
						
						The previous default configuration and keymap was made for a Phantom
modified with RGB underlight.
This commit makes the default more in line with the "official"
configurations provided by the PCB.
The previous default have been moved to a separate keymap named
`rgbmod`. It has also been updated to better match the template keymap. 
						
						
					 
					
						2017-06-23 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								Mathias Andersson 
							
						 
					 
					
						
						
						
						
							
						
						
							3522496f24 
							
						 
					 
					
						
						
							
							Update Phantom config to better match template  
						
						
						
						
					 
					
						2017-06-23 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								Mathias Andersson 
							
						 
					 
					
						
						
						
						
							
						
						
							67b8bf8f70 
							
						 
					 
					
						
						
							
							Move Phantom LED handling to phantom.c  
						
						... 
						
						
						
						This is more in line with the structure provided by the keyboard
template. 
						
						
					 
					
						2017-06-23 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								Stick 
							
						 
					 
					
						
						
						
						
							
						
						
							98373f2fc1 
							
						 
					 
					
						
						
							
							added tapdance locking  
						
						
						
						
					 
					
						2017-06-22 22:22:43 -05:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							a012c24225 
							
						 
					 
					
						
						
							
							Removed image from git and added references to imgur album for Frenchdev keyboard.  
						
						
						
						
					 
					
						2017-06-22 22:19:50 +02:00 
						 
				 
			
				
					
						
							
							
								Stick 
							
						 
					 
					
						
						
						
						
							
						
						
							fa96d64f37 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-06-22 13:06:30 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							2b98ec67f3 
							
						 
					 
					
						
						
							
							Update _summary.md  
						
						
						
						
					 
					
						2017-06-22 13:23:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							7b3c9cc8de 
							
						 
					 
					
						
						
							
							Create adding_a_keyboard_to_qmk.md  
						
						
						
						
					 
					
						2017-06-22 13:22:21 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							f32c68ee65 
							
						 
					 
					
						
						
							
							Update porting_your_keyboard_to_qmk.md  
						
						
						
						
					 
					
						2017-06-22 13:21:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c21c2cc92b 
							
						 
					 
					
						
						
							
							Merge pull request  #1416  from geofflane/feature/s65_x_std_grv_esc  
						
						... 
						
						
						
						Use the new Quantum KC_GESC instead of custom code 
						
						
					 
					
						2017-06-22 12:38:45 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							fe9556104b 
							
						 
					 
					
						
						
							
							Merge pull request  #1331  from ariasuni/master  
						
						... 
						
						
						
						Fix undefined reference errors with avr-gcc 7.1 
						
						
					 
					
						2017-06-22 08:40:59 -04:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb835c54c 
							
						 
					 
					
						
						
							
							Fix warning in frenchdev  
						
						
						
						
					 
					
						2017-06-22 10:47:44 +02:00 
						 
				 
			
				
					
						
							
							
								npoirey 
							
						 
					 
					
						
						
						
						
							
						
						
							23b0fc20e3 
							
						 
					 
					
						
						
							
							Frenchdev v1  
						
						
						
						
					 
					
						2017-06-22 10:34:23 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							9d22a1a6d8 
							
						 
					 
					
						
						
							
							add group edge via travis updates  
						
						
						
						
					 
					
						2017-06-21 11:23:33 -04:00 
						 
				 
			
				
					
						
							
							
								Geoff Lane 
							
						 
					 
					
						
						
						
						
							
						
						
							8705ac408d 
							
						 
					 
					
						
						
							
							Use the new Quantum KC_GESC instead of custom code  
						
						
						
						
					 
					
						2017-06-21 09:37:20 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							23df3016e8 
							
						 
					 
					
						
						
							
							Merge pull request  #1405  from cquiroz/oneshot-mods-timeout  
						
						... 
						
						
						
						Oneshot mods timeout 
						
						
					 
					
						2017-06-20 11:40:10 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							9019d65b3c 
							
						 
					 
					
						
						
							
							Merge pull request  #1414  from dvdizon/kbd75  
						
						... 
						
						
						
						KBD75 - Initial KBD75 port from qmkeyboard.cn source files 
						
						
					 
					
						2017-06-20 09:19:48 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							2c171b3e5f 
							
						 
					 
					
						
						
							
							Merge pull request  #1413  from lasko/master  
						
						... 
						
						
						
						This is a complete redo of my keymap. It includes several 
						
						
					 
					
						2017-06-20 09:18:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							33a271b8e3 
							
						 
					 
					
						
						
							
							Merge pull request  #1412  from nall/master  
						
						... 
						
						
						
						Fixed offset for knight rgb mode 
						
						
					 
					
						2017-06-20 09:17:36 -04:00 
						 
				 
			
				
					
						
							
							
								David Dizon 
							
						 
					 
					
						
						
						
						
							
						
						
							e71b3c6572 
							
						 
					 
					
						
						
							
							KBD75 - Initial KBD75 port from qmkeyboard.cn source files  
						
						
						
						
					 
					
						2017-06-19 22:59:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jon Nall 
							
						 
					 
					
						
						
						
						
							
						
						
							f169c715eb 
							
						 
					 
					
						
						
							
							Added custom keymap and enabled Space Cadet  
						
						
						
						
					 
					
						2017-06-19 22:44:42 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon Height 
							
						 
					 
					
						
						
						
						
							
						
						
							2ffcf47793 
							
						 
					 
					
						
						
							
							This is a complete redo of my keymap. It includes several  
						
						... 
						
						
						
						layers including qwerty, colemak, navigation, and gui layers.
I also was playing around with dancing tap keys. 
						
						
					 
					
						2017-06-19 20:12:30 -07:00 
						 
				 
			
				
					
						
							
							
								Jon Nall 
							
						 
					 
					
						
						
						
						
							
						
						
							7ce056cad7 
							
						 
					 
					
						
						
							
							Fixed offset for knight rgb mode  
						
						
						
						
					 
					
						2017-06-19 19:51:37 -07:00